From 47a3160fb52f98745917fbf10fc651711904d17d Mon Sep 17 00:00:00 2001
From: Susanna Kiwala <susanna.kiwala@wustl.edu>
Date: Thu, 7 Dec 2023 09:18:19 -0600
Subject: [PATCH 001/125] Port Genes to Features

---
 client/src/app/generated/server.model.graphql |  46 +++-
 client/src/app/generated/server.schema.json   | 259 ++++++++++++++++--
 server/app/admin/genes_admin.rb               |   8 +-
 .../molecular_profile_segments_loader.rb      |   2 +-
 .../app/graphql/resolvers/top_level_genes.rb  |   2 +-
 .../app/graphql/types/entities/gene_type.rb   |  22 +-
 .../graphql/types/entities/variant_type.rb    |   9 +-
 .../graphql/types/interfaces/commentable.rb   |   2 +-
 .../graphql/types/interfaces/event_subject.rb |   2 +-
 .../types/interfaces/feature_interface.rb     |  47 ++++
 .../app/graphql/types/interfaces/flaggable.rb |   2 +-
 .../interfaces/molecular_profile_component.rb |   2 +-
 .../molecular_profile_segment_type.rb         |   2 +-
 .../types/queries/typeahead_queries.rb        |   4 +-
 server/app/graphql/types/query_type.rb        |   4 +-
 .../types/quicksearch/searchable_entities.rb  |   2 +-
 .../models/concerns/is_feature_instance.rb    |  13 +
 server/app/models/feature.rb                  |   7 +
 server/app/models/features/feature_alias.rb   |   3 +
 server/app/models/features/gene.rb            |  55 ++++
 server/app/models/gene.rb                     |  52 ----
 server/app/models/gene_alias.rb               |   2 +-
 server/app/models/molecular_profile.rb        |   2 +-
 server/app/models/source.rb                   |   3 +-
 server/app/models/variant.rb                  |   6 +-
 .../20231204203813_introduce_features.rb      |  32 +++
 server/db/schema.rb                           |  41 ++-
 .../features/backfill_gene_feature.rb         |  29 ++
 28 files changed, 539 insertions(+), 121 deletions(-)
 create mode 100644 server/app/graphql/types/interfaces/feature_interface.rb
 create mode 100644 server/app/models/concerns/is_feature_instance.rb
 create mode 100644 server/app/models/feature.rb
 create mode 100644 server/app/models/features/feature_alias.rb
 create mode 100644 server/app/models/features/gene.rb
 delete mode 100644 server/app/models/gene.rb
 create mode 100644 server/db/migrate/20231204203813_introduce_features.rb
 create mode 100644 server/misc_scripts/features/backfill_gene_feature.rb

diff --git a/client/src/app/generated/server.model.graphql b/client/src/app/generated/server.model.graphql
index 5d3661992..ac919ee1e 100644
--- a/client/src/app/generated/server.model.graphql
+++ b/client/src/app/generated/server.model.graphql
@@ -2796,6 +2796,47 @@ type FdaCode {
   description: String!
 }
 
+"""
+The Feature that a Variant can belong to
+"""
+interface FeatureInterface {
+  description: String!
+  featureAliases: [String!]!
+  id: Int!
+  name: String!
+  sources: [Source!]!
+
+  """
+  List and filter variants.
+  """
+  variants(
+    """
+    Returns the elements in the list that come after the specified cursor.
+    """
+    after: String
+
+    """
+    Returns the elements in the list that come before the specified cursor.
+    """
+    before: String
+
+    """
+    Returns the first _n_ elements from the list.
+    """
+    first: Int
+
+    """
+    Returns the last _n_ elements from the list.
+    """
+    last: Int
+
+    """
+    Left anchored filtering for variant name and aliases.
+    """
+    name: String
+  ): VariantConnection!
+}
+
 type FieldName {
   """
   The user facing representation of the field name.
@@ -3113,7 +3154,7 @@ input FlaggableInput {
   id: Int!
 }
 
-type Gene implements Commentable & EventSubject & Flaggable & MolecularProfileComponent & WithRevisions {
+type Gene implements Commentable & EventSubject & FeatureInterface & Flaggable & MolecularProfileComponent & WithRevisions {
   """
   List and filter comments.
   """
@@ -3198,6 +3239,7 @@ type Gene implements Commentable & EventSubject & Flaggable & MolecularProfileCo
     """
     sortBy: DateSort
   ): EventConnection!
+  featureAliases: [String!]!
   flagged: Boolean!
 
   """
@@ -3244,7 +3286,6 @@ type Gene implements Commentable & EventSubject & Flaggable & MolecularProfileCo
     """
     state: FlagState
   ): FlagConnection!
-  geneAliases: [String!]!
   id: Int!
   lastAcceptedRevisionEvent: Event
   lastCommentEvent: Event
@@ -8809,6 +8850,7 @@ type Variant implements Commentable & EventOriginObject & EventSubject & Flaggab
     """
     sortBy: DateSort
   ): EventConnection!
+  feature: FeatureInterface!
   flagged: Boolean!
 
   """
diff --git a/client/src/app/generated/server.schema.json b/client/src/app/generated/server.schema.json
index 649d76a90..6cc75a767 100644
--- a/client/src/app/generated/server.schema.json
+++ b/client/src/app/generated/server.schema.json
@@ -14059,6 +14059,196 @@
           "enumValues": null,
           "possibleTypes": null
         },
+        {
+          "kind": "INTERFACE",
+          "name": "FeatureInterface",
+          "description": "The Feature that a Variant can belong to",
+          "fields": [
+            {
+              "name": "description",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "featureAliases",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "SCALAR",
+                      "name": "String",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "id",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "name",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "sources",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "Source",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "variants",
+              "description": "List and filter variants.",
+              "args": [
+                {
+                  "name": "name",
+                  "description": "Left anchored filtering for variant name and aliases.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "after",
+                  "description": "Returns the elements in the list that come after the specified cursor.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "before",
+                  "description": "Returns the elements in the list that come before the specified cursor.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "first",
+                  "description": "Returns the first _n_ elements from the list.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "last",
+                  "description": "Returns the last _n_ elements from the list.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                }
+              ],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "VariantConnection",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": [
+            {
+              "kind": "OBJECT",
+              "name": "Gene",
+              "ofType": null
+            }
+          ]
+        },
         {
           "kind": "OBJECT",
           "name": "FieldName",
@@ -15685,6 +15875,30 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "featureAliases",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "SCALAR",
+                      "name": "String",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "flagged",
               "description": null,
@@ -15814,30 +16028,6 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
-            {
-              "name": "geneAliases",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "SCALAR",
-                      "name": "String",
-                      "ofType": null
-                    }
-                  }
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
             {
               "name": "id",
               "description": null,
@@ -16179,6 +16369,11 @@
           ],
           "inputFields": null,
           "interfaces": [
+            {
+              "kind": "INTERFACE",
+              "name": "FeatureInterface",
+              "ofType": null
+            },
             {
               "kind": "INTERFACE",
               "name": "Commentable",
@@ -40486,6 +40681,22 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "feature",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "INTERFACE",
+                  "name": "FeatureInterface",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "flagged",
               "description": null,
diff --git a/server/app/admin/genes_admin.rb b/server/app/admin/genes_admin.rb
index c5017c5e6..342f2dc2b 100644
--- a/server/app/admin/genes_admin.rb
+++ b/server/app/admin/genes_admin.rb
@@ -1,6 +1,6 @@
-Trestle.resource(:genes) do
+Trestle.resource(:genes, model: Features::Gene) do
   collection do
-    Gene.includes(:flags).order(name: :asc)
+    Fatures::Gene.includes(:flags).order(name: :asc)
   end
 
   search do |q|
@@ -15,8 +15,8 @@
   end
 
   scope :all
-  scope :with_variants, -> { Gene.joins(:variants).distinct }, default: true
-  scope :flagged, -> { Gene.where(flagged: true) }
+  scope :with_variants, -> { Features::Gene.joins(:variants).distinct }, default: true
+  scope :flagged, -> { Features::Gene.where(flagged: true) }
 
   # Customize the table columns shown on the index view.
   table do
diff --git a/server/app/graphql/loaders/molecular_profile_segments_loader.rb b/server/app/graphql/loaders/molecular_profile_segments_loader.rb
index 344bc3f30..15b5a2722 100644
--- a/server/app/graphql/loaders/molecular_profile_segments_loader.rb
+++ b/server/app/graphql/loaders/molecular_profile_segments_loader.rb
@@ -31,7 +31,7 @@ def perform(ids)
       Variant.where(id: resolved_variants.keys)
         .each { |v| resolved_variants[v.id] = v }
 
-      Gene.where(id: resolved_genes.keys)
+      Features::Gene.where(id: resolved_genes.keys)
         .each { |g| resolved_genes[g.id] = g }
 
       ids.each do |id|
diff --git a/server/app/graphql/resolvers/top_level_genes.rb b/server/app/graphql/resolvers/top_level_genes.rb
index a8089517d..8e5774c18 100644
--- a/server/app/graphql/resolvers/top_level_genes.rb
+++ b/server/app/graphql/resolvers/top_level_genes.rb
@@ -7,7 +7,7 @@ class Resolvers::TopLevelGenes < GraphQL::Schema::Resolver
 
   description 'List and filter genes.'
 
-  scope { Gene.joins(variants: [molecular_profiles: [:evidence_items]]).order('genes.name ASC').where("evidence_items.status != 'rejected'").distinct }
+  scope { Features::Gene.joins(variants: [molecular_profiles: [:evidence_items]]).order('features.name ASC').where("evidence_items.status != 'rejected'").distinct }
 
   option(:entrez_symbols, type: [GraphQL::Types::String], description: 'List of Entrez Gene symbols to return results for') do |scope, value|
     scope.where('genes.name IN (?)', value.map(&:upcase))
diff --git a/server/app/graphql/types/entities/gene_type.rb b/server/app/graphql/types/entities/gene_type.rb
index 8fc29da51..273ab99f9 100644
--- a/server/app/graphql/types/entities/gene_type.rb
+++ b/server/app/graphql/types/entities/gene_type.rb
@@ -1,35 +1,17 @@
 module Types::Entities
   class GeneType < Types::BaseObject
+    implements Types::Interfaces::FeatureInterface
+
     implements Types::Interfaces::Commentable
     implements Types::Interfaces::Flaggable
     implements Types::Interfaces::WithRevisions
     implements Types::Interfaces::EventSubject
     implements Types::Interfaces::MolecularProfileComponent
 
-    field :id, Int, null: false
     field :entrez_id, Int, null: false
-    field :name, String, null: false
-    field :description, String, null: false
     field :official_name, String, null: false
-    field :gene_aliases, [String], null: false
-    field :sources, [Types::Entities::SourceType], null: false
-    field :variants, resolver: Resolvers::Variants
     field :my_gene_info_details, GraphQL::Types::JSON, null: true
 
-    def gene_aliases
-      Loaders::AssociationLoader.for(Gene, :gene_aliases).load(object).then do |gene_aliases|
-        gene_aliases.map{|a| a.name}.sort
-      end
-    end
-
-    def sources
-      Loaders::AssociationLoader.for(Gene, :sources).load(object)
-    end
-
-    def variants
-      Loaders::AssociationLoader.for(Gene, :variants).load(object)
-    end
-
     def my_gene_info_details
       MyGeneInfo.get_by_gene_id(object.id)
     end
diff --git a/server/app/graphql/types/entities/variant_type.rb b/server/app/graphql/types/entities/variant_type.rb
index fdb470f4e..94c4da748 100644
--- a/server/app/graphql/types/entities/variant_type.rb
+++ b/server/app/graphql/types/entities/variant_type.rb
@@ -12,6 +12,7 @@ class VariantType < Types::BaseObject
     field :id, Int, null: false
     field :name, String, null: false
     field :gene, Types::Entities::GeneType, null: false
+    field :feature, Types::Interfaces::FeatureInterface, null: false
     field :reference_build, Types::ReferenceBuildType, null: true
     field :ensembl_version, Int, null: true
     field :primary_coordinates, Types::Entities::CoordinateType, null: true
@@ -36,7 +37,13 @@ class VariantType < Types::BaseObject
     field :open_cravat_url, String, null: true
 
     def gene
-      Loaders::RecordLoader.for(Gene).load(object.gene_id)
+      Loaders::RecordLoader.for(Features::Gene).load(object.gene_id)
+    end
+
+    def feature
+      Loaders::AssociationLoader.for(Variant, :feature).load(object).then do |f|
+        Loaders::AssociationLoader.for(Feature, :feature_instance).load(f)
+      end
     end
 
     def variant_types
diff --git a/server/app/graphql/types/interfaces/commentable.rb b/server/app/graphql/types/interfaces/commentable.rb
index 92c86810c..57cbb72de 100644
--- a/server/app/graphql/types/interfaces/commentable.rb
+++ b/server/app/graphql/types/interfaces/commentable.rb
@@ -19,7 +19,7 @@ def resolve_type(object, context)
           Types::Entities::EvidenceItemType
         when Flag
           Types::Entities::FlagType
-        when Gene
+        when Features::Gene
           Types::Entities::GeneType
         when Revision
           Types::Revisions::RevisionType
diff --git a/server/app/graphql/types/interfaces/event_subject.rb b/server/app/graphql/types/interfaces/event_subject.rb
index f5461d601..db380f41d 100644
--- a/server/app/graphql/types/interfaces/event_subject.rb
+++ b/server/app/graphql/types/interfaces/event_subject.rb
@@ -13,7 +13,7 @@ module EventSubject
     definition_methods do
       def resolve_type(object, context)
         case object
-        when Gene
+        when Features::Gene
           Types::Entities::GeneType
         when Variant
           Types::Entities::VariantType
diff --git a/server/app/graphql/types/interfaces/feature_interface.rb b/server/app/graphql/types/interfaces/feature_interface.rb
new file mode 100644
index 000000000..28c43b450
--- /dev/null
+++ b/server/app/graphql/types/interfaces/feature_interface.rb
@@ -0,0 +1,47 @@
+module Types::Interfaces
+  module FeatureInterface
+    include Types::BaseInterface
+
+    description 'The Feature that a Variant can belong to'
+
+    field :id, Int, null: false
+    field :name, String, null: false
+    field :description, String, null: false
+    field :feature_aliases, [String], null: false
+    field :sources, [Types::Entities::SourceType], null: false
+    field :variants, resolver: Resolvers::Variants
+
+    orphan_types(
+      Types::Entities::GeneType
+    )
+
+    def id
+      object.feature.id
+    end
+
+    def feature_aliases
+      Loaders::AssociationLoader.for(Feature, :feature_aliases).load(object.feature).then do |aliases|
+        aliases.map{|a| a.name}.sort
+      end
+    end
+
+    def sources
+      Loaders::AssociationLoader.for(Feature, :sources).load(object.feature)
+    end
+
+    def variants
+      Loaders::AssociationLoader.for(Feature, :variants).load(object)
+    end
+
+    definition_methods do
+      def resolve_type(object, context)
+        case object
+        when Features::Gene
+          Types::Entities::GeneType
+        else
+          raise "Unexpected Feature type #{object.class}"
+        end
+      end
+    end
+  end
+end
diff --git a/server/app/graphql/types/interfaces/flaggable.rb b/server/app/graphql/types/interfaces/flaggable.rb
index 3a371c154..e11d62190 100644
--- a/server/app/graphql/types/interfaces/flaggable.rb
+++ b/server/app/graphql/types/interfaces/flaggable.rb
@@ -14,7 +14,7 @@ module Flaggable
     definition_methods do
       def resolve_type(object, context)
         case object
-        when Gene
+        when Features::Gene
           Types::Entities::GeneType
         when Variant
           Types::Entities::VariantType
diff --git a/server/app/graphql/types/interfaces/molecular_profile_component.rb b/server/app/graphql/types/interfaces/molecular_profile_component.rb
index 98d9d4d9b..ed6dc3f76 100644
--- a/server/app/graphql/types/interfaces/molecular_profile_component.rb
+++ b/server/app/graphql/types/interfaces/molecular_profile_component.rb
@@ -21,7 +21,7 @@ def name
     definition_methods do
       def resolve_type(object, context)
         case object
-        when Gene
+        when Features::Gene
           Types::Entities::GeneType
         when Variant
           Types::Entities::VariantType
diff --git a/server/app/graphql/types/molecular_profile/molecular_profile_segment_type.rb b/server/app/graphql/types/molecular_profile/molecular_profile_segment_type.rb
index e3d3a6b7e..31f2cc9ea 100644
--- a/server/app/graphql/types/molecular_profile/molecular_profile_segment_type.rb
+++ b/server/app/graphql/types/molecular_profile/molecular_profile_segment_type.rb
@@ -17,7 +17,7 @@ class MolecularProfileSegmentType < Types::BaseUnion
     def self.resolve_type(object, context)
       if object.is_a?(String)
         Types::MolecularProfile::MolecularProfileTextSegment
-      elsif object.is_a?(Gene)
+      elsif object.is_a?(Features::Gene)
         Types::Entities::GeneType
       elsif object.is_a?(Variant)
         Types::Entities::VariantType
diff --git a/server/app/graphql/types/queries/typeahead_queries.rb b/server/app/graphql/types/queries/typeahead_queries.rb
index a5e9de7b0..4d0a00a90 100644
--- a/server/app/graphql/types/queries/typeahead_queries.rb
+++ b/server/app/graphql/types/queries/typeahead_queries.rb
@@ -102,11 +102,11 @@ def therapy_typeahead(query_term:)
       end
 
       def gene_typeahead(query_term:)
-        results = Gene.where('genes.name ILIKE ?', "#{query_term}%")
+        results = Features::Gene.where('genes.name ILIKE ?', "#{query_term}%")
           .order("LENGTH(genes.name) ASC")
           .limit(10)
         if results.size < 10
-          secondary_results = Gene.eager_load(:gene_aliases)
+          secondary_results = Features::Gene.eager_load(:gene_aliases)
             .where("gene_aliases.name ILIKE ?", "#{query_term}%")
             .where.not(id: results.select('id'))
             .order("LENGTH(genes.name) ASC")
diff --git a/server/app/graphql/types/query_type.rb b/server/app/graphql/types/query_type.rb
index 1d23d278a..c3e925577 100644
--- a/server/app/graphql/types/query_type.rb
+++ b/server/app/graphql/types/query_type.rb
@@ -206,9 +206,9 @@ def gene(id: :unspecified, entrez_symbol: :unspecified)
         raise GraphQL::ExecutionError.new('Must specify exactly one of id or entrezSymbol')
       end
       if (id != :unspecified) 
-        Gene.find_by(id: id)
+        Features::Gene.find_by(id: id)
       else
-        Gene.find_by(name: entrez_symbol)
+        Features::Gene.find_by(name: entrez_symbol)
       end
     end
 
diff --git a/server/app/graphql/types/quicksearch/searchable_entities.rb b/server/app/graphql/types/quicksearch/searchable_entities.rb
index db95ecfe4..924096d47 100644
--- a/server/app/graphql/types/quicksearch/searchable_entities.rb
+++ b/server/app/graphql/types/quicksearch/searchable_entities.rb
@@ -1,6 +1,6 @@
 module Types::Quicksearch
   class SearchableEntities < Types::BaseEnum
-    value 'GENE', value: Gene
+    value 'GENE', value: Features::Gene
     value 'VARIANT', value: Variant
     value 'EVIDENCE_ITEM', value: EvidenceItem
     value 'ASSERTION', value: Assertion
diff --git a/server/app/models/concerns/is_feature_instance.rb b/server/app/models/concerns/is_feature_instance.rb
new file mode 100644
index 000000000..260be271c
--- /dev/null
+++ b/server/app/models/concerns/is_feature_instance.rb
@@ -0,0 +1,13 @@
+module IsFeatureInstance
+  extend ActiveSupport::Concern
+
+  included do
+    has_one :feature, as: :feature_instance, touch: true
+
+    delegate :name, to: :feature
+    delegate :description, to: :feature
+    delegate :feature_aliases, to: :feature
+    delegate :sources, to: :feature
+    delegate :variants, to: :feature
+  end
+end
diff --git a/server/app/models/feature.rb b/server/app/models/feature.rb
new file mode 100644
index 000000000..4c5a42ee2
--- /dev/null
+++ b/server/app/models/feature.rb
@@ -0,0 +1,7 @@
+class Feature < ApplicationRecord
+  delegated_type :feature_instance, types: %w[ Features::Gene ]
+  has_and_belongs_to_many :feature_aliases, class_name: 'Features::FeatureAlias'
+  has_and_belongs_to_many :sources
+
+  has_many :variants
+end
diff --git a/server/app/models/features/feature_alias.rb b/server/app/models/features/feature_alias.rb
new file mode 100644
index 000000000..ad58b3455
--- /dev/null
+++ b/server/app/models/features/feature_alias.rb
@@ -0,0 +1,3 @@
+class Features::FeatureAlias < ActiveRecord::Base
+  has_and_belongs_to_many :features
+end
diff --git a/server/app/models/features/gene.rb b/server/app/models/features/gene.rb
new file mode 100644
index 000000000..8885f262b
--- /dev/null
+++ b/server/app/models/features/gene.rb
@@ -0,0 +1,55 @@
+module Features
+  class Gene < ActiveRecord::Base
+    include Moderated
+    include Subscribable
+    include Flaggable
+    include Commentable
+    include WithTimepointCounts
+    include IsFeatureInstance
+
+    #has_many :variants
+    has_many :variant_groups
+    has_many :source_suggestions
+    #has_and_belongs_to_many :sources
+    #has_and_belongs_to_many :gene_aliases
+
+    has_many :comment_mentions, foreign_key: :comment_id, class_name: 'EntityMention'
+
+    searchkick highlight: [:symbol, :aliases], callbacks: :async
+    scope :search_import, -> { includes(:gene_aliases) }
+
+    def search_data
+      {
+        name: name,
+        aliases: gene_aliases.map(&:name)
+      }
+    end
+
+    def link
+      Rails.application.routes.url_helpers.url_for("/genes/#{self.id}")
+    end
+
+    def display_name
+      name
+    end
+
+    def self.timepoint_query
+      ->(x) {
+        self.joins(variants: { molecular_profiles: [:evidence_items] })
+          .group('genes.id')
+          .select('genes.id')
+          .where("evidence_items.status != 'rejected'")
+          .having('MIN(evidence_items.created_at) >= ?', x)
+          .distinct
+          .count
+      }
+    end
+
+    def editable_fields
+      [
+        :description,
+        :source_ids
+      ]
+    end
+  end
+end
diff --git a/server/app/models/gene.rb b/server/app/models/gene.rb
deleted file mode 100644
index 6d5e7eda8..000000000
--- a/server/app/models/gene.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-class Gene < ActiveRecord::Base
-  include Moderated
-  include Subscribable
-  include Flaggable
-  include Commentable
-  include WithTimepointCounts
-
-  has_many :variants
-  has_many :variant_groups
-  has_many :source_suggestions
-  has_and_belongs_to_many :sources
-  has_and_belongs_to_many :gene_aliases
-
-  has_many :comment_mentions, foreign_key: :comment_id, class_name: 'EntityMention'
-
-  searchkick highlight: [:symbol, :aliases], callbacks: :async
-  scope :search_import, -> { includes(:gene_aliases) }
-
-  def search_data
-    {
-      name: name,
-      aliases: gene_aliases.map(&:name)
-    }
-  end
-
-  def link
-    Rails.application.routes.url_helpers.url_for("/genes/#{self.id}")
-  end
-
-  def display_name
-    name
-  end
-
-  def self.timepoint_query
-    ->(x) {
-      self.joins(variants: { molecular_profiles: [:evidence_items] })
-        .group('genes.id')
-        .select('genes.id')
-        .where("evidence_items.status != 'rejected'")
-        .having('MIN(evidence_items.created_at) >= ?', x)
-        .distinct
-        .count
-    }
-  end
-
-  def editable_fields
-    [
-      :description,
-      :source_ids
-    ]
-  end
-end
diff --git a/server/app/models/gene_alias.rb b/server/app/models/gene_alias.rb
index 0fe42244d..49fcf1685 100644
--- a/server/app/models/gene_alias.rb
+++ b/server/app/models/gene_alias.rb
@@ -1,3 +1,3 @@
 class GeneAlias < ActiveRecord::Base
-  has_and_belongs_to_many :genes
+  has_and_belongs_to_many :genes, class_name: 'Features::Gene'
 end
diff --git a/server/app/models/molecular_profile.rb b/server/app/models/molecular_profile.rb
index 1e962dc18..32feb8f79 100644
--- a/server/app/models/molecular_profile.rb
+++ b/server/app/models/molecular_profile.rb
@@ -82,7 +82,7 @@ def segments
     #TODO - we could batch these queries if it becomes an issue
     @segments ||= name.split(' ').map do |segment|
       if gene_match = segment.match(GENE_REGEX)
-        Gene.find(gene_match[:id])
+        Features::Gene.find(gene_match[:id])
       elsif variant_match = segment.match(VARIANT_REGEX)
         Variant.find(variant_match[:id])
       else
diff --git a/server/app/models/source.rb b/server/app/models/source.rb
index 93cd86fd4..929c82b09 100644
--- a/server/app/models/source.rb
+++ b/server/app/models/source.rb
@@ -5,7 +5,8 @@ class Source < ActiveRecord::Base
   include Commentable
 
   has_many :evidence_items
-  has_and_belongs_to_many :genes
+  has_and_belongs_to_many :features
+  has_and_belongs_to_many :genes, class_name: 'Features::Gene'
   has_and_belongs_to_many :clinical_trials
   has_and_belongs_to_many :molecular_profiles
   has_many :authors_sources
diff --git a/server/app/models/variant.rb b/server/app/models/variant.rb
index 9299cc9a5..79590780a 100644
--- a/server/app/models/variant.rb
+++ b/server/app/models/variant.rb
@@ -5,8 +5,10 @@ class Variant < ApplicationRecord
   include Commentable
   include WithTimepointCounts
 
-  belongs_to :gene
-  belongs_to :secondary_gene, class_name: 'Gene', optional: true
+  belongs_to :feature
+  belongs_to :gene, class_name: 'Features::Gene'
+  belongs_to :secondary_gene, class_name: 'Features::Gene', optional: true
+
   has_and_belongs_to_many :molecular_profiles
   has_many :variant_group_variants
   has_many :variant_groups, through: :variant_group_variants
diff --git a/server/db/migrate/20231204203813_introduce_features.rb b/server/db/migrate/20231204203813_introduce_features.rb
new file mode 100644
index 000000000..8918fbe9b
--- /dev/null
+++ b/server/db/migrate/20231204203813_introduce_features.rb
@@ -0,0 +1,32 @@
+class IntroduceFeatures < ActiveRecord::Migration[6.1]
+  def change
+    create_table :features do |t|
+      t.text :name, null: false
+      t.text :description, null: true
+      t.timestamps
+      t.references :feature_instance, polymorphic: true, null: false, unique: true
+    end
+
+    create_table :feature_aliases do |t|
+      t.text :name, null: false, index: true
+      t.timestamps
+    end
+
+    create_table :feature_aliases_features do |t|
+      t.references :feature, null: false, index: true, foreign_key: true
+      t.references :feature_alias, null: false, index: true, foreign_key: true
+    end
+
+    #add_foreign_key :features_feature_aliases, :features
+    #add_foreign_key :features_feature_aliases, :feature_aliases
+    add_index :feature_aliases_features, [:feature_id, :feature_alias_id], name: 'idx_feature_alias'
+    #add_index :features_feature_aliases, :feature_alias_id, name: 'idx_feature_alias_id'
+
+    create_table :features_sources do |t|
+      t.references :source, null: false, index: true, foreign_key: true
+      t.references :feature, null: false, index: true, foreign_key: true
+    end
+
+    add_reference :variants, :feature, index: true, foreign_key: true
+  end
+end
diff --git a/server/db/schema.rb b/server/db/schema.rb
index 2a3b35054..77f5f99cb 100644
--- a/server/db/schema.rb
+++ b/server/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2023_11_22_204214) do
+ActiveRecord::Schema.define(version: 2023_12_04_203813) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -442,6 +442,38 @@
     t.index ["therapy_id", "evidence_item_id"], name: "idx_therapy_eid_bridge_table"
   end
 
+  create_table "feature_aliases", force: :cascade do |t|
+    t.text "name", null: false
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+    t.index ["name"], name: "index_feature_aliases_on_name"
+  end
+
+  create_table "feature_aliases_features", force: :cascade do |t|
+    t.bigint "feature_id", null: false
+    t.bigint "feature_alias_id", null: false
+    t.index ["feature_alias_id"], name: "index_feature_aliases_features_on_feature_alias_id"
+    t.index ["feature_id", "feature_alias_id"], name: "idx_feature_alias"
+    t.index ["feature_id"], name: "index_feature_aliases_features_on_feature_id"
+  end
+
+  create_table "features", force: :cascade do |t|
+    t.text "name", null: false
+    t.text "description"
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+    t.string "feature_instance_type", null: false
+    t.bigint "feature_instance_id", null: false
+    t.index ["feature_instance_type", "feature_instance_id"], name: "index_features_on_feature_instance"
+  end
+
+  create_table "features_sources", force: :cascade do |t|
+    t.bigint "source_id", null: false
+    t.bigint "feature_id", null: false
+    t.index ["feature_id"], name: "index_features_sources_on_feature_id"
+    t.index ["source_id"], name: "index_features_sources_on_source_id"
+  end
+
   create_table "flags", id: :serial, force: :cascade do |t|
     t.integer "flagging_user_id"
     t.integer "resolving_user_id"
@@ -868,11 +900,13 @@
     t.integer "deprecation_reason"
     t.integer "deprecation_comment_id"
     t.text "open_cravat_url"
+    t.bigint "feature_id"
     t.index "lower((name)::text) varchar_pattern_ops", name: "idx_case_insensitive_variant_name"
     t.index "lower((name)::text)", name: "variant_lower_name_idx"
     t.index ["chromosome"], name: "index_variants_on_chromosome"
     t.index ["chromosome2"], name: "index_variants_on_chromosome2"
     t.index ["deleted"], name: "index_variants_on_deleted"
+    t.index ["feature_id"], name: "index_variants_on_feature_id"
     t.index ["gene_id"], name: "index_variants_on_gene_id"
     t.index ["name"], name: "index_variants_on_name"
     t.index ["reference_bases"], name: "index_variants_on_reference_bases"
@@ -930,6 +964,10 @@
   add_foreign_key "evidence_items_phenotypes", "phenotypes"
   add_foreign_key "evidence_items_therapies", "evidence_items"
   add_foreign_key "evidence_items_therapies", "therapies"
+  add_foreign_key "feature_aliases_features", "feature_aliases"
+  add_foreign_key "feature_aliases_features", "features"
+  add_foreign_key "features_sources", "features"
+  add_foreign_key "features_sources", "sources"
   add_foreign_key "gene_aliases_genes", "gene_aliases"
   add_foreign_key "gene_aliases_genes", "genes"
   add_foreign_key "genes_sources", "genes"
@@ -960,6 +998,7 @@
   add_foreign_key "variant_group_variants", "variant_groups"
   add_foreign_key "variant_group_variants", "variants"
   add_foreign_key "variants", "comments", column: "deprecation_comment_id"
+  add_foreign_key "variants", "features"
   add_foreign_key "variants", "genes"
   add_foreign_key "variants", "genes", column: "secondary_gene_id"
   add_foreign_key "variants", "molecular_profiles", column: "single_variant_molecular_profile_id"
diff --git a/server/misc_scripts/features/backfill_gene_feature.rb b/server/misc_scripts/features/backfill_gene_feature.rb
new file mode 100644
index 000000000..983e23a05
--- /dev/null
+++ b/server/misc_scripts/features/backfill_gene_feature.rb
@@ -0,0 +1,29 @@
+Features::Gene.find_each do |gene|
+  if feature = Feature.find_by(feature_instance: gene)
+    Variant.where(gene_id: gene.id).find_each do |variant|
+      variant.feature = feature
+      variant.save!(validate: false)
+    end
+    next
+  end
+
+  feature = Feature.create!(
+    name: gene.name,
+    description: gene.description,
+    feature_instance: gene
+  )
+
+  gene.gene_aliases.each do |gene_alias|
+    feature_alias = Features::FeatureAlias.where(name: gene_alias.name).first_or_create
+    feature.feature_aliases << feature_alias
+  end
+
+  feature.sources = gene.sources
+
+  feature.save!
+
+  Variants.where(gene_id: gene.id).find_each do |variant|
+    variant.feature = feature
+    variant.save
+  end
+end

From 9fa70e97b8c2de71d28d6b3f7654a580a040ea1d Mon Sep 17 00:00:00 2001
From: Susanna Kiwala <susanna.kiwala@wustl.edu>
Date: Thu, 7 Dec 2023 13:17:52 -0600
Subject: [PATCH 002/125] Add feature view modules

---
 .../app/core/pipes/typename-to-route-pipe.ts  |   2 +
 client/src/app/generated/server.model.graphql |   5 +
 client/src/app/generated/server.schema.json   |  25 ++++
 .../src/app/layout/layout-routing.module.ts   |   8 ++
 .../features-comments.module.ts               |  11 ++
 .../features-comments.page.html               |   1 +
 .../features-comments.page.less               |   3 +
 .../features-comments.page.ts                 |  23 ++++
 .../features-detail-routing.module.ts         |  74 +++++++++++
 .../features-detail/features-detail.module.ts |  42 ++++++
 .../features-detail/features-detail.query.gql |  21 +++
 .../features-detail/features-detail.view.html |  85 +++++++++++++
 .../features-detail/features-detail.view.less |   1 +
 .../features-detail/features-detail.view.ts   | 120 ++++++++++++++++++
 .../features-events/features-events.module.ts |  11 ++
 .../features-events/features-events.page.html |   3 +
 .../features-events/features-events.page.less |   3 +
 .../features-events/features-events.page.ts   |  23 ++++
 .../features-flags/feature-flags.module.ts    |  21 +++
 .../features-flags/features-flags.page.html   |   1 +
 .../features-flags/features-flags.page.less   |   3 +
 .../features-flags/features-flags.page.ts     |  23 ++++
 .../features-revisions.module.ts              |  35 +++++
 .../features-revisions.page.html              |   3 +
 .../features-revisions.page.less              |   3 +
 .../features-revisions.page.ts                |  27 ++++
 .../features-summary.module.ts                |  46 +++++++
 .../features-summary.page.html                | 117 +++++++++++++++++
 .../features-summary.page.less                |   9 ++
 .../features-summary/features-summary.page.ts |  54 ++++++++
 .../features-summary.query.gql                |  47 +++++++
 .../features-home/features-home.module.ts     |  30 +++++
 .../features-home/features-home.page.html     |  72 +++++++++++
 .../features-home/features-home.page.less     |   1 +
 .../features-home/features-home.page.ts       |  12 ++
 .../features-revise-routing.module.ts         |  28 ++++
 .../features-revise/features-revise.module.ts |  32 +++++
 .../features-revise/features-revise.view.html |  38 ++++++
 .../features-revise/features-revise.view.less |   1 +
 .../features-revise/features-revise.view.ts   |  54 ++++++++
 .../features-suggest.module.ts                |  28 ++++
 .../features-suggest.page.html                |   4 +
 .../features-suggest.page.less                |   1 +
 .../features-suggest/features-suggest.page.ts |  23 ++++
 .../views/features/features-routing.module.ts |  49 +++++++
 .../src/app/views/features/features.module.ts |  11 ++
 .../src/app/views/features/features.view.html |   1 +
 .../src/app/views/features/features.view.ts   |   9 ++
 server/app/graphql/types/query_type.rb        |   9 ++
 49 files changed, 1253 insertions(+)
 create mode 100644 client/src/app/views/features/features-detail/features-comments/features-comments.module.ts
 create mode 100644 client/src/app/views/features/features-detail/features-comments/features-comments.page.html
 create mode 100644 client/src/app/views/features/features-detail/features-comments/features-comments.page.less
 create mode 100644 client/src/app/views/features/features-detail/features-comments/features-comments.page.ts
 create mode 100644 client/src/app/views/features/features-detail/features-detail-routing.module.ts
 create mode 100644 client/src/app/views/features/features-detail/features-detail.module.ts
 create mode 100644 client/src/app/views/features/features-detail/features-detail.query.gql
 create mode 100644 client/src/app/views/features/features-detail/features-detail.view.html
 create mode 100644 client/src/app/views/features/features-detail/features-detail.view.less
 create mode 100644 client/src/app/views/features/features-detail/features-detail.view.ts
 create mode 100644 client/src/app/views/features/features-detail/features-events/features-events.module.ts
 create mode 100644 client/src/app/views/features/features-detail/features-events/features-events.page.html
 create mode 100644 client/src/app/views/features/features-detail/features-events/features-events.page.less
 create mode 100644 client/src/app/views/features/features-detail/features-events/features-events.page.ts
 create mode 100644 client/src/app/views/features/features-detail/features-flags/feature-flags.module.ts
 create mode 100644 client/src/app/views/features/features-detail/features-flags/features-flags.page.html
 create mode 100644 client/src/app/views/features/features-detail/features-flags/features-flags.page.less
 create mode 100644 client/src/app/views/features/features-detail/features-flags/features-flags.page.ts
 create mode 100644 client/src/app/views/features/features-detail/features-revisions/features-revisions.module.ts
 create mode 100644 client/src/app/views/features/features-detail/features-revisions/features-revisions.page.html
 create mode 100644 client/src/app/views/features/features-detail/features-revisions/features-revisions.page.less
 create mode 100644 client/src/app/views/features/features-detail/features-revisions/features-revisions.page.ts
 create mode 100644 client/src/app/views/features/features-detail/features-summary/features-summary.module.ts
 create mode 100644 client/src/app/views/features/features-detail/features-summary/features-summary.page.html
 create mode 100644 client/src/app/views/features/features-detail/features-summary/features-summary.page.less
 create mode 100644 client/src/app/views/features/features-detail/features-summary/features-summary.page.ts
 create mode 100644 client/src/app/views/features/features-detail/features-summary/features-summary.query.gql
 create mode 100644 client/src/app/views/features/features-home/features-home.module.ts
 create mode 100644 client/src/app/views/features/features-home/features-home.page.html
 create mode 100644 client/src/app/views/features/features-home/features-home.page.less
 create mode 100644 client/src/app/views/features/features-home/features-home.page.ts
 create mode 100644 client/src/app/views/features/features-revise/features-revise-routing.module.ts
 create mode 100644 client/src/app/views/features/features-revise/features-revise.module.ts
 create mode 100644 client/src/app/views/features/features-revise/features-revise.view.html
 create mode 100644 client/src/app/views/features/features-revise/features-revise.view.less
 create mode 100644 client/src/app/views/features/features-revise/features-revise.view.ts
 create mode 100644 client/src/app/views/features/features-revise/features-suggest/features-suggest.module.ts
 create mode 100644 client/src/app/views/features/features-revise/features-suggest/features-suggest.page.html
 create mode 100644 client/src/app/views/features/features-revise/features-suggest/features-suggest.page.less
 create mode 100644 client/src/app/views/features/features-revise/features-suggest/features-suggest.page.ts
 create mode 100644 client/src/app/views/features/features-routing.module.ts
 create mode 100644 client/src/app/views/features/features.module.ts
 create mode 100644 client/src/app/views/features/features.view.html
 create mode 100644 client/src/app/views/features/features.view.ts

diff --git a/client/src/app/core/pipes/typename-to-route-pipe.ts b/client/src/app/core/pipes/typename-to-route-pipe.ts
index ed3a14623..ce377b509 100644
--- a/client/src/app/core/pipes/typename-to-route-pipe.ts
+++ b/client/src/app/core/pipes/typename-to-route-pipe.ts
@@ -9,6 +9,8 @@ export class TypenameToRoutePipe implements PipeTransform {
     switch (n) {
       case 'Gene':
         return 'genes'
+      case 'Feature':
+        return 'features'
       case 'Variant':
         return 'variants'
       case 'Assertion':
diff --git a/client/src/app/generated/server.model.graphql b/client/src/app/generated/server.model.graphql
index ac919ee1e..938505e84 100644
--- a/client/src/app/generated/server.model.graphql
+++ b/client/src/app/generated/server.model.graphql
@@ -6010,6 +6010,11 @@ type Query {
     variantOrigin: VariantOrigin
   ): EvidenceItemConnection!
 
+  """
+  Find a single feature by CIViC ID
+  """
+  feature(id: Int): Gene
+
   """
   Find a flag by CIViC ID
   """
diff --git a/client/src/app/generated/server.schema.json b/client/src/app/generated/server.schema.json
index 6cc75a767..5c9f37f10 100644
--- a/client/src/app/generated/server.schema.json
+++ b/client/src/app/generated/server.schema.json
@@ -28251,6 +28251,31 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "feature",
+              "description": "Find a single feature by CIViC ID",
+              "args": [
+                {
+                  "name": "id",
+                  "description": null,
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                }
+              ],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Gene",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "flag",
               "description": "Find a flag by CIViC ID",
diff --git a/client/src/app/layout/layout-routing.module.ts b/client/src/app/layout/layout-routing.module.ts
index b1120623f..b906a5f38 100644
--- a/client/src/app/layout/layout-routing.module.ts
+++ b/client/src/app/layout/layout-routing.module.ts
@@ -81,6 +81,14 @@ const routes: Routes = [
           breadcrumb: 'Genes',
         },
       },
+      {
+        path: 'features',
+        loadChildren: () =>
+          import('@app/views/features/features.module').then((m) => m.FeaturesModule),
+        data: {
+          breadcrumb: 'Features',
+        },
+      },
       {
         path: 'organizations',
         loadChildren: () =>
diff --git a/client/src/app/views/features/features-detail/features-comments/features-comments.module.ts b/client/src/app/views/features/features-detail/features-comments/features-comments.module.ts
new file mode 100644
index 000000000..b757b2c08
--- /dev/null
+++ b/client/src/app/views/features/features-detail/features-comments/features-comments.module.ts
@@ -0,0 +1,11 @@
+import { NgModule } from '@angular/core'
+import { CommonModule } from '@angular/common'
+import { FeaturesCommentsPage } from './features-comments.page'
+import { CvcCommentListModule } from '@app/components/comments/comment-list/comment-list.module'
+
+@NgModule({
+  declarations: [FeaturesCommentsPage],
+  imports: [CommonModule, CvcCommentListModule],
+  exports: [FeaturesCommentsPage],
+})
+export class FeaturesCommentsModule {}
diff --git a/client/src/app/views/features/features-detail/features-comments/features-comments.page.html b/client/src/app/views/features/features-detail/features-comments/features-comments.page.html
new file mode 100644
index 000000000..548a74c31
--- /dev/null
+++ b/client/src/app/views/features/features-detail/features-comments/features-comments.page.html
@@ -0,0 +1 @@
+<cvc-comment-list [commentable]="commentable"></cvc-comment-list>
diff --git a/client/src/app/views/features/features-detail/features-comments/features-comments.page.less b/client/src/app/views/features/features-detail/features-comments/features-comments.page.less
new file mode 100644
index 000000000..5d4e87f30
--- /dev/null
+++ b/client/src/app/views/features/features-detail/features-comments/features-comments.page.less
@@ -0,0 +1,3 @@
+:host {
+  display: block;
+}
diff --git a/client/src/app/views/features/features-detail/features-comments/features-comments.page.ts b/client/src/app/views/features/features-detail/features-comments/features-comments.page.ts
new file mode 100644
index 000000000..60c87000f
--- /dev/null
+++ b/client/src/app/views/features/features-detail/features-comments/features-comments.page.ts
@@ -0,0 +1,23 @@
+import { Component } from '@angular/core'
+import { ActivatedRoute } from '@angular/router'
+import {
+  CommentableEntities,
+  CommentableInput,
+} from '@app/generated/civic.apollo'
+
+@Component({
+  selector: 'cvc-features-comments',
+  templateUrl: './features-comments.page.html',
+  styleUrls: ['./features-comments.page.less'],
+})
+export class FeaturesCommentsPage {
+  commentable: CommentableInput
+
+  constructor(private route: ActivatedRoute) {
+    const geneId: number = +this.route.snapshot.params['featureId']
+    this.commentable = {
+      id: geneId,
+      entityType: CommentableEntities.Gene,
+    }
+  }
+}
diff --git a/client/src/app/views/features/features-detail/features-detail-routing.module.ts b/client/src/app/views/features/features-detail/features-detail-routing.module.ts
new file mode 100644
index 000000000..044c49f5b
--- /dev/null
+++ b/client/src/app/views/features/features-detail/features-detail-routing.module.ts
@@ -0,0 +1,74 @@
+import { NgModule } from '@angular/core'
+import { Routes, RouterModule } from '@angular/router'
+import { FeaturesCommentsModule } from './features-comments/features-comments.module'
+import { FeaturesCommentsPage } from './features-comments/features-comments.page'
+import { FeaturesDetailView } from './features-detail.view'
+import { FeaturesEventsModule } from './features-events/features-events.module'
+import { FeaturesEventsPage } from './features-events/features-events.page'
+import { FeaturesFlagsModule } from './features-flags/feature-flags.module'
+import { FeaturesFlagsPage } from './features-flags/features-flags.page'
+import { FeaturesRevisionsModule } from './features-revisions/features-revisions.module'
+import { FeaturesRevisionsPage } from './features-revisions/features-revisions.page'
+import { FeaturesSummaryModule } from './features-summary/features-summary.module'
+import { FeaturesSummaryPage } from './features-summary/features-summary.page'
+
+const routes: Routes = [
+  {
+    path: '',
+    component: FeaturesDetailView,
+    // setting 'DISPLAYNAME' here will cause breadcrumb & title generation logic
+    // to use a provided displayName instead of breadcrumb string
+    data: { breadcrumb: 'DISPLAYNAME' },
+    children: [
+      { path: '', redirectTo: 'summary', pathMatch: 'full' },
+      {
+        path: 'summary',
+        component: FeaturesSummaryPage,
+        data: {
+          breadcrumb: 'Summary',
+        },
+      },
+      {
+        path: 'comments',
+        component: FeaturesCommentsPage,
+        data: {
+          breadcrumb: 'Comments',
+        },
+      },
+      {
+        path: 'revisions',
+        component: FeaturesRevisionsPage,
+        data: {
+          breadcrumb: 'Revisions',
+        },
+      },
+      {
+        path: 'flags',
+        component: FeaturesFlagsPage,
+        data: {
+          breadcrumb: 'Summary',
+        },
+      },
+      {
+        path: 'events',
+        component: FeaturesEventsPage,
+        data: {
+          breadcrumb: 'Events',
+        },
+      },
+    ],
+  },
+]
+
+@NgModule({
+  imports: [
+    RouterModule.forChild(routes),
+    FeaturesSummaryModule,
+    FeaturesCommentsModule,
+    FeaturesRevisionsModule,
+    FeaturesFlagsModule,
+    FeaturesEventsModule,
+  ],
+  exports: [RouterModule],
+})
+export class FeaturesDetailRoutingModule {}
diff --git a/client/src/app/views/features/features-detail/features-detail.module.ts b/client/src/app/views/features/features-detail/features-detail.module.ts
new file mode 100644
index 000000000..e5852b943
--- /dev/null
+++ b/client/src/app/views/features/features-detail/features-detail.module.ts
@@ -0,0 +1,42 @@
+import { CommonModule } from '@angular/common'
+import { NgModule } from '@angular/core'
+import { CvcEventFeedModule } from '@app/components/events/event-feed/event-feed.module'
+import { CvcFlaggableModule } from '@app/components/flags/flaggable/flaggable.module'
+import { CvcContributorAvatarsModule } from '@app/components/shared/contributor-avatars/contributor-avatars.module'
+import { CvcEntitySubscriptionButtonModule } from '@app/components/shared/entity-subscription-button/entity-subscription-button.module'
+import { CvcSectionNavigationModule } from '@app/components/shared/section-navigation/section-navigation.module'
+import { CvcTabNavigationModule } from '@app/components/shared/tab-navigation/tab-navigation.module'
+import { CvcPipesModule } from '@app/core/pipes/pipes.module'
+import { LetDirective, PushPipe } from '@ngrx/component'
+import { NzButtonModule } from 'ng-zorro-antd/button'
+import { NzGridModule } from 'ng-zorro-antd/grid'
+import { NzIconModule } from 'ng-zorro-antd/icon'
+import { NzPageHeaderModule } from 'ng-zorro-antd/page-header'
+import { NzSpaceModule } from 'ng-zorro-antd/space'
+import { NzTypographyModule } from 'ng-zorro-antd/typography'
+import { FeaturesDetailRoutingModule } from './features-detail-routing.module'
+import { FeaturesDetailView } from './features-detail.view'
+
+@NgModule({
+  declarations: [FeaturesDetailView],
+  imports: [
+    CommonModule,
+    FeaturesDetailRoutingModule,
+    LetDirective,
+    PushPipe,
+    NzButtonModule,
+    NzIconModule,
+    NzPageHeaderModule,
+    NzSpaceModule,
+    NzTypographyModule,
+    NzGridModule,
+    CvcPipesModule,
+    CvcTabNavigationModule,
+    CvcFlaggableModule,
+    CvcContributorAvatarsModule,
+    CvcSectionNavigationModule,
+    CvcEntitySubscriptionButtonModule,
+    CvcEventFeedModule,
+  ],
+})
+export class FeaturesDetailModule {}
diff --git a/client/src/app/views/features/features-detail/features-detail.query.gql b/client/src/app/views/features/features-detail/features-detail.query.gql
new file mode 100644
index 000000000..e8f27ac36
--- /dev/null
+++ b/client/src/app/views/features/features-detail/features-detail.query.gql
@@ -0,0 +1,21 @@
+query GeneDetail($geneId: Int!) {
+  gene(id: $geneId) {
+    ...GeneDetailFields
+  }
+}
+
+fragment GeneDetailFields on Gene {
+  id
+  name
+  officialName
+  entrezId
+  flags(state: OPEN) {
+    totalCount
+  }
+  revisions(status: NEW) {
+    totalCount
+  }
+  comments {
+    totalCount
+  }
+}
diff --git a/client/src/app/views/features/features-detail/features-detail.view.html b/client/src/app/views/features/features-detail/features-detail.view.html
new file mode 100644
index 000000000..1f6ec815f
--- /dev/null
+++ b/client/src/app/views/features/features-detail/features-detail.view.html
@@ -0,0 +1,85 @@
+<ng-container *ngIf="gene$ | async as gene">
+  <cvc-section-navigation [displayName]="gene.name"> </cvc-section-navigation>
+  <div
+    cvcFlaggable
+    [flags]="flagsTotal$ | ngrxPush">
+    <nz-page-header class="site-page-header">
+      <!-- title -->
+      <nz-page-header-title
+        cvcFlaggableOptions
+        [ngClass]="{ 'flagged': gene.flags.totalCount > 0 }">
+        <i
+          nz-icon
+          nzTheme="twotone"
+          [nzTwotoneColor]="'Gene' | entityColor"
+          nzType="civic-gene"></i>
+        {{ gene.name }}
+      </nz-page-header-title>
+
+      <!-- subtitle -->
+      <nz-page-header-subtitle>
+        {{ gene.officialName }}
+      </nz-page-header-subtitle>
+
+      <!-- header action btns, actions menu -->
+      <nz-page-header-extra *ngrxLet="viewer$ as viewer">
+        <nz-space
+          nzDirection="horizontal"
+          nzSize="small"
+          *ngrxLet="viewer$ as viewer">
+          <!-- add revision btn -->
+          <span *nzSpaceItem>
+            <button
+              [routerLink]="['/features', gene.id, 'revise']"
+              *ngIf="viewer.signedIn"
+              routerLinkActive
+              #rlaComments="routerLinkActive"
+              [nzType]="rlaComments.isActive ? 'primary' : 'default'"
+              nz-button
+              nzSize="small">
+              Revise
+            </button>
+          </span>
+
+          <!-- add flag btn -->
+          <!-- TODO implement as flag form within popover window -->
+          <span *nzSpaceItem>
+            <button
+              routerLink="flags"
+              *ngIf="viewer.signedIn"
+              routerLinkActive
+              #rlaComments="routerLinkActive"
+              [nzType]="rlaComments.isActive ? 'primary' : 'default'"
+              nz-button
+              nzSize="small">
+              Flag
+            </button>
+          </span>
+
+          <span *nzSpaceItem>
+            <cvc-entity-subscription-button
+              *ngIf="viewer.signedIn && subscribable"
+              [viewer]="viewer"
+              [subscribableId]="subscribable.id"
+              typename="Gene">
+            </cvc-entity-subscription-button>
+          </span>
+        </nz-space>
+      </nz-page-header-extra>
+
+      <nz-page-header-content>
+        <cvc-tab-navigation [tabs]="this.tabs$ | ngrxPush">
+          <ng-template #tabBarExtraContent>
+            <nz-col id="contributors-col">
+              <cvc-contributor-avatars
+                [subscribable]="subscribable"></cvc-contributor-avatars>
+            </nz-col>
+          </ng-template>
+        </cvc-tab-navigation>
+        <div class="content">
+          <router-outlet></router-outlet>
+        </div>
+      </nz-page-header-content>
+    </nz-page-header>
+  </div>
+</ng-container>
diff --git a/client/src/app/views/features/features-detail/features-detail.view.less b/client/src/app/views/features/features-detail/features-detail.view.less
new file mode 100644
index 000000000..00bda38f0
--- /dev/null
+++ b/client/src/app/views/features/features-detail/features-detail.view.less
@@ -0,0 +1 @@
+@import "themes/overrides/entity-page-header.overrides.less";
diff --git a/client/src/app/views/features/features-detail/features-detail.view.ts b/client/src/app/views/features/features-detail/features-detail.view.ts
new file mode 100644
index 000000000..21ae4bf4f
--- /dev/null
+++ b/client/src/app/views/features/features-detail/features-detail.view.ts
@@ -0,0 +1,120 @@
+import { Component, OnDestroy } from '@angular/core'
+import { ActivatedRoute } from '@angular/router'
+import { BehaviorSubject, Observable, Subject, Subscription } from 'rxjs'
+import { startWith, takeUntil } from 'rxjs/operators'
+import { pluck } from 'rxjs-etc/operators'
+import {
+  GeneDetailFieldsFragment,
+  GeneDetailGQL,
+  Maybe,
+  SubscribableEntities,
+  SubscribableInput,
+} from '@app/generated/civic.apollo'
+import { Viewer, ViewerService } from '@app/core/services/viewer/viewer.service'
+import { RouteableTab } from '@app/components/shared/tab-navigation/tab-navigation.component'
+
+@Component({
+  selector: 'features-detail',
+  templateUrl: './features-detail.view.html',
+  styleUrls: ['./features-detail.view.less'],
+})
+export class FeaturesDetailView implements OnDestroy {
+  loading$?: Observable<boolean>
+  gene$?: Observable<Maybe<GeneDetailFieldsFragment>>
+  viewer$: Observable<Viewer>
+  flagsTotal$?: Observable<number>
+  routeSub: Subscription
+  subscribable?: SubscribableInput
+
+  tabs$: BehaviorSubject<RouteableTab[]>
+  destroy$ = new Subject<void>()
+  defaultTabs: RouteableTab[] = [
+    {
+      routeName: 'summary',
+      iconName: 'pic-left',
+      tabLabel: 'Summary',
+    },
+    {
+      routeName: 'comments',
+      iconName: 'civic-comment',
+      tabLabel: 'Comments',
+    },
+    {
+      routeName: 'revisions',
+      iconName: 'civic-revision',
+      tabLabel: 'Revisions',
+    },
+    {
+      routeName: 'flags',
+      iconName: 'civic-flag',
+      tabLabel: 'Flags',
+    },
+    {
+      routeName: 'events',
+      iconName: 'civic-event',
+      tabLabel: 'Events',
+    },
+  ]
+
+  constructor(
+    private gql: GeneDetailGQL,
+    private viewerService: ViewerService,
+    private route: ActivatedRoute
+  ) {
+    this.tabs$ = new BehaviorSubject(this.defaultTabs)
+    this.viewer$ = this.viewerService.viewer$
+
+    this.routeSub = this.route.params.subscribe((params) => {
+      let observable = this.gql.watch({ geneId: +params.featureId }).valueChanges
+
+      this.loading$ = observable.pipe(pluck('loading'), startWith(true))
+
+      this.gene$ = observable.pipe(pluck('data', 'gene'))
+
+      this.flagsTotal$ = this.gene$.pipe(pluck('flags', 'totalCount'))
+
+      this.gene$
+        .pipe(takeUntil(this.destroy$))
+        .subscribe({
+          next: (geneResp) => {
+            this.tabs$.next(
+              this.defaultTabs.map((tab) => {
+                if (tab.tabLabel === 'Revisions') {
+                  return {
+                    badgeCount: geneResp?.revisions.totalCount,
+                    ...tab,
+                  }
+                } else if (tab.tabLabel === 'Comments') {
+                  return {
+                    badgeCount: geneResp?.comments.totalCount,
+                    badgeColor: '#cccccc',
+                    ...tab,
+                  }
+                } else {
+                  return tab
+                }
+              })
+            )
+          },
+        })
+
+      this.subscribable = {
+        id: +params.featureId,
+        entityType: SubscribableEntities.Gene,
+      }
+    })
+  }
+
+  filterCurators = (u: any): boolean => {
+    return u.role == 'curator'
+  }
+  filterEditors = (u: any): boolean => {
+    return u.role == 'editor' || u.role == 'admin'
+  }
+
+  ngOnDestroy() {
+    this.routeSub.unsubscribe()
+    this.destroy$.next()
+    this.destroy$.unsubscribe()
+  }
+}
diff --git a/client/src/app/views/features/features-detail/features-events/features-events.module.ts b/client/src/app/views/features/features-detail/features-events/features-events.module.ts
new file mode 100644
index 000000000..3bda67f36
--- /dev/null
+++ b/client/src/app/views/features/features-detail/features-events/features-events.module.ts
@@ -0,0 +1,11 @@
+import { NgModule } from '@angular/core'
+import { CommonModule } from '@angular/common'
+import { FeaturesEventsPage } from './features-events.page'
+import { CvcEventFeedModule } from '@app/components/events/event-feed/event-feed.module'
+
+@NgModule({
+  declarations: [FeaturesEventsPage],
+  imports: [CommonModule, CvcEventFeedModule],
+  exports: [FeaturesEventsPage],
+})
+export class FeaturesEventsModule {}
diff --git a/client/src/app/views/features/features-detail/features-events/features-events.page.html b/client/src/app/views/features/features-detail/features-events/features-events.page.html
new file mode 100644
index 000000000..19dec6769
--- /dev/null
+++ b/client/src/app/views/features/features-detail/features-events/features-events.page.html
@@ -0,0 +1,3 @@
+<cvc-event-feed
+  [subscribable]="subscribable"
+  tagDisplay="hideSubject"></cvc-event-feed>
diff --git a/client/src/app/views/features/features-detail/features-events/features-events.page.less b/client/src/app/views/features/features-detail/features-events/features-events.page.less
new file mode 100644
index 000000000..5d4e87f30
--- /dev/null
+++ b/client/src/app/views/features/features-detail/features-events/features-events.page.less
@@ -0,0 +1,3 @@
+:host {
+  display: block;
+}
diff --git a/client/src/app/views/features/features-detail/features-events/features-events.page.ts b/client/src/app/views/features/features-detail/features-events/features-events.page.ts
new file mode 100644
index 000000000..0f816105f
--- /dev/null
+++ b/client/src/app/views/features/features-detail/features-events/features-events.page.ts
@@ -0,0 +1,23 @@
+import { Component } from '@angular/core'
+import { ActivatedRoute } from '@angular/router'
+import {
+  SubscribableEntities,
+  SubscribableInput,
+} from '@app/generated/civic.apollo'
+
+@Component({
+  selector: 'cvc-features-events',
+  templateUrl: './features-events.page.html',
+  styleUrls: ['./features-events.page.less'],
+})
+export class FeaturesEventsPage {
+  subscribable: SubscribableInput
+
+  constructor(private route: ActivatedRoute) {
+    const geneId: number = +this.route.snapshot.params['featureId']
+    this.subscribable = {
+      id: geneId,
+      entityType: SubscribableEntities.Gene,
+    }
+  }
+}
diff --git a/client/src/app/views/features/features-detail/features-flags/feature-flags.module.ts b/client/src/app/views/features/features-detail/features-flags/feature-flags.module.ts
new file mode 100644
index 000000000..338c366e5
--- /dev/null
+++ b/client/src/app/views/features/features-detail/features-flags/feature-flags.module.ts
@@ -0,0 +1,21 @@
+import { NgModule } from '@angular/core'
+import { CommonModule } from '@angular/common'
+import { FeaturesFlagsPage } from './features-flags.page'
+import { NzGridModule } from 'ng-zorro-antd/grid'
+import { NzCardModule } from 'ng-zorro-antd/card'
+import { NzSpaceModule } from 'ng-zorro-antd/space'
+import { NzSkeletonModule } from 'ng-zorro-antd/skeleton'
+import { CvcFlagListAndFilterModule } from '@app/components/flags/flag-list-and-filter/flag-list-and-filter.module'
+
+@NgModule({
+  declarations: [FeaturesFlagsPage],
+  imports: [
+    CommonModule,
+    NzGridModule,
+    NzCardModule,
+    NzSpaceModule,
+    NzSkeletonModule,
+    CvcFlagListAndFilterModule,
+  ],
+})
+export class FeaturesFlagsModule {}
diff --git a/client/src/app/views/features/features-detail/features-flags/features-flags.page.html b/client/src/app/views/features/features-detail/features-flags/features-flags.page.html
new file mode 100644
index 000000000..5df531d27
--- /dev/null
+++ b/client/src/app/views/features/features-detail/features-flags/features-flags.page.html
@@ -0,0 +1 @@
+<cvc-flag-list-and-filter [flaggable]="flaggable"></cvc-flag-list-and-filter>
diff --git a/client/src/app/views/features/features-detail/features-flags/features-flags.page.less b/client/src/app/views/features/features-detail/features-flags/features-flags.page.less
new file mode 100644
index 000000000..5d4e87f30
--- /dev/null
+++ b/client/src/app/views/features/features-detail/features-flags/features-flags.page.less
@@ -0,0 +1,3 @@
+:host {
+  display: block;
+}
diff --git a/client/src/app/views/features/features-detail/features-flags/features-flags.page.ts b/client/src/app/views/features/features-detail/features-flags/features-flags.page.ts
new file mode 100644
index 000000000..4384f138c
--- /dev/null
+++ b/client/src/app/views/features/features-detail/features-flags/features-flags.page.ts
@@ -0,0 +1,23 @@
+import { Component, OnInit } from '@angular/core'
+import { ActivatedRoute } from '@angular/router'
+import { FlaggableEntities, FlaggableInput } from '@app/generated/civic.apollo'
+
+@Component({
+  selector: 'cvc-features-flags',
+  templateUrl: './features-flags.page.html',
+  styleUrls: ['./features-flags.page.less'],
+})
+export class FeaturesFlagsPage implements OnInit {
+  flaggable: FlaggableInput
+
+  constructor(private route: ActivatedRoute) {
+    const geneId: number = +this.route.snapshot.params['featureId']
+
+    this.flaggable = {
+      entityType: FlaggableEntities.Gene,
+      id: geneId,
+    }
+  }
+
+  ngOnInit(): void {}
+}
diff --git a/client/src/app/views/features/features-detail/features-revisions/features-revisions.module.ts b/client/src/app/views/features/features-detail/features-revisions/features-revisions.module.ts
new file mode 100644
index 000000000..900fbf236
--- /dev/null
+++ b/client/src/app/views/features/features-detail/features-revisions/features-revisions.module.ts
@@ -0,0 +1,35 @@
+import { NgModule } from '@angular/core'
+import { CommonModule } from '@angular/common'
+import { LetDirective, PushPipe } from '@ngrx/component'
+import { NzGridModule } from 'ng-zorro-antd/grid'
+import { NzListModule } from 'ng-zorro-antd/list'
+import { NzCardModule } from 'ng-zorro-antd/card'
+import { NzSpaceModule } from 'ng-zorro-antd/space'
+import { NzTagModule } from 'ng-zorro-antd/tag'
+import { NzTypographyModule } from 'ng-zorro-antd/typography'
+
+import { FeaturesRevisionsPage } from './features-revisions.page'
+import { CvcParticipantListModule } from '@app/components/shared/participant-list/participant-list.module'
+import { NzAvatarModule } from 'ng-zorro-antd/avatar'
+import { RevisionListModule } from '@app/components/revisions/revision-list/revision-list.module'
+import { CvcRevisionsListAndFilterModule } from '@app/components/revisions/revisions-list-and-filter/revisions-list-and-filter.module'
+
+@NgModule({
+  declarations: [FeaturesRevisionsPage],
+  imports: [
+    CommonModule,
+    LetDirective,
+    PushPipe,
+    NzGridModule,
+    NzListModule,
+    NzCardModule,
+    NzSpaceModule,
+    NzTagModule,
+    NzTypographyModule,
+    NzAvatarModule,
+    CvcParticipantListModule,
+    RevisionListModule,
+    CvcRevisionsListAndFilterModule,
+  ],
+})
+export class FeaturesRevisionsModule {}
diff --git a/client/src/app/views/features/features-detail/features-revisions/features-revisions.page.html b/client/src/app/views/features/features-detail/features-revisions/features-revisions.page.html
new file mode 100644
index 000000000..1452354c2
--- /dev/null
+++ b/client/src/app/views/features/features-detail/features-revisions/features-revisions.page.html
@@ -0,0 +1,3 @@
+<cvc-revisions-list-and-filter
+  [id]="this.geneId"
+  [entityType]="this.entityType"></cvc-revisions-list-and-filter>
diff --git a/client/src/app/views/features/features-detail/features-revisions/features-revisions.page.less b/client/src/app/views/features/features-detail/features-revisions/features-revisions.page.less
new file mode 100644
index 000000000..5d4e87f30
--- /dev/null
+++ b/client/src/app/views/features/features-detail/features-revisions/features-revisions.page.less
@@ -0,0 +1,3 @@
+:host {
+  display: block;
+}
diff --git a/client/src/app/views/features/features-detail/features-revisions/features-revisions.page.ts b/client/src/app/views/features/features-detail/features-revisions/features-revisions.page.ts
new file mode 100644
index 000000000..6b297e431
--- /dev/null
+++ b/client/src/app/views/features/features-detail/features-revisions/features-revisions.page.ts
@@ -0,0 +1,27 @@
+import { Component, OnDestroy } from '@angular/core'
+import { ActivatedRoute } from '@angular/router'
+import { ModeratedEntities } from '@app/generated/civic.apollo'
+import { Subscription } from 'rxjs'
+
+@Component({
+  selector: 'cvc-features-revisions',
+  templateUrl: './features-revisions.page.html',
+  styleUrls: ['./features-revisions.page.less'],
+})
+export class FeaturesRevisionsPage implements OnDestroy {
+  geneId!: number
+  entityType!: ModeratedEntities
+
+  routeSub: Subscription
+
+  constructor(private route: ActivatedRoute) {
+    this.routeSub = this.route.params.subscribe((params) => {
+      this.geneId = +params.featureId
+      this.entityType = ModeratedEntities['Gene']
+    })
+  }
+
+  ngOnDestroy() {
+    this.routeSub.unsubscribe()
+  }
+}
diff --git a/client/src/app/views/features/features-detail/features-summary/features-summary.module.ts b/client/src/app/views/features/features-detail/features-summary/features-summary.module.ts
new file mode 100644
index 000000000..076a1dbb5
--- /dev/null
+++ b/client/src/app/views/features/features-detail/features-summary/features-summary.module.ts
@@ -0,0 +1,46 @@
+import { NgModule } from '@angular/core'
+import { CommonModule } from '@angular/common'
+import { FeaturesSummaryPage } from './features-summary.page'
+import { LetDirective, PushPipe } from '@ngrx/component'
+import { NzGridModule } from 'ng-zorro-antd/grid'
+import { NzDescriptionsModule } from 'ng-zorro-antd/descriptions'
+import { NzTypographyModule } from 'ng-zorro-antd/typography'
+import { CvcEmptyRevisableModule } from '@app/components/shared/empty-revisable/empty-revisable.module'
+import { CvcTagListModule } from '@app/components/shared/tag-list/tag-list.module'
+import { CvcLinkTagModule } from '@app/components/shared/link-tag/link-tag.module'
+import { NzSpaceModule } from 'ng-zorro-antd/space'
+import { CvcSourceTagModule } from '@app/components/sources/source-tag/source-tag.module'
+import { CvcVariantsMenuModule } from '@app/components/variants/variants-menu/variants-menu.module'
+import { CvcMyGeneInfoModule } from '@app/components/genes/my-gene-info/my-gene-info.module'
+import { CvcStatusTagModule } from '@app/components/shared/status-tag/status-tag.module'
+import { CvcUserTagModule } from '@app/components/users/user-tag/user-tag.module'
+import { NzTagModule } from 'ng-zorro-antd/tag'
+import { NzTabsModule } from 'ng-zorro-antd/tabs'
+import { CvcMolecularProfilesMenuModule } from '@app/components/molecular-profiles/molecular-profiles-menu/molecular-profiles-menu.module'
+
+@NgModule({
+  declarations: [FeaturesSummaryPage],
+  imports: [
+    CommonModule,
+    LetDirective,
+    PushPipe,
+    NzGridModule,
+    NzDescriptionsModule,
+    NzTypographyModule,
+    NzSpaceModule,
+    NzTagModule,
+    NzTabsModule,
+
+    CvcEmptyRevisableModule,
+    CvcTagListModule,
+    CvcLinkTagModule,
+    CvcSourceTagModule,
+    CvcStatusTagModule,
+    CvcUserTagModule,
+    CvcVariantsMenuModule,
+    CvcMyGeneInfoModule,
+    CvcMolecularProfilesMenuModule,
+  ],
+  exports: [FeaturesSummaryPage],
+})
+export class FeaturesSummaryModule {}
diff --git a/client/src/app/views/features/features-detail/features-summary/features-summary.page.html b/client/src/app/views/features/features-detail/features-summary/features-summary.page.html
new file mode 100644
index 000000000..4158d60eb
--- /dev/null
+++ b/client/src/app/views/features/features-detail/features-summary/features-summary.page.html
@@ -0,0 +1,117 @@
+<ng-container *ngIf=" (gene$ | ngrxPush) as gene">
+  <!-- page layout row -->
+  <nz-row [nzGutter]="[8,16]">
+    <nz-col nzSpan="12">
+      <!-- LEFT COLUMN -->
+      <nz-row [nzGutter]="[8,8]">
+        <!-- gene description, sources block -->
+        <nz-col nzSpan="24">
+          <!-- description, sources -->
+          <nz-descriptions
+            nzLayout="vertical"
+            nzSize="small"
+            nzBordered="true"
+            [nzColumn]="1">
+            <!-- description -->
+            <nz-descriptions-item nzTitle="Description">
+              <p
+                *ngIf="gene.description; else noDescription"
+                nz-typography
+                nzEllipsis
+                nzExpandable
+                [nzEllipsisRows]="8">
+                {{ gene.description }}
+              </p>
+
+              <!-- noDescription Tpl -->
+              <ng-template #noDescription>
+                <cvc-empty-revisable notification="No description provided">
+                </cvc-empty-revisable>
+              </ng-template>
+            </nz-descriptions-item>
+          </nz-descriptions>
+        </nz-col>
+
+        <!-- sources, aliases, resource block -->
+        <nz-col nzSpan="24">
+          <nz-descriptions
+            nzLayout="horizontal"
+            nzSize="small"
+            [nzColumn]="1"
+            nzBordered="true">
+            <!-- sources -->
+            <nz-descriptions-item nzTitle="Sources">
+              <ng-container *ngIf="gene.sources.length > 0; else noSources">
+                <cvc-tag-list>
+                  <cvc-source-tag
+                    *ngFor="let source of gene.sources"
+                    [source]="source"></cvc-source-tag>
+                </cvc-tag-list>
+              </ng-container>
+              <ng-template #noSources>
+                <span
+                  nz-typography
+                  nzType="secondary"
+                  >None specified</span
+                >
+              </ng-template>
+            </nz-descriptions-item>
+
+            <!-- aliases -->
+            <nz-descriptions-item
+              nzTitle="Aliases"
+              *ngIf="gene.geneAliases.length > 0; else noAliases">
+              <nz-tag *ngFor="let alias of gene.geneAliases"
+                >{{ alias }}</nz-tag
+              >
+            </nz-descriptions-item>
+            <ng-template #noAliases>
+              <span
+                nz-typography
+                nzType="secondary"
+                >None specified</span
+              >
+            </ng-template>
+
+            <!-- resource links -->
+            <nz-descriptions-item nzTitle="Resources">
+              <cvc-tag-list>
+                <cvc-link-tag
+                  [href]="'http://dgidb.org/genes/' + gene.name"
+                  [tooltip]="'View ' + gene.name + ' on DGIdb'">
+                  DGIdb
+                </cvc-link-tag>
+                <cvc-link-tag
+                  [href]="'https://pecan.stjude.cloud/variants/protein-paint/?gene=' + gene.name"
+                  [tooltip]="'View ' + gene.name + ' on ProteinPaint'">
+                  ProteinPaint
+                </cvc-link-tag>
+              </cvc-tag-list>
+            </nz-descriptions-item>
+          </nz-descriptions>
+        </nz-col>
+      </nz-row>
+    </nz-col>
+
+    <!-- last revision submitted/accepted, mygeneinfo col -->
+    <nz-col nzSpan="12">
+      <!-- mygeneinfo -->
+      <cvc-my-gene-info [geneInfo]="gene.myGeneInfoDetails"></cvc-my-gene-info>
+    </nz-col>
+
+    <!-- variant menu row -->
+    <nz-col [nzSpan]="24">
+      <nz-tabset nzType="card">
+        <nz-tab nzTitle="Molecular Profiles">
+          <cvc-molecular-profile-menu
+            [geneId]="gene.id"></cvc-molecular-profile-menu>
+        </nz-tab>
+        <nz-tab nzTitle="Variants">
+          <cvc-variant-menu
+            [geneId]="gene.id"
+            [geneName]="gene.name"></cvc-variant-menu>
+        </nz-tab>
+      </nz-tabset>
+    </nz-col>
+  </nz-row>
+</ng-container>
diff --git a/client/src/app/views/features/features-detail/features-summary/features-summary.page.less b/client/src/app/views/features/features-detail/features-summary/features-summary.page.less
new file mode 100644
index 000000000..b2848ee08
--- /dev/null
+++ b/client/src/app/views/features/features-detail/features-summary/features-summary.page.less
@@ -0,0 +1,9 @@
+@import "themes/overrides/descriptions-overrides.less";
+:host {
+  display: block;
+}
+
+nz-space,
+nz-space-item {
+  width: 100%;
+}
diff --git a/client/src/app/views/features/features-detail/features-summary/features-summary.page.ts b/client/src/app/views/features/features-detail/features-summary/features-summary.page.ts
new file mode 100644
index 000000000..3c0fa5280
--- /dev/null
+++ b/client/src/app/views/features/features-detail/features-summary/features-summary.page.ts
@@ -0,0 +1,54 @@
+import { Component, OnDestroy, OnInit } from '@angular/core'
+import { ActivatedRoute } from '@angular/router'
+import { Observable, Subscription } from 'rxjs'
+import { pluck } from 'rxjs-etc/operators'
+
+import {
+  SubscribableEntities,
+  SubscribableInput,
+  GenesSummaryGQL,
+  GeneSummaryFieldsFragment,
+  Maybe,
+} from '@app/generated/civic.apollo'
+
+import { Viewer, ViewerService } from '@app/core/services/viewer/viewer.service'
+
+@Component({
+  selector: 'cvc-features-summary',
+  templateUrl: './features-summary.page.html',
+  styleUrls: ['./features-summary.page.less'],
+})
+export class FeaturesSummaryPage implements OnDestroy {
+  gene$?: Observable<Maybe<GeneSummaryFieldsFragment>>
+  loading$?: Observable<boolean>
+  viewer$?: Observable<Viewer>
+
+  subscribableEntity?: SubscribableInput
+
+  routeSub: Subscription
+
+  constructor(
+    private gql: GenesSummaryGQL,
+    private viewerService: ViewerService,
+    private route: ActivatedRoute
+  ) {
+    this.routeSub = this.route.params.subscribe((params) => {
+      this.viewer$ = this.viewerService.viewer$
+
+      let queryRef = this.gql.watch({ geneId: +params.featureId })
+      let observable = queryRef.valueChanges
+
+      this.subscribableEntity = {
+        id: +params.geneId,
+        entityType: SubscribableEntities.Gene,
+      }
+
+      this.gene$ = observable.pipe(pluck('data', 'gene'))
+      this.loading$ = observable.pipe(pluck('loading'))
+    })
+  }
+
+  ngOnDestroy() {
+    this.routeSub.unsubscribe()
+  }
+}
diff --git a/client/src/app/views/features/features-detail/features-summary/features-summary.query.gql b/client/src/app/views/features/features-detail/features-summary/features-summary.query.gql
new file mode 100644
index 000000000..22e518a14
--- /dev/null
+++ b/client/src/app/views/features/features-detail/features-summary/features-summary.query.gql
@@ -0,0 +1,47 @@
+query GenesSummary($geneId: Int!) {
+  gene(id: $geneId) {
+    ...GeneSummaryFields
+  }
+}
+
+fragment GeneSummaryFields on Gene {
+  description
+  entrezId
+  geneAliases
+  id
+  name
+  officialName
+  sources {
+    id
+    citation
+    link
+    sourceUrl
+    displayType
+    sourceType
+  }
+  variants {
+    edges {
+      node {
+        id
+        name
+      }
+    }
+  }
+  myGeneInfoDetails
+  lastSubmittedRevisionEvent {
+    originatingUser {
+      id
+      displayName
+      role
+      profileImagePath(size: 32)
+    }
+  }
+  lastAcceptedRevisionEvent {
+    originatingUser {
+      id
+      displayName
+      role
+      profileImagePath(size: 32)
+    }
+  }
+}
diff --git a/client/src/app/views/features/features-home/features-home.module.ts b/client/src/app/views/features/features-home/features-home.module.ts
new file mode 100644
index 000000000..ab49324d8
--- /dev/null
+++ b/client/src/app/views/features/features-home/features-home.module.ts
@@ -0,0 +1,30 @@
+import { CommonModule } from '@angular/common'
+import { NgModule } from '@angular/core'
+import { CvcGenesTableModule } from '@app/components/genes/genes-table/genes-table.module'
+import { CvcSectionNavigationModule } from '@app/components/shared/section-navigation/section-navigation.module'
+import { CvcPipesModule } from '@app/core/pipes/pipes.module'
+import { NzButtonModule } from 'ng-zorro-antd/button'
+import { NzGridModule } from 'ng-zorro-antd/grid'
+import { NzIconModule } from 'ng-zorro-antd/icon'
+import { NzPageHeaderModule } from 'ng-zorro-antd/page-header'
+import { NzSpaceModule } from 'ng-zorro-antd/space'
+import { NzTypographyModule } from 'ng-zorro-antd/typography'
+import { FeaturesHomePage } from './features-home.page'
+
+@NgModule({
+  declarations: [FeaturesHomePage],
+  imports: [
+    CommonModule,
+    NzButtonModule,
+    NzIconModule,
+    NzSpaceModule,
+    NzTypographyModule,
+    NzPageHeaderModule,
+    NzGridModule,
+    CvcPipesModule,
+    CvcSectionNavigationModule,
+    CvcGenesTableModule,
+  ],
+  exports: [FeaturesHomePage],
+})
+export class FeaturesHomeModule {}
diff --git a/client/src/app/views/features/features-home/features-home.page.html b/client/src/app/views/features/features-home/features-home.page.html
new file mode 100644
index 000000000..791073a94
--- /dev/null
+++ b/client/src/app/views/features/features-home/features-home.page.html
@@ -0,0 +1,72 @@
+<cvc-section-navigation> </cvc-section-navigation>
+<nz-page-header class="site-page-header">
+  <!--content-->
+  <nz-page-header-content>
+    <!-- title, description, docs links -->
+    <nz-row class="header-content">
+      <nz-col
+        nzFlex="64px"
+        class="header-icon">
+        <i
+          nz-icon
+          nzTheme="twotone"
+          [nzTwotoneColor]="'Gene' | entityColor"
+          nzType="civic-gene"></i>
+      </nz-col>
+      <nz-col
+        nzFlex="0 1 600px"
+        class="header-description">
+        <h2>Features</h2>
+        <p
+          nz-typography
+          nzEllipsis
+          nzExpandable
+          [nzEllipsisRows]="2">
+          CIViC Features include a feature-level summary, a link to the Drug Gene
+          Interation Database, and extensive gene details from MyGene.info.
+        </p>
+      </nz-col>
+      <nz-col
+        nzFlex="auto"
+        class="header-links">
+        <nz-space
+          nzDirection="vertical"
+          class="docs-buttons">
+          <a
+            nz-button
+            href="https://civic.readthedocs.io/en/latest/model/genes.html"
+            target="_blank"
+            nzSize="small"
+            nzBlock
+            *nzSpaceItem>
+            <i
+              nz-icon
+              nzType="link"
+              nzTheme="outline"></i>
+            View Gene Model Docs
+          </a>
+          <a
+            nz-button
+            href="https://civic.readthedocs.io/en/latest/curating/genes.html"
+            target="_blank"
+            nzSize="small"
+            nzBlock
+            *nzSpaceItem>
+            <i
+              nz-icon
+              nzType="link"
+              nzTheme="outline"></i>
+            View Gene Curation Docs
+          </a>
+        </nz-space>
+      </nz-col>
+    </nz-row>
+    <nz-row>
+      <nz-col [nzSpan]="24">
+        <div class="content">
+          <cvc-genes-table cvcTitle="Browse All Genes"></cvc-genes-table>
+        </div>
+      </nz-col>
+    </nz-row>
+  </nz-page-header-content>
+</nz-page-header>
diff --git a/client/src/app/views/features/features-home/features-home.page.less b/client/src/app/views/features/features-home/features-home.page.less
new file mode 100644
index 000000000..00bda38f0
--- /dev/null
+++ b/client/src/app/views/features/features-home/features-home.page.less
@@ -0,0 +1 @@
+@import "themes/overrides/entity-page-header.overrides.less";
diff --git a/client/src/app/views/features/features-home/features-home.page.ts b/client/src/app/views/features/features-home/features-home.page.ts
new file mode 100644
index 000000000..7ec6d74fd
--- /dev/null
+++ b/client/src/app/views/features/features-home/features-home.page.ts
@@ -0,0 +1,12 @@
+import { Component, OnInit } from '@angular/core'
+
+@Component({
+  selector: 'cvc-features-home',
+  templateUrl: './features-home.page.html',
+  styleUrls: ['./features-home.page.less'],
+})
+export class FeaturesHomePage implements OnInit {
+  constructor() {}
+
+  ngOnInit(): void {}
+}
diff --git a/client/src/app/views/features/features-revise/features-revise-routing.module.ts b/client/src/app/views/features/features-revise/features-revise-routing.module.ts
new file mode 100644
index 000000000..771609e23
--- /dev/null
+++ b/client/src/app/views/features/features-revise/features-revise-routing.module.ts
@@ -0,0 +1,28 @@
+import { NgModule } from '@angular/core'
+import { Routes, RouterModule } from '@angular/router'
+import { FeaturesReviseView } from './features-revise.view'
+import { FeaturesSuggestModule } from './features-suggest/features-suggest.module'
+import { FeaturesSuggestPage } from './features-suggest/features-suggest.page'
+
+const routes: Routes = [
+  {
+    path: '',
+    component: FeaturesReviseView,
+    data: { breadcrumb: 'Revise' },
+    children: [
+      { path: '', redirectTo: 'suggest', pathMatch: 'full' },
+      {
+        path: 'suggest',
+        component: FeaturesSuggestPage,
+        data: {
+          breadcrumb: 'Suggest Revision',
+        },
+      },
+    ],
+  },
+]
+
+@NgModule({
+  imports: [RouterModule.forChild(routes), FeaturesSuggestModule],
+})
+export class FeaturesReviseRoutingModule {}
diff --git a/client/src/app/views/features/features-revise/features-revise.module.ts b/client/src/app/views/features/features-revise/features-revise.module.ts
new file mode 100644
index 000000000..eaea31523
--- /dev/null
+++ b/client/src/app/views/features/features-revise/features-revise.module.ts
@@ -0,0 +1,32 @@
+import { CommonModule } from '@angular/common'
+import { NgModule } from '@angular/core'
+import { RouterModule } from '@angular/router'
+import { CvcLoginPromptModule } from '@app/components/shared/login-prompt/login-prompt.module'
+import { CvcSectionNavigationModule } from '@app/components/shared/section-navigation/section-navigation.module'
+import { CvcPipesModule } from '@app/core/pipes/pipes.module'
+import { LetDirective, PushPipe } from '@ngrx/component'
+import { NzGridModule } from 'ng-zorro-antd/grid'
+import { NzIconModule } from 'ng-zorro-antd/icon'
+import { NzPageHeaderModule } from 'ng-zorro-antd/page-header'
+import { FeaturesReviseRoutingModule } from './features-revise-routing.module'
+import { FeaturesReviseView } from './features-revise.view'
+
+@NgModule({
+  declarations: [FeaturesReviseView],
+  imports: [
+    CommonModule,
+    RouterModule,
+    LetDirective,
+    PushPipe,
+    FeaturesReviseRoutingModule,
+
+    NzPageHeaderModule,
+    NzIconModule,
+    NzGridModule,
+
+    CvcLoginPromptModule,
+    CvcSectionNavigationModule,
+    CvcPipesModule,
+  ],
+})
+export class FeaturesReviseModule {}
diff --git a/client/src/app/views/features/features-revise/features-revise.view.html b/client/src/app/views/features/features-revise/features-revise.view.html
new file mode 100644
index 000000000..af88f2d5b
--- /dev/null
+++ b/client/src/app/views/features/features-revise/features-revise.view.html
@@ -0,0 +1,38 @@
+<ng-container *ngIf="gene$ | async as gene">
+  <cvc-section-navigation [displayName]="gene.name"> </cvc-section-navigation>
+
+  <nz-page-header class="site-page-header">
+    <!-- title -->
+    <nz-page-header-title cvcFlaggableOptions>
+      REVISE
+      <i
+        nz-icon
+        nzTheme="twotone"
+        [nzTwotoneColor]="'Gene' | entityColor"
+        nzType="civic-gene"></i>
+      {{ gene.name }}
+    </nz-page-header-title>
+
+    <!-- subtitle -->
+    <nz-page-header-subtitle> {{ gene.officialName }} </nz-page-header-subtitle>
+
+    <nz-page-header-content>
+      <div class="content">
+        <div *ngIf="isSignedIn$ | ngrxPush as isSignedIn; else notSignedIn">
+          <router-outlet></router-outlet>
+        </div>
+        <ng-template #notSignedIn>
+          <nz-row
+            nzSpan="24"
+            nzJustify="center">
+            <div
+              nz-col
+              nzSpan="6">
+              <cvc-login-prompt></cvc-login-prompt>
+            </div>
+          </nz-row>
+        </ng-template>
+      </div>
+    </nz-page-header-content>
+  </nz-page-header>
+</ng-container>
diff --git a/client/src/app/views/features/features-revise/features-revise.view.less b/client/src/app/views/features/features-revise/features-revise.view.less
new file mode 100644
index 000000000..00bda38f0
--- /dev/null
+++ b/client/src/app/views/features/features-revise/features-revise.view.less
@@ -0,0 +1 @@
+@import "themes/overrides/entity-page-header.overrides.less";
diff --git a/client/src/app/views/features/features-revise/features-revise.view.ts b/client/src/app/views/features/features-revise/features-revise.view.ts
new file mode 100644
index 000000000..fa85c6b4c
--- /dev/null
+++ b/client/src/app/views/features/features-revise/features-revise.view.ts
@@ -0,0 +1,54 @@
+import { Component, OnDestroy, OnInit } from '@angular/core'
+import { ActivatedRoute } from '@angular/router'
+import { ViewerService } from '@app/core/services/viewer/viewer.service'
+import {
+  GeneDetailFieldsFragment,
+  GeneDetailGQL,
+  Maybe,
+} from '@app/generated/civic.apollo'
+import { Observable, Subscription } from 'rxjs'
+import { map, startWith } from 'rxjs/operators'
+import { pluck } from 'rxjs-etc/operators'
+
+@Component({
+  selector: 'features-revise',
+  templateUrl: './features-revise.view.html',
+  styleUrls: ['./features-revise.view.less'],
+})
+export class FeaturesReviseView implements OnInit, OnDestroy {
+  loading$?: Observable<boolean>
+  gene$?: Observable<Maybe<GeneDetailFieldsFragment>>
+  commentsTotal$?: Observable<number>
+  revisionsTotal$?: Observable<number>
+  flagsTotal$?: Observable<number>
+  routeSub: Subscription
+  isSignedIn$?: Observable<boolean>
+
+  constructor(
+    private gql: GeneDetailGQL,
+    private route: ActivatedRoute,
+    private viewerService: ViewerService
+  ) {
+    this.routeSub = this.route.params.subscribe((params) => {
+      let observable = this.gql.watch({ geneId: +params.featureId }).valueChanges
+
+      this.loading$ = observable.pipe(pluck('loading'), startWith(true))
+
+      this.gene$ = observable.pipe(pluck('data', 'gene'))
+
+      this.commentsTotal$ = this.gene$.pipe(pluck('comments', 'totalCount'))
+
+      this.flagsTotal$ = this.gene$.pipe(pluck('flags', 'totalCount'))
+
+      this.revisionsTotal$ = this.gene$.pipe(pluck('revisions', 'totalCount'))
+    })
+  }
+
+  ngOnInit(): void {
+    this.isSignedIn$ = this.viewerService.viewer$.pipe(map((v) => v.signedIn))
+  }
+
+  ngOnDestroy(): void {
+    this.routeSub.unsubscribe()
+  }
+}
diff --git a/client/src/app/views/features/features-revise/features-suggest/features-suggest.module.ts b/client/src/app/views/features/features-revise/features-suggest/features-suggest.module.ts
new file mode 100644
index 000000000..eba050339
--- /dev/null
+++ b/client/src/app/views/features/features-revise/features-suggest/features-suggest.module.ts
@@ -0,0 +1,28 @@
+import { NgModule } from '@angular/core'
+import { CommonModule } from '@angular/common'
+import { FeaturesSuggestPage } from './features-suggest.page'
+import { NzGridModule } from 'ng-zorro-antd/grid'
+import { NzSpaceModule } from 'ng-zorro-antd/space'
+import { NzSkeletonModule } from 'ng-zorro-antd/skeleton'
+import { NzCardModule } from 'ng-zorro-antd/card'
+import { LetDirective, PushPipe } from '@ngrx/component'
+import { NzPageHeaderModule } from 'ng-zorro-antd/page-header'
+import { CvcSectionNavigationModule } from '@app/components/shared/section-navigation/section-navigation.module'
+import { CvcGeneReviseFormModule } from '@app/forms/config/gene-revise/gene-revise.form.module'
+
+@NgModule({
+  declarations: [FeaturesSuggestPage],
+  imports: [
+    CommonModule,
+    LetDirective,
+    PushPipe,
+    NzCardModule,
+    NzGridModule,
+    NzSpaceModule,
+    NzSkeletonModule,
+    NzPageHeaderModule,
+    CvcGeneReviseFormModule,
+    CvcSectionNavigationModule,
+  ],
+})
+export class FeaturesSuggestModule {}
diff --git a/client/src/app/views/features/features-revise/features-suggest/features-suggest.page.html b/client/src/app/views/features/features-revise/features-suggest/features-suggest.page.html
new file mode 100644
index 000000000..a0fb97f80
--- /dev/null
+++ b/client/src/app/views/features/features-revise/features-suggest/features-suggest.page.html
@@ -0,0 +1,4 @@
+<ng-container *ngIf="geneId; else loadingGene">
+  <cvc-gene-revise-form [geneId]="geneId"> </cvc-gene-revise-form>
+</ng-container>
+<ng-template #loadingGene>Loading Gene...</ng-template>
diff --git a/client/src/app/views/features/features-revise/features-suggest/features-suggest.page.less b/client/src/app/views/features/features-revise/features-suggest/features-suggest.page.less
new file mode 100644
index 000000000..00bda38f0
--- /dev/null
+++ b/client/src/app/views/features/features-revise/features-suggest/features-suggest.page.less
@@ -0,0 +1 @@
+@import "themes/overrides/entity-page-header.overrides.less";
diff --git a/client/src/app/views/features/features-revise/features-suggest/features-suggest.page.ts b/client/src/app/views/features/features-revise/features-suggest/features-suggest.page.ts
new file mode 100644
index 000000000..36bc3f875
--- /dev/null
+++ b/client/src/app/views/features/features-revise/features-suggest/features-suggest.page.ts
@@ -0,0 +1,23 @@
+import { Component, OnDestroy } from '@angular/core'
+import { ActivatedRoute } from '@angular/router'
+import { Subscription } from 'rxjs'
+
+@Component({
+  selector: 'cvc-features-suggest',
+  templateUrl: './features-suggest.page.html',
+  styleUrls: ['./features-suggest.page.less'],
+})
+export class FeaturesSuggestPage implements OnDestroy {
+  geneId?: number
+  routeParams$: Subscription
+
+  constructor(private route: ActivatedRoute) {
+    this.routeParams$ = this.route.params.subscribe((params) => {
+      this.geneId = +params.featureId
+    })
+  }
+
+  ngOnDestroy(): void {
+    this.routeParams$.unsubscribe()
+  }
+}
diff --git a/client/src/app/views/features/features-routing.module.ts b/client/src/app/views/features/features-routing.module.ts
new file mode 100644
index 000000000..238bd1d4b
--- /dev/null
+++ b/client/src/app/views/features/features-routing.module.ts
@@ -0,0 +1,49 @@
+import { NgModule } from '@angular/core'
+import { Routes, RouterModule } from '@angular/router'
+import { FeaturesView } from './features.view'
+import { FeaturesHomeModule } from './features-home/features-home.module'
+import { FeaturesHomePage } from './features-home/features-home.page'
+
+const routes: Routes = [
+  {
+    path: '',
+    component: FeaturesView,
+    children: [
+      { path: '', redirectTo: 'home', pathMatch: 'full' },
+      {
+        path: 'home',
+        component: FeaturesHomePage,
+        data: {
+          breadcrumb: 'Home',
+        },
+      },
+      {
+        path: ':featureId',
+        data: { breadcrumb: 'DISPLAYNAME' },
+        children: [
+          {
+            path: '',
+            loadChildren: () =>
+              import('@app/views/features/features-detail/features-detail.module').then(
+                (m) => m.FeaturesDetailModule
+              ),
+          },
+          {
+            path: 'revise',
+            loadChildren: () =>
+              import('@app/views/features/features-revise/features-revise.module').then(
+                (m) => m.FeaturesReviseModule
+              ),
+            data: { breadcrumb: 'Revise' },
+          },
+        ],
+      },
+    ],
+  },
+]
+
+@NgModule({
+  imports: [RouterModule.forChild(routes), FeaturesHomeModule],
+  exports: [RouterModule],
+})
+export class FeaturesRoutingModule {}
diff --git a/client/src/app/views/features/features.module.ts b/client/src/app/views/features/features.module.ts
new file mode 100644
index 000000000..4ca1b9c4f
--- /dev/null
+++ b/client/src/app/views/features/features.module.ts
@@ -0,0 +1,11 @@
+// framework imports
+import { CommonModule } from '@angular/common'
+import { NgModule } from '@angular/core'
+import { FeaturesRoutingModule } from './features-routing.module'
+import { FeaturesView } from './features.view'
+
+@NgModule({
+  declarations: [FeaturesView],
+  imports: [CommonModule, FeaturesRoutingModule],
+})
+export class FeaturesModule {}
diff --git a/client/src/app/views/features/features.view.html b/client/src/app/views/features/features.view.html
new file mode 100644
index 000000000..0680b43f9
--- /dev/null
+++ b/client/src/app/views/features/features.view.html
@@ -0,0 +1 @@
+<router-outlet></router-outlet>
diff --git a/client/src/app/views/features/features.view.ts b/client/src/app/views/features/features.view.ts
new file mode 100644
index 000000000..059d5b3f4
--- /dev/null
+++ b/client/src/app/views/features/features.view.ts
@@ -0,0 +1,9 @@
+import { Component } from '@angular/core'
+
+@Component({
+  selector: 'app-features',
+  templateUrl: './features.view.html',
+})
+export class FeaturesView {
+  constructor() {}
+}
diff --git a/server/app/graphql/types/query_type.rb b/server/app/graphql/types/query_type.rb
index c3e925577..d3f6f032d 100644
--- a/server/app/graphql/types/query_type.rb
+++ b/server/app/graphql/types/query_type.rb
@@ -59,6 +59,11 @@ def authorized?(object, args, context)
       argument :entrez_symbol, String, required: false
     end
 
+    field :feature, Types::Entities::GeneType, null: true do
+      description "Find a single feature by CIViC ID"
+      argument :id, Int, required: false
+    end
+
     field :variant, Types::Entities::VariantType, null: true do
       description "Find a variant by CIViC ID"
       argument :id, Int, required: true
@@ -212,6 +217,10 @@ def gene(id: :unspecified, entrez_symbol: :unspecified)
       end
     end
 
+    def feature(id: )
+      Feature.find_by(id: id).feature_instance
+    end
+
     def variant(id: )
       Variant.find_by(id: id)
     end

From f2126507c1f988355e2411bd9af4aa89fd4fb28e Mon Sep 17 00:00:00 2001
From: Susanna Kiwala <susanna.kiwala@wustl.edu>
Date: Fri, 8 Dec 2023 16:21:51 -0600
Subject: [PATCH 003/125] Frontend detail view updates for porting Genes to
 Features

---
 .../gene-popover/gene-popover.component.html  |   4 +-
 .../genes/gene-popover/gene-popover.query.gql |   2 +-
 .../types/gene-select/gene-select.query.gql   |   2 +-
 .../types/gene-select/gene-select.type.html   |   6 +-
 .../src/app/generated/civic.apollo-helpers.ts |  23 ++-
 client/src/app/generated/civic.apollo.ts      | 146 +++++++++++--
 .../src/app/generated/civic.possible-types.ts |   3 +
 .../features-detail/features-detail.query.gql |  29 +--
 .../features-detail/features-detail.view.html |  22 +-
 .../features-detail/features-detail.view.ts   |  26 +--
 .../features-summary.module.ts                |   2 +
 .../features-summary.page.html                | 111 +---------
 .../features-summary/features-summary.page.ts |  18 +-
 .../features-summary.query.gql                |  49 ++---
 .../genes-summary/genes-summary.page.html     | 194 ++++++++----------
 .../genes-summary/genes-summary.page.ts       |  44 +---
 .../genes-summary/genes-summary.query.gql     |   2 +-
 .../subscribable_entities_type.rb             |   2 +-
 server/app/models/my_gene_info.rb             |   2 +-
 19 files changed, 350 insertions(+), 337 deletions(-)

diff --git a/client/src/app/components/genes/gene-popover/gene-popover.component.html b/client/src/app/components/genes/gene-popover/gene-popover.component.html
index 0d4270c87..705a9722d 100644
--- a/client/src/app/components/genes/gene-popover/gene-popover.component.html
+++ b/client/src/app/components/genes/gene-popover/gene-popover.component.html
@@ -21,8 +21,8 @@
         <nz-descriptions-item
           nzTitle="Aliases"
           nzSpan="2"
-          *ngIf="gene.geneAliases.length > 0">
-          <nz-tag *ngFor="let alias of gene.geneAliases">{{ alias }}</nz-tag>
+          *ngIf="gene.featureAliases.length > 0">
+          <nz-tag *ngFor="let alias of gene.featureAliases">{{ alias }}</nz-tag>
         </nz-descriptions-item>
 
         <!-- variant count-->
diff --git a/client/src/app/components/genes/gene-popover/gene-popover.query.gql b/client/src/app/components/genes/gene-popover/gene-popover.query.gql
index a337207b0..91ace9185 100644
--- a/client/src/app/components/genes/gene-popover/gene-popover.query.gql
+++ b/client/src/app/components/genes/gene-popover/gene-popover.query.gql
@@ -8,7 +8,7 @@ fragment genePopover on Gene {
   id
   name
   officialName
-  geneAliases
+  featureAliases
   variants {
     totalCount
   }
diff --git a/client/src/app/forms/types/gene-select/gene-select.query.gql b/client/src/app/forms/types/gene-select/gene-select.query.gql
index c0d57db9e..99cccf77d 100644
--- a/client/src/app/forms/types/gene-select/gene-select.query.gql
+++ b/client/src/app/forms/types/gene-select/gene-select.query.gql
@@ -14,6 +14,6 @@ fragment GeneSelectTypeaheadFields on Gene {
   id
   entrezId
   name
-  geneAliases
+  featureAliases
   link
 }
diff --git a/client/src/app/forms/types/gene-select/gene-select.type.html b/client/src/app/forms/types/gene-select/gene-select.type.html
index 5346d4f53..f18ccf1da 100644
--- a/client/src/app/forms/types/gene-select/gene-select.type.html
+++ b/client/src/app/forms/types/gene-select/gene-select.type.html
@@ -28,15 +28,15 @@
       <span
         nz-typography
         nzType="secondary">
-        <ng-container *ngIf="result.geneAliases.length > 0; else noAliases">
+        <ng-container *ngIf="result.featureAliases.length > 0; else noAliases">
           <em>
             <span
               nz-typography
               nzType="secondary"
               nz-tooltip
-              [nzTooltipTitle]="result.geneAliases.join(', ')"
+              [nzTooltipTitle]="result.featureAliases.join(', ')"
               [innerHtml]="
-                result.geneAliases.join(', ')
+                result.featureAliases.join(', ')
                   | highlightTypeahead : searchString
               "></span
           ></em>
diff --git a/client/src/app/generated/civic.apollo-helpers.ts b/client/src/app/generated/civic.apollo-helpers.ts
index 1d51976a6..3b0b6dd03 100644
--- a/client/src/app/generated/civic.apollo-helpers.ts
+++ b/client/src/app/generated/civic.apollo-helpers.ts
@@ -781,6 +781,15 @@ export type FdaCodeFieldPolicy = {
 	code?: FieldPolicy<any> | FieldReadFunction<any>,
 	description?: FieldPolicy<any> | FieldReadFunction<any>
 };
+export type FeatureInterfaceKeySpecifier = ('description' | 'featureAliases' | 'id' | 'name' | 'sources' | 'variants' | FeatureInterfaceKeySpecifier)[];
+export type FeatureInterfaceFieldPolicy = {
+	description?: FieldPolicy<any> | FieldReadFunction<any>,
+	featureAliases?: FieldPolicy<any> | FieldReadFunction<any>,
+	id?: FieldPolicy<any> | FieldReadFunction<any>,
+	name?: FieldPolicy<any> | FieldReadFunction<any>,
+	sources?: FieldPolicy<any> | FieldReadFunction<any>,
+	variants?: FieldPolicy<any> | FieldReadFunction<any>
+};
 export type FieldNameKeySpecifier = ('displayName' | 'name' | FieldNameKeySpecifier)[];
 export type FieldNameFieldPolicy = {
 	displayName?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -849,15 +858,15 @@ export type FlaggableFieldPolicy = {
 	link?: FieldPolicy<any> | FieldReadFunction<any>,
 	name?: FieldPolicy<any> | FieldReadFunction<any>
 };
-export type GeneKeySpecifier = ('comments' | 'description' | 'entrezId' | 'events' | 'flagged' | 'flags' | 'geneAliases' | 'id' | 'lastAcceptedRevisionEvent' | 'lastCommentEvent' | 'lastSubmittedRevisionEvent' | 'link' | 'myGeneInfoDetails' | 'name' | 'officialName' | 'revisions' | 'sources' | 'variants' | GeneKeySpecifier)[];
+export type GeneKeySpecifier = ('comments' | 'description' | 'entrezId' | 'events' | 'featureAliases' | 'flagged' | 'flags' | 'id' | 'lastAcceptedRevisionEvent' | 'lastCommentEvent' | 'lastSubmittedRevisionEvent' | 'link' | 'myGeneInfoDetails' | 'name' | 'officialName' | 'revisions' | 'sources' | 'variants' | GeneKeySpecifier)[];
 export type GeneFieldPolicy = {
 	comments?: FieldPolicy<any> | FieldReadFunction<any>,
 	description?: FieldPolicy<any> | FieldReadFunction<any>,
 	entrezId?: FieldPolicy<any> | FieldReadFunction<any>,
 	events?: FieldPolicy<any> | FieldReadFunction<any>,
+	featureAliases?: FieldPolicy<any> | FieldReadFunction<any>,
 	flagged?: FieldPolicy<any> | FieldReadFunction<any>,
 	flags?: FieldPolicy<any> | FieldReadFunction<any>,
-	geneAliases?: FieldPolicy<any> | FieldReadFunction<any>,
 	id?: FieldPolicy<any> | FieldReadFunction<any>,
 	lastAcceptedRevisionEvent?: FieldPolicy<any> | FieldReadFunction<any>,
 	lastCommentEvent?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -1349,7 +1358,7 @@ export type PhenotypePopoverFieldPolicy = {
 	name?: FieldPolicy<any> | FieldReadFunction<any>,
 	url?: FieldPolicy<any> | FieldReadFunction<any>
 };
-export type QueryKeySpecifier = ('acmgCode' | 'acmgCodesTypeahead' | 'activities' | 'activity' | 'assertion' | 'assertions' | 'browseDiseases' | 'browseGenes' | 'browseMolecularProfiles' | 'browseSources' | 'browseVariantGroups' | 'browseVariants' | 'clingenCode' | 'clingenCodesTypeahead' | 'clinicalTrial' | 'clinicalTrials' | 'comment' | 'comments' | 'contributors' | 'countries' | 'dataReleases' | 'disease' | 'diseasePopover' | 'diseaseTypeahead' | 'entityTypeahead' | 'events' | 'evidenceItem' | 'evidenceItems' | 'flag' | 'flags' | 'gene' | 'geneTypeahead' | 'genes' | 'molecularProfile' | 'molecularProfiles' | 'nccnGuideline' | 'nccnGuidelinesTypeahead' | 'notifications' | 'organization' | 'organizationLeaderboards' | 'organizations' | 'phenotype' | 'phenotypePopover' | 'phenotypeTypeahead' | 'phenotypes' | 'previewCommentText' | 'previewMolecularProfileName' | 'remoteCitation' | 'revision' | 'revisions' | 'search' | 'searchByPermalink' | 'searchGenes' | 'source' | 'sourcePopover' | 'sourceSuggestionValues' | 'sourceSuggestions' | 'sourceTypeahead' | 'subscriptionForEntity' | 'therapies' | 'therapy' | 'therapyPopover' | 'therapyTypeahead' | 'timepointStats' | 'user' | 'userLeaderboards' | 'userTypeahead' | 'users' | 'validateRevisionsForAcceptance' | 'variant' | 'variantGroup' | 'variantGroups' | 'variantType' | 'variantTypePopover' | 'variantTypeTypeahead' | 'variantTypes' | 'variants' | 'viewer' | QueryKeySpecifier)[];
+export type QueryKeySpecifier = ('acmgCode' | 'acmgCodesTypeahead' | 'activities' | 'activity' | 'assertion' | 'assertions' | 'browseDiseases' | 'browseGenes' | 'browseMolecularProfiles' | 'browseSources' | 'browseVariantGroups' | 'browseVariants' | 'clingenCode' | 'clingenCodesTypeahead' | 'clinicalTrial' | 'clinicalTrials' | 'comment' | 'comments' | 'contributors' | 'countries' | 'dataReleases' | 'disease' | 'diseasePopover' | 'diseaseTypeahead' | 'entityTypeahead' | 'events' | 'evidenceItem' | 'evidenceItems' | 'feature' | 'flag' | 'flags' | 'gene' | 'geneTypeahead' | 'genes' | 'molecularProfile' | 'molecularProfiles' | 'nccnGuideline' | 'nccnGuidelinesTypeahead' | 'notifications' | 'organization' | 'organizationLeaderboards' | 'organizations' | 'phenotype' | 'phenotypePopover' | 'phenotypeTypeahead' | 'phenotypes' | 'previewCommentText' | 'previewMolecularProfileName' | 'remoteCitation' | 'revision' | 'revisions' | 'search' | 'searchByPermalink' | 'searchGenes' | 'source' | 'sourcePopover' | 'sourceSuggestionValues' | 'sourceSuggestions' | 'sourceTypeahead' | 'subscriptionForEntity' | 'therapies' | 'therapy' | 'therapyPopover' | 'therapyTypeahead' | 'timepointStats' | 'user' | 'userLeaderboards' | 'userTypeahead' | 'users' | 'validateRevisionsForAcceptance' | 'variant' | 'variantGroup' | 'variantGroups' | 'variantType' | 'variantTypePopover' | 'variantTypeTypeahead' | 'variantTypes' | 'variants' | 'viewer' | QueryKeySpecifier)[];
 export type QueryFieldPolicy = {
 	acmgCode?: FieldPolicy<any> | FieldReadFunction<any>,
 	acmgCodesTypeahead?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -1379,6 +1388,7 @@ export type QueryFieldPolicy = {
 	events?: FieldPolicy<any> | FieldReadFunction<any>,
 	evidenceItem?: FieldPolicy<any> | FieldReadFunction<any>,
 	evidenceItems?: FieldPolicy<any> | FieldReadFunction<any>,
+	feature?: FieldPolicy<any> | FieldReadFunction<any>,
 	flag?: FieldPolicy<any> | FieldReadFunction<any>,
 	flags?: FieldPolicy<any> | FieldReadFunction<any>,
 	gene?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -1897,7 +1907,7 @@ export type ValidationErrorsFieldPolicy = {
 	genericErrors?: FieldPolicy<any> | FieldReadFunction<any>,
 	validationErrors?: FieldPolicy<any> | FieldReadFunction<any>
 };
-export type VariantKeySpecifier = ('alleleRegistryId' | 'clinvarIds' | 'comments' | 'creationActivity' | 'deprecated' | 'deprecationActivity' | 'deprecationReason' | 'ensemblVersion' | 'events' | 'flagged' | 'flags' | 'gene' | 'hgvsDescriptions' | 'id' | 'lastAcceptedRevisionEvent' | 'lastCommentEvent' | 'lastSubmittedRevisionEvent' | 'link' | 'maneSelectTranscript' | 'molecularProfiles' | 'myVariantInfo' | 'name' | 'openCravatUrl' | 'primaryCoordinates' | 'referenceBases' | 'referenceBuild' | 'revisions' | 'secondaryCoordinates' | 'singleVariantMolecularProfile' | 'singleVariantMolecularProfileId' | 'variantAliases' | 'variantBases' | 'variantTypes' | VariantKeySpecifier)[];
+export type VariantKeySpecifier = ('alleleRegistryId' | 'clinvarIds' | 'comments' | 'creationActivity' | 'deprecated' | 'deprecationActivity' | 'deprecationReason' | 'ensemblVersion' | 'events' | 'feature' | 'flagged' | 'flags' | 'gene' | 'hgvsDescriptions' | 'id' | 'lastAcceptedRevisionEvent' | 'lastCommentEvent' | 'lastSubmittedRevisionEvent' | 'link' | 'maneSelectTranscript' | 'molecularProfiles' | 'myVariantInfo' | 'name' | 'openCravatUrl' | 'primaryCoordinates' | 'referenceBases' | 'referenceBuild' | 'revisions' | 'secondaryCoordinates' | 'singleVariantMolecularProfile' | 'singleVariantMolecularProfileId' | 'variantAliases' | 'variantBases' | 'variantTypes' | VariantKeySpecifier)[];
 export type VariantFieldPolicy = {
 	alleleRegistryId?: FieldPolicy<any> | FieldReadFunction<any>,
 	clinvarIds?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -1908,6 +1918,7 @@ export type VariantFieldPolicy = {
 	deprecationReason?: FieldPolicy<any> | FieldReadFunction<any>,
 	ensemblVersion?: FieldPolicy<any> | FieldReadFunction<any>,
 	events?: FieldPolicy<any> | FieldReadFunction<any>,
+	feature?: FieldPolicy<any> | FieldReadFunction<any>,
 	flagged?: FieldPolicy<any> | FieldReadFunction<any>,
 	flags?: FieldPolicy<any> | FieldReadFunction<any>,
 	gene?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -2346,6 +2357,10 @@ export type StrictTypedTypePolicies = {
 		keyFields?: false | FdaCodeKeySpecifier | (() => undefined | FdaCodeKeySpecifier),
 		fields?: FdaCodeFieldPolicy,
 	},
+	FeatureInterface?: Omit<TypePolicy, "fields" | "keyFields"> & {
+		keyFields?: false | FeatureInterfaceKeySpecifier | (() => undefined | FeatureInterfaceKeySpecifier),
+		fields?: FeatureInterfaceFieldPolicy,
+	},
 	FieldName?: Omit<TypePolicy, "fields" | "keyFields"> & {
 		keyFields?: false | FieldNameKeySpecifier | (() => undefined | FieldNameKeySpecifier),
 		fields?: FieldNameFieldPolicy,
diff --git a/client/src/app/generated/civic.apollo.ts b/client/src/app/generated/civic.apollo.ts
index a4ea50b3a..981b4b633 100644
--- a/client/src/app/generated/civic.apollo.ts
+++ b/client/src/app/generated/civic.apollo.ts
@@ -1781,6 +1781,27 @@ export type FdaCode = {
   description: Scalars['String'];
 };
 
+/** The Feature that a Variant can belong to */
+export type FeatureInterface = {
+  description: Scalars['String'];
+  featureAliases: Array<Scalars['String']>;
+  id: Scalars['Int'];
+  name: Scalars['String'];
+  sources: Array<Source>;
+  /** List and filter variants. */
+  variants: VariantConnection;
+};
+
+
+/** The Feature that a Variant can belong to */
+export type FeatureInterfaceVariantsArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  first?: InputMaybe<Scalars['Int']>;
+  last?: InputMaybe<Scalars['Int']>;
+  name?: InputMaybe<Scalars['String']>;
+};
+
 export type FieldName = {
   __typename: 'FieldName';
   /** The user facing representation of the field name. */
@@ -1958,7 +1979,7 @@ export type FlaggableInput = {
   id: Scalars['Int'];
 };
 
-export type Gene = Commentable & EventSubject & Flaggable & MolecularProfileComponent & WithRevisions & {
+export type Gene = Commentable & EventSubject & FeatureInterface & Flaggable & MolecularProfileComponent & WithRevisions & {
   __typename: 'Gene';
   /** List and filter comments. */
   comments: CommentConnection;
@@ -1966,10 +1987,10 @@ export type Gene = Commentable & EventSubject & Flaggable & MolecularProfileComp
   entrezId: Scalars['Int'];
   /** List and filter events for an object */
   events: EventConnection;
+  featureAliases: Array<Scalars['String']>;
   flagged: Scalars['Boolean'];
   /** List and filter flags. */
   flags: FlagConnection;
-  geneAliases: Array<Scalars['String']>;
   id: Scalars['Int'];
   lastAcceptedRevisionEvent?: Maybe<Event>;
   lastCommentEvent?: Maybe<Event>;
@@ -3392,6 +3413,8 @@ export type Query = {
   evidenceItem?: Maybe<EvidenceItem>;
   /** List and filter evidence items. */
   evidenceItems: EvidenceItemConnection;
+  /** Find a single feature by CIViC ID */
+  feature?: Maybe<Gene>;
   /** Find a flag by CIViC ID */
   flag?: Maybe<Flag>;
   /** List and filter flags. */
@@ -3752,6 +3775,11 @@ export type QueryEvidenceItemsArgs = {
 };
 
 
+export type QueryFeatureArgs = {
+  id?: InputMaybe<Scalars['Int']>;
+};
+
+
 export type QueryFlagArgs = {
   id: Scalars['Int'];
 };
@@ -5429,6 +5457,7 @@ export type Variant = Commentable & EventOriginObject & EventSubject & Flaggable
   ensemblVersion?: Maybe<Scalars['Int']>;
   /** List and filter events for an object */
   events: EventConnection;
+  feature: FeatureInterface;
   flagged: Scalars['Boolean'];
   /** List and filter flags. */
   flags: FlagConnection;
@@ -6135,9 +6164,9 @@ export type GenePopoverQueryVariables = Exact<{
 }>;
 
 
-export type GenePopoverQuery = { __typename: 'Query', gene?: { __typename: 'Gene', id: number, name: string, officialName: string, geneAliases: Array<string>, variants: { __typename: 'VariantConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, flags: { __typename: 'FlagConnection', totalCount: number } } | undefined };
+export type GenePopoverQuery = { __typename: 'Query', gene?: { __typename: 'Gene', id: number, name: string, officialName: string, featureAliases: Array<string>, variants: { __typename: 'VariantConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, flags: { __typename: 'FlagConnection', totalCount: number } } | undefined };
 
-export type GenePopoverFragment = { __typename: 'Gene', id: number, name: string, officialName: string, geneAliases: Array<string>, variants: { __typename: 'VariantConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, flags: { __typename: 'FlagConnection', totalCount: number } };
+export type GenePopoverFragment = { __typename: 'Gene', id: number, name: string, officialName: string, featureAliases: Array<string>, variants: { __typename: 'VariantConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, flags: { __typename: 'FlagConnection', totalCount: number } };
 
 export type BrowseGenesQueryVariables = Exact<{
   entrezSymbol?: InputMaybe<Scalars['String']>;
@@ -7102,16 +7131,16 @@ export type GeneSelectTypeaheadQueryVariables = Exact<{
 }>;
 
 
-export type GeneSelectTypeaheadQuery = { __typename: 'Query', geneTypeahead: Array<{ __typename: 'Gene', id: number, entrezId: number, name: string, geneAliases: Array<string>, link: string }> };
+export type GeneSelectTypeaheadQuery = { __typename: 'Query', geneTypeahead: Array<{ __typename: 'Gene', id: number, entrezId: number, name: string, featureAliases: Array<string>, link: string }> };
 
 export type GeneSelectTagQueryVariables = Exact<{
   geneId: Scalars['Int'];
 }>;
 
 
-export type GeneSelectTagQuery = { __typename: 'Query', gene?: { __typename: 'Gene', id: number, entrezId: number, name: string, geneAliases: Array<string>, link: string } | undefined };
+export type GeneSelectTagQuery = { __typename: 'Query', gene?: { __typename: 'Gene', id: number, entrezId: number, name: string, featureAliases: Array<string>, link: string } | undefined };
 
-export type GeneSelectTypeaheadFieldsFragment = { __typename: 'Gene', id: number, entrezId: number, name: string, geneAliases: Array<string>, link: string };
+export type GeneSelectTypeaheadFieldsFragment = { __typename: 'Gene', id: number, entrezId: number, name: string, featureAliases: Array<string>, link: string };
 
 export type MolecularProfileSelectTypeaheadQueryVariables = Exact<{
   name: Scalars['String'];
@@ -7386,6 +7415,24 @@ export type EvidenceSummaryQuery = { __typename: 'Query', evidenceItem?: { __typ
 
 export type EvidenceSummaryFieldsFragment = { __typename: 'EvidenceItem', id: number, name: string, description: string, status: EvidenceStatus, evidenceLevel: EvidenceLevel, evidenceType: EvidenceType, evidenceDirection: EvidenceDirection, significance: EvidenceSignificance, variantOrigin: VariantOrigin, therapyInteractionType?: TherapyInteraction | undefined, evidenceRating?: number | undefined, therapies: Array<{ __typename: 'Therapy', id: number, name: string, link: string }>, disease?: { __typename: 'Disease', id: number, name: string, link: string } | undefined, phenotypes: Array<{ __typename: 'Phenotype', id: number, name: string, link: string }>, source: { __typename: 'Source', id: number, citation?: string | undefined, citationId: string, sourceType: SourceSource, displayType: string, sourceUrl?: string | undefined, ascoAbstractId?: number | undefined, link: string, clinicalTrials?: Array<{ __typename: 'ClinicalTrial', nctId: string, id: number, link: string }> | undefined }, molecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, parsedName: Array<{ __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfileTextSegment', text: string } | { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean }> }, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, submissionActivity: { __typename: 'SubmitEvidenceItemActivity', createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', displayName: string, profileImagePath?: string | undefined, id: number, role: UserRole } }, acceptanceEvent?: { __typename: 'Event', createdAt: any, originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, submissionEvent: { __typename: 'Event', createdAt: any, originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } }, rejectionEvent?: { __typename: 'Event', createdAt: any, originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined };
 
+export type FeatureDetailQueryVariables = Exact<{
+  featureId: Scalars['Int'];
+}>;
+
+
+export type FeatureDetailQuery = { __typename: 'Query', feature?: { __typename: 'Gene', officialName: string, id: number, name: string } | undefined };
+
+export type FeatureDetailFieldsFragment = { __typename: 'Gene', officialName: string, id: number, name: string };
+
+export type FeaturesSummaryQueryVariables = Exact<{
+  featureId: Scalars['Int'];
+}>;
+
+
+export type FeaturesSummaryQuery = { __typename: 'Query', feature?: { __typename: 'Gene', entrezId: number, officialName: string, myGeneInfoDetails?: any | undefined, description: string, featureAliases: Array<string>, id: number, name: string, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceUrl?: string | undefined, displayType: string, sourceType: SourceSource }>, variants: { __typename: 'VariantConnection', edges: Array<{ __typename: 'VariantEdge', node?: { __typename: 'Variant', id: number, name: string } | undefined }> } } | undefined };
+
+export type FeatureSummaryFieldsFragment = { __typename: 'Gene', entrezId: number, officialName: string, myGeneInfoDetails?: any | undefined, description: string, featureAliases: Array<string>, id: number, name: string, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceUrl?: string | undefined, displayType: string, sourceType: SourceSource }>, variants: { __typename: 'VariantConnection', edges: Array<{ __typename: 'VariantEdge', node?: { __typename: 'Variant', id: number, name: string } | undefined }> } };
+
 export type GeneDetailQueryVariables = Exact<{
   geneId: Scalars['Int'];
 }>;
@@ -7400,9 +7447,9 @@ export type GenesSummaryQueryVariables = Exact<{
 }>;
 
 
-export type GenesSummaryQuery = { __typename: 'Query', gene?: { __typename: 'Gene', description: string, entrezId: number, geneAliases: Array<string>, id: number, name: string, officialName: string, myGeneInfoDetails?: any | undefined, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceUrl?: string | undefined, displayType: string, sourceType: SourceSource }>, variants: { __typename: 'VariantConnection', edges: Array<{ __typename: 'VariantEdge', node?: { __typename: 'Variant', id: number, name: string } | undefined }> }, lastSubmittedRevisionEvent?: { __typename: 'Event', originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, lastAcceptedRevisionEvent?: { __typename: 'Event', originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined } | undefined };
+export type GenesSummaryQuery = { __typename: 'Query', gene?: { __typename: 'Gene', description: string, entrezId: number, featureAliases: Array<string>, id: number, name: string, officialName: string, myGeneInfoDetails?: any | undefined, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceUrl?: string | undefined, displayType: string, sourceType: SourceSource }>, variants: { __typename: 'VariantConnection', edges: Array<{ __typename: 'VariantEdge', node?: { __typename: 'Variant', id: number, name: string } | undefined }> }, lastSubmittedRevisionEvent?: { __typename: 'Event', originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, lastAcceptedRevisionEvent?: { __typename: 'Event', originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined } | undefined };
 
-export type GeneSummaryFieldsFragment = { __typename: 'Gene', description: string, entrezId: number, geneAliases: Array<string>, id: number, name: string, officialName: string, myGeneInfoDetails?: any | undefined, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceUrl?: string | undefined, displayType: string, sourceType: SourceSource }>, variants: { __typename: 'VariantConnection', edges: Array<{ __typename: 'VariantEdge', node?: { __typename: 'Variant', id: number, name: string } | undefined }> }, lastSubmittedRevisionEvent?: { __typename: 'Event', originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, lastAcceptedRevisionEvent?: { __typename: 'Event', originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined };
+export type GeneSummaryFieldsFragment = { __typename: 'Gene', description: string, entrezId: number, featureAliases: Array<string>, id: number, name: string, officialName: string, myGeneInfoDetails?: any | undefined, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceUrl?: string | undefined, displayType: string, sourceType: SourceSource }>, variants: { __typename: 'VariantConnection', edges: Array<{ __typename: 'VariantEdge', node?: { __typename: 'Variant', id: number, name: string } | undefined }> }, lastSubmittedRevisionEvent?: { __typename: 'Event', originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, lastAcceptedRevisionEvent?: { __typename: 'Event', originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined };
 
 export type MolecularProfileDetailQueryVariables = Exact<{
   mpId: Scalars['Int'];
@@ -8175,7 +8222,7 @@ export const GenePopoverFragmentDoc = gql`
   id
   name
   officialName
-  geneAliases
+  featureAliases
   variants {
     totalCount
   }
@@ -9158,7 +9205,7 @@ export const GeneSelectTypeaheadFieldsFragmentDoc = gql`
   id
   entrezId
   name
-  geneAliases
+  featureAliases
   link
 }
     `;
@@ -9563,6 +9610,45 @@ export const EvidenceSummaryFieldsFragmentDoc = gql`
 }
     ${MolecularProfileParsedNameFragmentDoc}
 ${ParsedCommentFragmentFragmentDoc}`;
+export const FeatureDetailFieldsFragmentDoc = gql`
+    fragment FeatureDetailFields on FeatureInterface {
+  id
+  name
+  ... on Gene {
+    officialName
+  }
+}
+    `;
+export const FeatureSummaryFieldsFragmentDoc = gql`
+    fragment FeatureSummaryFields on FeatureInterface {
+  __typename
+  description
+  featureAliases
+  id
+  name
+  sources {
+    id
+    citation
+    link
+    sourceUrl
+    displayType
+    sourceType
+  }
+  variants {
+    edges {
+      node {
+        id
+        name
+      }
+    }
+  }
+  ... on Gene {
+    entrezId
+    officialName
+    myGeneInfoDetails
+  }
+}
+    `;
 export const GeneDetailFieldsFragmentDoc = gql`
     fragment GeneDetailFields on Gene {
   id
@@ -9584,7 +9670,7 @@ export const GeneSummaryFieldsFragmentDoc = gql`
     fragment GeneSummaryFields on Gene {
   description
   entrezId
-  geneAliases
+  featureAliases
   id
   name
   officialName
@@ -14008,6 +14094,42 @@ export const EvidenceSummaryDocument = gql`
   export class EvidenceSummaryGQL extends Apollo.Query<EvidenceSummaryQuery, EvidenceSummaryQueryVariables> {
     document = EvidenceSummaryDocument;
     
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
+export const FeatureDetailDocument = gql`
+    query FeatureDetail($featureId: Int!) {
+  feature(id: $featureId) {
+    ...FeatureDetailFields
+  }
+}
+    ${FeatureDetailFieldsFragmentDoc}`;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class FeatureDetailGQL extends Apollo.Query<FeatureDetailQuery, FeatureDetailQueryVariables> {
+    document = FeatureDetailDocument;
+    
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
+export const FeaturesSummaryDocument = gql`
+    query FeaturesSummary($featureId: Int!) {
+  feature(id: $featureId) {
+    ...FeatureSummaryFields
+  }
+}
+    ${FeatureSummaryFieldsFragmentDoc}`;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class FeaturesSummaryGQL extends Apollo.Query<FeaturesSummaryQuery, FeaturesSummaryQueryVariables> {
+    document = FeaturesSummaryDocument;
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
diff --git a/client/src/app/generated/civic.possible-types.ts b/client/src/app/generated/civic.possible-types.ts
index fa5093bb1..20f7a74ed 100644
--- a/client/src/app/generated/civic.possible-types.ts
+++ b/client/src/app/generated/civic.possible-types.ts
@@ -65,6 +65,9 @@
       "Variant",
       "VariantGroup"
     ],
+    "FeatureInterface": [
+      "Gene"
+    ],
     "Flaggable": [
       "Assertion",
       "BrowseGene",
diff --git a/client/src/app/views/features/features-detail/features-detail.query.gql b/client/src/app/views/features/features-detail/features-detail.query.gql
index e8f27ac36..515a7b468 100644
--- a/client/src/app/views/features/features-detail/features-detail.query.gql
+++ b/client/src/app/views/features/features-detail/features-detail.query.gql
@@ -1,21 +1,22 @@
-query GeneDetail($geneId: Int!) {
-  gene(id: $geneId) {
-    ...GeneDetailFields
+query FeatureDetail($featureId: Int!) {
+  feature(id: $featureId) {
+    ...FeatureDetailFields
   }
 }
 
-fragment GeneDetailFields on Gene {
+fragment FeatureDetailFields on FeatureInterface {
   id
   name
-  officialName
-  entrezId
-  flags(state: OPEN) {
-    totalCount
-  }
-  revisions(status: NEW) {
-    totalCount
-  }
-  comments {
-    totalCount
+  ... on Gene {
+    officialName
   }
+  # flags(state: OPEN) {
+  #   totalCount
+  # }
+  # revisions(status: NEW) {
+  #   totalCount
+  # }
+  # comments {
+  #   totalCount
+  # }
 }
diff --git a/client/src/app/views/features/features-detail/features-detail.view.html b/client/src/app/views/features/features-detail/features-detail.view.html
index 1f6ec815f..9ae973ef7 100644
--- a/client/src/app/views/features/features-detail/features-detail.view.html
+++ b/client/src/app/views/features/features-detail/features-detail.view.html
@@ -1,24 +1,24 @@
-<ng-container *ngIf="gene$ | async as gene">
-  <cvc-section-navigation [displayName]="gene.name"> </cvc-section-navigation>
-  <div
-    cvcFlaggable
-    [flags]="flagsTotal$ | ngrxPush">
+<ng-container *ngIf="feature$ | async as feature">
+  <cvc-section-navigation [displayName]="feature.name"> </cvc-section-navigation>
+  <div>
+<!--     cvcFlaggable
+    [flags]="flagsTotal$ | ngrxPush"> -->
     <nz-page-header class="site-page-header">
       <!-- title -->
-      <nz-page-header-title
-        cvcFlaggableOptions
-        [ngClass]="{ 'flagged': gene.flags.totalCount > 0 }">
+      <nz-page-header-title>
+        <!-- cvcFlaggableOptions
+        [ngClass]="{ 'flagged': feature.flags.totalCount > 0 }"> -->
         <i
           nz-icon
           nzTheme="twotone"
           [nzTwotoneColor]="'Gene' | entityColor"
           nzType="civic-gene"></i>
-        {{ gene.name }}
+        {{ feature.name }}
       </nz-page-header-title>
 
       <!-- subtitle -->
       <nz-page-header-subtitle>
-        {{ gene.officialName }}
+        {{ feature.officialName }}
       </nz-page-header-subtitle>
 
       <!-- header action btns, actions menu -->
@@ -30,7 +30,7 @@
           <!-- add revision btn -->
           <span *nzSpaceItem>
             <button
-              [routerLink]="['/features', gene.id, 'revise']"
+              [routerLink]="['/features', feature.id, 'revise']"
               *ngIf="viewer.signedIn"
               routerLinkActive
               #rlaComments="routerLinkActive"
diff --git a/client/src/app/views/features/features-detail/features-detail.view.ts b/client/src/app/views/features/features-detail/features-detail.view.ts
index 21ae4bf4f..295576e2a 100644
--- a/client/src/app/views/features/features-detail/features-detail.view.ts
+++ b/client/src/app/views/features/features-detail/features-detail.view.ts
@@ -4,8 +4,8 @@ import { BehaviorSubject, Observable, Subject, Subscription } from 'rxjs'
 import { startWith, takeUntil } from 'rxjs/operators'
 import { pluck } from 'rxjs-etc/operators'
 import {
-  GeneDetailFieldsFragment,
-  GeneDetailGQL,
+  FeatureDetailFieldsFragment,
+  FeatureDetailGQL,
   Maybe,
   SubscribableEntities,
   SubscribableInput,
@@ -20,9 +20,9 @@ import { RouteableTab } from '@app/components/shared/tab-navigation/tab-navigati
 })
 export class FeaturesDetailView implements OnDestroy {
   loading$?: Observable<boolean>
-  gene$?: Observable<Maybe<GeneDetailFieldsFragment>>
+  feature$?: Observable<Maybe<FeatureDetailFieldsFragment>>
   viewer$: Observable<Viewer>
-  flagsTotal$?: Observable<number>
+  //flagsTotal$?: Observable<number>
   routeSub: Subscription
   subscribable?: SubscribableInput
 
@@ -57,7 +57,7 @@ export class FeaturesDetailView implements OnDestroy {
   ]
 
   constructor(
-    private gql: GeneDetailGQL,
+    private gql: FeatureDetailGQL,
     private viewerService: ViewerService,
     private route: ActivatedRoute
   ) {
@@ -65,28 +65,30 @@ export class FeaturesDetailView implements OnDestroy {
     this.viewer$ = this.viewerService.viewer$
 
     this.routeSub = this.route.params.subscribe((params) => {
-      let observable = this.gql.watch({ geneId: +params.featureId }).valueChanges
+      let observable = this.gql.watch({ featureId: +params.featureId }).valueChanges
 
       this.loading$ = observable.pipe(pluck('loading'), startWith(true))
 
-      this.gene$ = observable.pipe(pluck('data', 'gene'))
+      this.feature$ = observable.pipe(pluck('data', 'feature'))
 
-      this.flagsTotal$ = this.gene$.pipe(pluck('flags', 'totalCount'))
+      //this.flagsTotal$ = this.feature$.pipe(pluck('flags', 'totalCount'))
 
-      this.gene$
+      this.feature$
         .pipe(takeUntil(this.destroy$))
         .subscribe({
-          next: (geneResp) => {
+          next: (featureResp) => {
             this.tabs$.next(
               this.defaultTabs.map((tab) => {
                 if (tab.tabLabel === 'Revisions') {
                   return {
-                    badgeCount: geneResp?.revisions.totalCount,
+                    // badgeCount: featureResp?.revisions.totalCount,
+                    badgeCount: 0,
                     ...tab,
                   }
                 } else if (tab.tabLabel === 'Comments') {
                   return {
-                    badgeCount: geneResp?.comments.totalCount,
+                    //badgeCount: featureResp?.comments.totalCount,
+                    badgeCount: 0,
                     badgeColor: '#cccccc',
                     ...tab,
                   }
diff --git a/client/src/app/views/features/features-detail/features-summary/features-summary.module.ts b/client/src/app/views/features/features-detail/features-summary/features-summary.module.ts
index 076a1dbb5..3b17bd822 100644
--- a/client/src/app/views/features/features-detail/features-summary/features-summary.module.ts
+++ b/client/src/app/views/features/features-detail/features-summary/features-summary.module.ts
@@ -17,6 +17,7 @@ import { CvcUserTagModule } from '@app/components/users/user-tag/user-tag.module
 import { NzTagModule } from 'ng-zorro-antd/tag'
 import { NzTabsModule } from 'ng-zorro-antd/tabs'
 import { CvcMolecularProfilesMenuModule } from '@app/components/molecular-profiles/molecular-profiles-menu/molecular-profiles-menu.module'
+import { GenesSummaryModule } from '@app/views/genes/genes-detail/genes-summary/genes-summary.module'
 
 @NgModule({
   declarations: [FeaturesSummaryPage],
@@ -40,6 +41,7 @@ import { CvcMolecularProfilesMenuModule } from '@app/components/molecular-profil
     CvcVariantsMenuModule,
     CvcMyGeneInfoModule,
     CvcMolecularProfilesMenuModule,
+    GenesSummaryModule,
   ],
   exports: [FeaturesSummaryPage],
 })
diff --git a/client/src/app/views/features/features-detail/features-summary/features-summary.page.html b/client/src/app/views/features/features-detail/features-summary/features-summary.page.html
index 4158d60eb..332f99330 100644
--- a/client/src/app/views/features/features-detail/features-summary/features-summary.page.html
+++ b/client/src/app/views/features/features-detail/features-summary/features-summary.page.html
@@ -1,115 +1,22 @@
-<ng-container *ngIf=" (gene$ | ngrxPush) as gene">
-  <!-- page layout row -->
+<ng-container *ngIf=" (feature$ | ngrxPush) as feature">
   <nz-row [nzGutter]="[8,16]">
-    <nz-col nzSpan="12">
-      <!-- LEFT COLUMN -->
-      <nz-row [nzGutter]="[8,8]">
-        <!-- gene description, sources block -->
-        <nz-col nzSpan="24">
-          <!-- description, sources -->
-          <nz-descriptions
-            nzLayout="vertical"
-            nzSize="small"
-            nzBordered="true"
-            [nzColumn]="1">
-            <!-- description -->
-            <nz-descriptions-item nzTitle="Description">
-              <p
-                *ngIf="gene.description; else noDescription"
-                nz-typography
-                nzEllipsis
-                nzExpandable
-                [nzEllipsisRows]="8">
-                {{ gene.description }}
-              </p>
-
-              <!-- noDescription Tpl -->
-              <ng-template #noDescription>
-                <cvc-empty-revisable notification="No description provided">
-                </cvc-empty-revisable>
-              </ng-template>
-            </nz-descriptions-item>
-          </nz-descriptions>
-        </nz-col>
-
-        <!-- sources, aliases, resource block -->
-        <nz-col nzSpan="24">
-          <nz-descriptions
-            nzLayout="horizontal"
-            nzSize="small"
-            [nzColumn]="1"
-            nzBordered="true">
-            <!-- sources -->
-            <nz-descriptions-item nzTitle="Sources">
-              <ng-container *ngIf="gene.sources.length > 0; else noSources">
-                <cvc-tag-list>
-                  <cvc-source-tag
-                    *ngFor="let source of gene.sources"
-                    [source]="source"></cvc-source-tag>
-                </cvc-tag-list>
-              </ng-container>
-              <ng-template #noSources>
-                <span
-                  nz-typography
-                  nzType="secondary"
-                  >None specified</span
-                >
-              </ng-template>
-            </nz-descriptions-item>
-
-            <!-- aliases -->
-            <nz-descriptions-item
-              nzTitle="Aliases"
-              *ngIf="gene.geneAliases.length > 0; else noAliases">
-              <nz-tag *ngFor="let alias of gene.geneAliases"
-                >{{ alias }}</nz-tag
-              >
-            </nz-descriptions-item>
-            <ng-template #noAliases>
-              <span
-                nz-typography
-                nzType="secondary"
-                >None specified</span
-              >
-            </ng-template>
-
-            <!-- resource links -->
-            <nz-descriptions-item nzTitle="Resources">
-              <cvc-tag-list>
-                <cvc-link-tag
-                  [href]="'http://dgidb.org/genes/' + gene.name"
-                  [tooltip]="'View ' + gene.name + ' on DGIdb'">
-                  DGIdb
-                </cvc-link-tag>
-                <cvc-link-tag
-                  [href]="'https://pecan.stjude.cloud/variants/protein-paint/?gene=' + gene.name"
-                  [tooltip]="'View ' + gene.name + ' on ProteinPaint'">
-                  ProteinPaint
-                </cvc-link-tag>
-              </cvc-tag-list>
-            </nz-descriptions-item>
-          </nz-descriptions>
-        </nz-col>
-      </nz-row>
-    </nz-col>
-
-    <!-- last revision submitted/accepted, mygeneinfo col -->
-    <nz-col nzSpan="12">
-      <!-- mygeneinfo -->
-      <cvc-my-gene-info [geneInfo]="gene.myGeneInfoDetails"></cvc-my-gene-info>
-    </nz-col>
+    <ng-container [ngSwitch]="feature.__typename">
+      <span *ngSwitchCase="'Gene'">
+        <cvc-genes-summary [gene]="feature"></cvc-genes-summary>
+      </span>
+    </ng-container>
 
     <!-- variant menu row -->
     <nz-col [nzSpan]="24">
       <nz-tabset nzType="card">
         <nz-tab nzTitle="Molecular Profiles">
           <cvc-molecular-profile-menu
-            [geneId]="gene.id"></cvc-molecular-profile-menu>
+            [geneId]="feature.id"></cvc-molecular-profile-menu>
         </nz-tab>
         <nz-tab nzTitle="Variants">
           <cvc-variant-menu
-            [geneId]="gene.id"
-            [geneName]="gene.name"></cvc-variant-menu>
+            [geneId]="feature.id"
+            [geneName]="feature.name"></cvc-variant-menu>
         </nz-tab>
       </nz-tabset>
     </nz-col>
diff --git a/client/src/app/views/features/features-detail/features-summary/features-summary.page.ts b/client/src/app/views/features/features-detail/features-summary/features-summary.page.ts
index 3c0fa5280..e92343406 100644
--- a/client/src/app/views/features/features-detail/features-summary/features-summary.page.ts
+++ b/client/src/app/views/features/features-detail/features-summary/features-summary.page.ts
@@ -6,8 +6,8 @@ import { pluck } from 'rxjs-etc/operators'
 import {
   SubscribableEntities,
   SubscribableInput,
-  GenesSummaryGQL,
-  GeneSummaryFieldsFragment,
+  FeaturesSummaryGQL,
+  FeatureSummaryFieldsFragment,
   Maybe,
 } from '@app/generated/civic.apollo'
 
@@ -19,7 +19,7 @@ import { Viewer, ViewerService } from '@app/core/services/viewer/viewer.service'
   styleUrls: ['./features-summary.page.less'],
 })
 export class FeaturesSummaryPage implements OnDestroy {
-  gene$?: Observable<Maybe<GeneSummaryFieldsFragment>>
+  feature$?: Observable<Maybe<FeatureSummaryFieldsFragment>>
   loading$?: Observable<boolean>
   viewer$?: Observable<Viewer>
 
@@ -28,22 +28,22 @@ export class FeaturesSummaryPage implements OnDestroy {
   routeSub: Subscription
 
   constructor(
-    private gql: GenesSummaryGQL,
+    private gql: FeaturesSummaryGQL,
     private viewerService: ViewerService,
     private route: ActivatedRoute
   ) {
     this.routeSub = this.route.params.subscribe((params) => {
       this.viewer$ = this.viewerService.viewer$
 
-      let queryRef = this.gql.watch({ geneId: +params.featureId })
+      let queryRef = this.gql.watch({ featureId: +params.featureId })
       let observable = queryRef.valueChanges
 
-      this.subscribableEntity = {
-        id: +params.geneId,
+/*       this.subscribableEntity = {
+        id: +params.featureId,
         entityType: SubscribableEntities.Gene,
-      }
+      } */
 
-      this.gene$ = observable.pipe(pluck('data', 'gene'))
+      this.feature$ = observable.pipe(pluck('data', 'feature'))
       this.loading$ = observable.pipe(pluck('loading'))
     })
   }
diff --git a/client/src/app/views/features/features-detail/features-summary/features-summary.query.gql b/client/src/app/views/features/features-detail/features-summary/features-summary.query.gql
index 22e518a14..3d249cf75 100644
--- a/client/src/app/views/features/features-detail/features-summary/features-summary.query.gql
+++ b/client/src/app/views/features/features-detail/features-summary/features-summary.query.gql
@@ -1,16 +1,15 @@
-query GenesSummary($geneId: Int!) {
-  gene(id: $geneId) {
-    ...GeneSummaryFields
+query FeaturesSummary($featureId: Int!) {
+  feature(id: $featureId) {
+    ...FeatureSummaryFields
   }
 }
 
-fragment GeneSummaryFields on Gene {
+fragment FeatureSummaryFields on FeatureInterface {
+  __typename
   description
-  entrezId
-  geneAliases
+  featureAliases
   id
   name
-  officialName
   sources {
     id
     citation
@@ -27,21 +26,25 @@ fragment GeneSummaryFields on Gene {
       }
     }
   }
-  myGeneInfoDetails
-  lastSubmittedRevisionEvent {
-    originatingUser {
-      id
-      displayName
-      role
-      profileImagePath(size: 32)
-    }
-  }
-  lastAcceptedRevisionEvent {
-    originatingUser {
-      id
-      displayName
-      role
-      profileImagePath(size: 32)
-    }
+  ... on Gene {
+    entrezId
+    officialName
+    myGeneInfoDetails
   }
+  # lastSubmittedRevisionEvent {
+  #   originatingUser {
+  #     id
+  #     displayName
+  #     role
+  #     profileImagePath(size: 32)
+  #   }
+  # }
+  # lastAcceptedRevisionEvent {
+  #   originatingUser {
+  #     id
+  #     displayName
+  #     role
+  #     profileImagePath(size: 32)
+  #   }
+  # }
 }
diff --git a/client/src/app/views/genes/genes-detail/genes-summary/genes-summary.page.html b/client/src/app/views/genes/genes-detail/genes-summary/genes-summary.page.html
index 4158d60eb..2d9aa574e 100644
--- a/client/src/app/views/genes/genes-detail/genes-summary/genes-summary.page.html
+++ b/client/src/app/views/genes/genes-detail/genes-summary/genes-summary.page.html
@@ -1,117 +1,99 @@
-<ng-container *ngIf=" (gene$ | ngrxPush) as gene">
-  <!-- page layout row -->
-  <nz-row [nzGutter]="[8,16]">
-    <nz-col nzSpan="12">
-      <!-- LEFT COLUMN -->
-      <nz-row [nzGutter]="[8,8]">
-        <!-- gene description, sources block -->
-        <nz-col nzSpan="24">
-          <!-- description, sources -->
-          <nz-descriptions
-            nzLayout="vertical"
-            nzSize="small"
-            nzBordered="true"
-            [nzColumn]="1">
-            <!-- description -->
-            <nz-descriptions-item nzTitle="Description">
-              <p
-                *ngIf="gene.description; else noDescription"
-                nz-typography
-                nzEllipsis
-                nzExpandable
-                [nzEllipsisRows]="8">
-                {{ gene.description }}
-              </p>
-
-              <!-- noDescription Tpl -->
-              <ng-template #noDescription>
-                <cvc-empty-revisable notification="No description provided">
-                </cvc-empty-revisable>
-              </ng-template>
-            </nz-descriptions-item>
-          </nz-descriptions>
-        </nz-col>
+<nz-row [nzGutter]="[8,16]">
+  <nz-col nzSpan="12">
+    <!-- LEFT COLUMN -->
+    <nz-row [nzGutter]="[8,8]">
+      <!-- gene description, sources block -->
+      <nz-col nzSpan="24">
+        <!-- description, sources -->
+        <nz-descriptions
+          nzLayout="vertical"
+          nzSize="small"
+          nzBordered="true"
+          [nzColumn]="1">
+          <!-- description -->
+          <nz-descriptions-item nzTitle="Description">
+            <p
+              *ngIf="gene.description; else noDescription"
+              nz-typography
+              nzEllipsis
+              nzExpandable
+              [nzEllipsisRows]="8">
+              {{ gene.description }}
+            </p>
 
-        <!-- sources, aliases, resource block -->
-        <nz-col nzSpan="24">
-          <nz-descriptions
-            nzLayout="horizontal"
-            nzSize="small"
-            [nzColumn]="1"
-            nzBordered="true">
-            <!-- sources -->
-            <nz-descriptions-item nzTitle="Sources">
-              <ng-container *ngIf="gene.sources.length > 0; else noSources">
-                <cvc-tag-list>
-                  <cvc-source-tag
-                    *ngFor="let source of gene.sources"
-                    [source]="source"></cvc-source-tag>
-                </cvc-tag-list>
-              </ng-container>
-              <ng-template #noSources>
-                <span
-                  nz-typography
-                  nzType="secondary"
-                  >None specified</span
-                >
-              </ng-template>
-            </nz-descriptions-item>
+            <!-- noDescription Tpl -->
+            <ng-template #noDescription>
+              <cvc-empty-revisable notification="No description provided">
+              </cvc-empty-revisable>
+            </ng-template>
+          </nz-descriptions-item>
+        </nz-descriptions>
+      </nz-col>
 
-            <!-- aliases -->
-            <nz-descriptions-item
-              nzTitle="Aliases"
-              *ngIf="gene.geneAliases.length > 0; else noAliases">
-              <nz-tag *ngFor="let alias of gene.geneAliases"
-                >{{ alias }}</nz-tag
-              >
-            </nz-descriptions-item>
-            <ng-template #noAliases>
+      <!-- sources, aliases, resource block -->
+      <nz-col nzSpan="24">
+        <nz-descriptions
+          nzLayout="horizontal"
+          nzSize="small"
+          [nzColumn]="1"
+          nzBordered="true">
+          <!-- sources -->
+          <nz-descriptions-item nzTitle="Sources">
+            <ng-container *ngIf="gene.sources.length > 0; else noSources">
+              <cvc-tag-list>
+                <cvc-source-tag
+                  *ngFor="let source of gene.sources"
+                  [source]="source"></cvc-source-tag>
+              </cvc-tag-list>
+            </ng-container>
+            <ng-template #noSources>
               <span
                 nz-typography
                 nzType="secondary"
                 >None specified</span
               >
             </ng-template>
+          </nz-descriptions-item>
 
-            <!-- resource links -->
-            <nz-descriptions-item nzTitle="Resources">
-              <cvc-tag-list>
-                <cvc-link-tag
-                  [href]="'http://dgidb.org/genes/' + gene.name"
-                  [tooltip]="'View ' + gene.name + ' on DGIdb'">
-                  DGIdb
-                </cvc-link-tag>
-                <cvc-link-tag
-                  [href]="'https://pecan.stjude.cloud/variants/protein-paint/?gene=' + gene.name"
-                  [tooltip]="'View ' + gene.name + ' on ProteinPaint'">
-                  ProteinPaint
-                </cvc-link-tag>
-              </cvc-tag-list>
-            </nz-descriptions-item>
-          </nz-descriptions>
-        </nz-col>
-      </nz-row>
-    </nz-col>
+          <!-- aliases -->
+          <nz-descriptions-item
+            nzTitle="Aliases"
+            *ngIf="gene.featureAliases.length > 0; else noAliases">
+            <nz-tag *ngFor="let alias of gene.featureAliases"
+              >{{ alias }}</nz-tag
+            >
+          </nz-descriptions-item>
+          <ng-template #noAliases>
+            <span
+              nz-typography
+              nzType="secondary"
+              >None specified</span
+            >
+          </ng-template>
 
-    <!-- last revision submitted/accepted, mygeneinfo col -->
-    <nz-col nzSpan="12">
-      <!-- mygeneinfo -->
-      <cvc-my-gene-info [geneInfo]="gene.myGeneInfoDetails"></cvc-my-gene-info>
-    </nz-col>
+          <!-- resource links -->
+          <nz-descriptions-item nzTitle="Resources">
+            <cvc-tag-list>
+              <cvc-link-tag
+                [href]="'http://dgidb.org/genes/' + gene.name"
+                [tooltip]="'View ' + gene.name + ' on DGIdb'">
+                DGIdb
+              </cvc-link-tag>
+              <cvc-link-tag
+                [href]="'https://pecan.stjude.cloud/variants/protein-paint/?gene=' + gene.name"
+                [tooltip]="'View ' + gene.name + ' on ProteinPaint'">
+                ProteinPaint
+              </cvc-link-tag>
+            </cvc-tag-list>
+          </nz-descriptions-item>
+        </nz-descriptions>
+      </nz-col>
+    </nz-row>
+  </nz-col>
 
-    <!-- variant menu row -->
-    <nz-col [nzSpan]="24">
-      <nz-tabset nzType="card">
-        <nz-tab nzTitle="Molecular Profiles">
-          <cvc-molecular-profile-menu
-            [geneId]="gene.id"></cvc-molecular-profile-menu>
-        </nz-tab>
-        <nz-tab nzTitle="Variants">
-          <cvc-variant-menu
-            [geneId]="gene.id"
-            [geneName]="gene.name"></cvc-variant-menu>
-        </nz-tab>
-      </nz-tabset>
-    </nz-col>
-  </nz-row>
-</ng-container>
+  <!-- last revision submitted/accepted, mygeneinfo col -->
+  <nz-col nzSpan="12">
+    <!-- mygeneinfo -->
+    <cvc-my-gene-info [geneInfo]="gene.myGeneInfoDetails"></cvc-my-gene-info>
+  </nz-col>
+</nz-row>
\ No newline at end of file
diff --git a/client/src/app/views/genes/genes-detail/genes-summary/genes-summary.page.ts b/client/src/app/views/genes/genes-detail/genes-summary/genes-summary.page.ts
index 622090b68..ce741730f 100644
--- a/client/src/app/views/genes/genes-detail/genes-summary/genes-summary.page.ts
+++ b/client/src/app/views/genes/genes-detail/genes-summary/genes-summary.page.ts
@@ -1,54 +1,30 @@
-import { Component, OnDestroy, OnInit } from '@angular/core'
-import { ActivatedRoute } from '@angular/router'
-import { Observable, Subscription } from 'rxjs'
-import { pluck } from 'rxjs-etc/operators'
+import { Component, Input, OnInit } from '@angular/core'
 
 import {
   SubscribableEntities,
   SubscribableInput,
-  GenesSummaryGQL,
   GeneSummaryFieldsFragment,
-  Maybe,
 } from '@app/generated/civic.apollo'
 
-import { Viewer, ViewerService } from '@app/core/services/viewer/viewer.service'
-
 @Component({
   selector: 'cvc-genes-summary',
   templateUrl: './genes-summary.page.html',
   styleUrls: ['./genes-summary.page.less'],
 })
-export class GenesSummaryPage implements OnDestroy {
-  gene$?: Observable<Maybe<GeneSummaryFieldsFragment>>
-  loading$?: Observable<boolean>
-  viewer$?: Observable<Viewer>
+export class GenesSummaryPage implements OnInit {
+  @Input() gene!: GeneSummaryFieldsFragment
 
   subscribableEntity?: SubscribableInput
 
-  routeSub: Subscription
-
-  constructor(
-    private gql: GenesSummaryGQL,
-    private viewerService: ViewerService,
-    private route: ActivatedRoute
-  ) {
-    this.routeSub = this.route.params.subscribe((params) => {
-      this.viewer$ = this.viewerService.viewer$
-
-      let queryRef = this.gql.watch({ geneId: +params.geneId })
-      let observable = queryRef.valueChanges
-
+  ngOnInit() {
+    if (this.gene == undefined) {
+      throw new Error('Must pass a Gene into gene summary')
+    }
+    else {
       this.subscribableEntity = {
-        id: +params.geneId,
+        id: this.gene.id,
         entityType: SubscribableEntities.Gene,
       }
-
-      this.gene$ = observable.pipe(pluck('data', 'gene'))
-      this.loading$ = observable.pipe(pluck('loading'))
-    })
-  }
-
-  ngOnDestroy() {
-    this.routeSub.unsubscribe()
+    }
   }
 }
diff --git a/client/src/app/views/genes/genes-detail/genes-summary/genes-summary.query.gql b/client/src/app/views/genes/genes-detail/genes-summary/genes-summary.query.gql
index 22e518a14..811facf86 100644
--- a/client/src/app/views/genes/genes-detail/genes-summary/genes-summary.query.gql
+++ b/client/src/app/views/genes/genes-detail/genes-summary/genes-summary.query.gql
@@ -7,7 +7,7 @@ query GenesSummary($geneId: Int!) {
 fragment GeneSummaryFields on Gene {
   description
   entrezId
-  geneAliases
+  featureAliases
   id
   name
   officialName
diff --git a/server/app/graphql/types/subscribable/subscribable_entities_type.rb b/server/app/graphql/types/subscribable/subscribable_entities_type.rb
index b0fe666ad..a55c29e51 100644
--- a/server/app/graphql/types/subscribable/subscribable_entities_type.rb
+++ b/server/app/graphql/types/subscribable/subscribable_entities_type.rb
@@ -1,7 +1,7 @@
 module Types::Subscribable
   class SubscribableEntitiesType < Types::BaseEnum
     description 'Enumeration of all subscribable CIViC entities.'
-    value 'GENE', value: 'Gene'
+    value 'GENE', value: 'Features::Gene'
     value 'VARIANT', value: 'Variant'
     value 'EVIDENCE_ITEM', value: 'EvidenceItem'
     value 'ASSERTION', value: 'Assertion'
diff --git a/server/app/models/my_gene_info.rb b/server/app/models/my_gene_info.rb
index 66b9f1cc3..0b5f0c57d 100644
--- a/server/app/models/my_gene_info.rb
+++ b/server/app/models/my_gene_info.rb
@@ -11,7 +11,7 @@ def self.refresh_cache_for_gene_id(gene_id)
 
   private
   def self.make_request(gene_id)
-    entrez_id = Gene.find_by!(id: gene_id).entrez_id
+    entrez_id = Features::Gene.find_by!(id: gene_id).entrez_id
     ScrapingUtils.make_get_request(my_gene_info_url(entrez_id))
   end
 

From 2ffaad70970301b61fa43b71cacad5272a73d55d Mon Sep 17 00:00:00 2001
From: Susanna Kiwala <susanna.kiwala@wustl.edu>
Date: Mon, 11 Dec 2023 13:22:15 -0600
Subject: [PATCH 004/125] Update variant and mp menu to query by featureId
 instead of geneId

---
 .../molecular-profiles-menu.component.ts      | 14 ++++----
 .../molecular-profiles-menu.gql               |  2 ++
 .../variants-menu/variants-menu.component.ts  | 20 +++++------
 .../variants/variants-menu/variants-menu.gql  |  8 +++--
 client/src/app/generated/civic.apollo.ts      | 27 ++++++++------
 client/src/app/generated/server.model.graphql | 15 ++++++++
 client/src/app/generated/server.schema.json   | 36 +++++++++++++++++++
 .../features-summary.page.html                |  6 ++--
 .../resolvers/top_level_molecular_profiles.rb |  5 +++
 .../resolvers/top_level_variant_types.rb      |  4 +++
 .../graphql/resolvers/top_level_variants.rb   |  4 +++
 11 files changed, 108 insertions(+), 33 deletions(-)

diff --git a/client/src/app/components/molecular-profiles/molecular-profiles-menu/molecular-profiles-menu.component.ts b/client/src/app/components/molecular-profiles/molecular-profiles-menu/molecular-profiles-menu.component.ts
index 5278293b9..6517b5ac2 100644
--- a/client/src/app/components/molecular-profiles/molecular-profiles-menu/molecular-profiles-menu.component.ts
+++ b/client/src/app/components/molecular-profiles/molecular-profiles-menu/molecular-profiles-menu.component.ts
@@ -23,7 +23,7 @@ import { isNonNulled } from 'rxjs-etc'
   styleUrls: ['./molecular-profiles-menu.component.less'],
 })
 export class CvcMolecularProfilesMenuComponent implements OnInit {
-  @Input() geneId?: number
+  @Input() featureId?: number
 
   menuMolecularProfiles$?: Observable<Maybe<MenuMolecularProfileFragment>[]>;
   totalMolecularProfiles$?: Observable<number>;
@@ -44,14 +44,14 @@ export class CvcMolecularProfilesMenuComponent implements OnInit {
   constructor(private gql: MolecularProfileMenuGQL) {}
 
   ngOnInit() {
-    if (this.geneId === undefined) {
+    if (this.featureId === undefined) {
       throw new Error(
-        'Must pass a gene id into molecular profile menu component.'
+        'Must pass a feature id into molecular profile menu component.'
       )
     }
 
     this.initialQueryVars = {
-      geneId: this.geneId,
+      featureId: this.featureId,
       evidenceStatusFilter: this.statusFilter,
       first: this.pageSize,
     }
@@ -99,13 +99,13 @@ export class CvcMolecularProfilesMenuComponent implements OnInit {
   }
 
   refresh() {
-    if (this.geneId === undefined) {
+    if (this.featureId === undefined) {
       throw new Error(
-        'Must pass a gene id into molecular profile menu component.'
+        'Must pass a feature id into molecular profile menu component.'
       )
     }
     this.queryRef$.refetch({
-      geneId: this.geneId,
+      featureId: this.featureId,
       mpName: this.mpNameFilter,
       first: this.pageSize
     });
diff --git a/client/src/app/components/molecular-profiles/molecular-profiles-menu/molecular-profiles-menu.gql b/client/src/app/components/molecular-profiles/molecular-profiles-menu/molecular-profiles-menu.gql
index 7ade70ceb..be7aedfea 100644
--- a/client/src/app/components/molecular-profiles/molecular-profiles-menu/molecular-profiles-menu.gql
+++ b/client/src/app/components/molecular-profiles/molecular-profiles-menu/molecular-profiles-menu.gql
@@ -1,5 +1,6 @@
 query MolecularProfileMenu(
   $geneId: Int
+  $featureId: Int
   $mpName: String
   $first: Int
   $last: Int
@@ -9,6 +10,7 @@ query MolecularProfileMenu(
 ) {
   molecularProfiles(
     geneId: $geneId
+    featureId: $featureId
     name: $mpName
     evidenceStatusFilter: $evidenceStatusFilter
     first: $first
diff --git a/client/src/app/components/variants/variants-menu/variants-menu.component.ts b/client/src/app/components/variants/variants-menu/variants-menu.component.ts
index 45ff18d38..d476e52b2 100644
--- a/client/src/app/components/variants/variants-menu/variants-menu.component.ts
+++ b/client/src/app/components/variants/variants-menu/variants-menu.component.ts
@@ -10,7 +10,7 @@ import {
   SortDirection,
   VariantConnection,
   MenuVariantTypeFragment,
-  VariantTypesForGeneGQL,
+  VariantTypesForFeatureGQL,
 } from '@app/generated/civic.apollo'
 import { map, debounceTime, distinctUntilChanged, filter, startWith } from 'rxjs/operators'
 import { Observable, Observer, Subject } from 'rxjs'
@@ -27,8 +27,8 @@ import { getEntityColor } from '@app/core/utilities/get-entity-color'
   styleUrls: ['./variants-menu.component.less'],
 })
 export class CvcVariantsMenuComponent implements OnInit {
-  @Input() geneId?: number
-  @Input() geneName?: string
+  @Input() featureId?: number
+  @Input() featureName?: string
 
 
   menuVariants$?: Observable<Maybe<MenuVariantFragment>[]>;
@@ -52,15 +52,15 @@ export class CvcVariantsMenuComponent implements OnInit {
   iconColor = getEntityColor('VariantType')
 
 
-  constructor(private gql: VariantsMenuGQL, private variantTypeGql: VariantTypesForGeneGQL) { }
+  constructor(private gql: VariantsMenuGQL, private variantTypeGql: VariantTypesForFeatureGQL) { }
 
   ngOnInit() {
-    if (this.geneId === undefined) {
-      throw new Error('Must pass a gene id into variant menu component.')
+    if (this.featureId === undefined) {
+      throw new Error('Must pass a feature id into variant menu component.')
     }
 
     this.initialQueryVars = {
-      geneId: this.geneId,
+      featureId: this.featureId,
       first: this.pageSize,
     }
 
@@ -94,7 +94,7 @@ export class CvcVariantsMenuComponent implements OnInit {
       .subscribe((_) => this.refresh());
 
     this.menuVariantTypes$ = this.variantTypeGql
-      .watch({geneId: this.geneId})
+      .watch({featureId: this.featureId})
       .valueChanges
       .pipe(
         map(c => c.data?.variantTypes.edges?.map((e) => e.node)),
@@ -121,12 +121,12 @@ export class CvcVariantsMenuComponent implements OnInit {
   }
 
   refresh() {
-    if (this.geneId === undefined) {
+    if (this.featureId === undefined) {
       throw new Error('Must pass a gene id into variant menu component.')
     }
 
     this.queryRef$.refetch({
-      geneId: this.geneId,
+      featureId: this.featureId,
       variantName: this.variantNameFilter,
       hasNoVariantType: this.hasNoVariantType,
       variantTypeIds: this.variantTypeFilter?.map(vt => vt.id),
diff --git a/client/src/app/components/variants/variants-menu/variants-menu.gql b/client/src/app/components/variants/variants-menu/variants-menu.gql
index 39901bfd8..0972d045e 100644
--- a/client/src/app/components/variants/variants-menu/variants-menu.gql
+++ b/client/src/app/components/variants/variants-menu/variants-menu.gql
@@ -1,5 +1,6 @@
 query VariantsMenu(
   $geneId: Int,
+  $featureId: Int,
   $variantName: String,
   $variantTypeIds: [Int!],
   $hasNoVariantType: Boolean
@@ -11,6 +12,7 @@ query VariantsMenu(
 ) {
   variants(
     geneId: $geneId,
+    featureId: $featureId,
     name: $variantName,
     variantTypeIds: $variantTypeIds,
     hasNoVariantType: $hasNoVariantType,
@@ -36,11 +38,11 @@ query VariantsMenu(
   }
 }
 
-query VariantTypesForGene(
-  $geneId: Int,
+query VariantTypesForFeature(
+  $featureId: Int,
 ) {
   variantTypes(
-    geneId: $geneId,
+    featureId: $featureId,
     first: 50
   ) {
     edges {
diff --git a/client/src/app/generated/civic.apollo.ts b/client/src/app/generated/civic.apollo.ts
index 981b4b633..b883dcb47 100644
--- a/client/src/app/generated/civic.apollo.ts
+++ b/client/src/app/generated/civic.apollo.ts
@@ -3829,6 +3829,7 @@ export type QueryMolecularProfilesArgs = {
   alleleRegistryId?: InputMaybe<Scalars['String']>;
   before?: InputMaybe<Scalars['String']>;
   evidenceStatusFilter?: InputMaybe<MolecularProfileDisplayFilter>;
+  featureId?: InputMaybe<Scalars['Int']>;
   first?: InputMaybe<Scalars['Int']>;
   geneId?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
@@ -4098,6 +4099,7 @@ export type QueryVariantTypeTypeaheadArgs = {
 export type QueryVariantTypesArgs = {
   after?: InputMaybe<Scalars['String']>;
   before?: InputMaybe<Scalars['String']>;
+  featureId?: InputMaybe<Scalars['Int']>;
   first?: InputMaybe<Scalars['Int']>;
   geneId?: InputMaybe<Scalars['Int']>;
   id?: InputMaybe<Scalars['Int']>;
@@ -4112,6 +4114,7 @@ export type QueryVariantsArgs = {
   after?: InputMaybe<Scalars['String']>;
   alleleRegistryId?: InputMaybe<Scalars['String']>;
   before?: InputMaybe<Scalars['String']>;
+  featureId?: InputMaybe<Scalars['Int']>;
   first?: InputMaybe<Scalars['Int']>;
   geneId?: InputMaybe<Scalars['Int']>;
   hasNoVariantType?: InputMaybe<Scalars['Boolean']>;
@@ -6227,6 +6230,7 @@ export type BrowseMolecularProfilesFieldsFragment = { __typename: 'BrowseMolecul
 
 export type MolecularProfileMenuQueryVariables = Exact<{
   geneId?: InputMaybe<Scalars['Int']>;
+  featureId?: InputMaybe<Scalars['Int']>;
   mpName?: InputMaybe<Scalars['String']>;
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
@@ -6643,6 +6647,7 @@ export type VariantPopoverFieldsFragment = { __typename: 'Variant', id: number,
 
 export type VariantsMenuQueryVariables = Exact<{
   geneId?: InputMaybe<Scalars['Int']>;
+  featureId?: InputMaybe<Scalars['Int']>;
   variantName?: InputMaybe<Scalars['String']>;
   variantTypeIds?: InputMaybe<Array<Scalars['Int']> | Scalars['Int']>;
   hasNoVariantType?: InputMaybe<Scalars['Boolean']>;
@@ -6656,12 +6661,12 @@ export type VariantsMenuQueryVariables = Exact<{
 
 export type VariantsMenuQuery = { __typename: 'Query', variants: { __typename: 'VariantConnection', totalCount: number, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasPreviousPage: boolean, hasNextPage: boolean }, edges: Array<{ __typename: 'VariantEdge', cursor: string, node?: { __typename: 'Variant', id: number, name: string, link: string, flagged: boolean } | undefined }> } };
 
-export type VariantTypesForGeneQueryVariables = Exact<{
-  geneId?: InputMaybe<Scalars['Int']>;
+export type VariantTypesForFeatureQueryVariables = Exact<{
+  featureId?: InputMaybe<Scalars['Int']>;
 }>;
 
 
-export type VariantTypesForGeneQuery = { __typename: 'Query', variantTypes: { __typename: 'BrowseVariantTypeConnection', edges: Array<{ __typename: 'BrowseVariantTypeEdge', node?: { __typename: 'BrowseVariantType', id: number, name: string, link: string } | undefined }> } };
+export type VariantTypesForFeatureQuery = { __typename: 'Query', variantTypes: { __typename: 'BrowseVariantTypeConnection', edges: Array<{ __typename: 'BrowseVariantTypeEdge', node?: { __typename: 'BrowseVariantType', id: number, name: string, link: string } | undefined }> } };
 
 export type MenuVariantTypeFragment = { __typename: 'BrowseVariantType', id: number, name: string, link: string };
 
@@ -11029,9 +11034,10 @@ export const BrowseMolecularProfilesDocument = gql`
     }
   }
 export const MolecularProfileMenuDocument = gql`
-    query MolecularProfileMenu($geneId: Int, $mpName: String, $first: Int, $last: Int, $before: String, $after: String, $evidenceStatusFilter: MolecularProfileDisplayFilter) {
+    query MolecularProfileMenu($geneId: Int, $featureId: Int, $mpName: String, $first: Int, $last: Int, $before: String, $after: String, $evidenceStatusFilter: MolecularProfileDisplayFilter) {
   molecularProfiles(
     geneId: $geneId
+    featureId: $featureId
     name: $mpName
     evidenceStatusFilter: $evidenceStatusFilter
     first: $first
@@ -12183,9 +12189,10 @@ export const VariantPopoverDocument = gql`
     }
   }
 export const VariantsMenuDocument = gql`
-    query VariantsMenu($geneId: Int, $variantName: String, $variantTypeIds: [Int!], $hasNoVariantType: Boolean, $first: Int, $last: Int, $before: String, $after: String, $sortBy: VariantMenuSort) {
+    query VariantsMenu($geneId: Int, $featureId: Int, $variantName: String, $variantTypeIds: [Int!], $hasNoVariantType: Boolean, $first: Int, $last: Int, $before: String, $after: String, $sortBy: VariantMenuSort) {
   variants(
     geneId: $geneId
+    featureId: $featureId
     name: $variantName
     variantTypeIds: $variantTypeIds
     hasNoVariantType: $hasNoVariantType
@@ -12222,9 +12229,9 @@ export const VariantsMenuDocument = gql`
       super(apollo);
     }
   }
-export const VariantTypesForGeneDocument = gql`
-    query VariantTypesForGene($geneId: Int) {
-  variantTypes(geneId: $geneId, first: 50) {
+export const VariantTypesForFeatureDocument = gql`
+    query VariantTypesForFeature($featureId: Int) {
+  variantTypes(featureId: $featureId, first: 50) {
     edges {
       node {
         ...menuVariantType
@@ -12237,8 +12244,8 @@ export const VariantTypesForGeneDocument = gql`
   @Injectable({
     providedIn: 'root'
   })
-  export class VariantTypesForGeneGQL extends Apollo.Query<VariantTypesForGeneQuery, VariantTypesForGeneQueryVariables> {
-    document = VariantTypesForGeneDocument;
+  export class VariantTypesForFeatureGQL extends Apollo.Query<VariantTypesForFeatureQuery, VariantTypesForFeatureQueryVariables> {
+    document = VariantTypesForFeatureDocument;
     
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
diff --git a/client/src/app/generated/server.model.graphql b/client/src/app/generated/server.model.graphql
index 938505e84..376841d12 100644
--- a/client/src/app/generated/server.model.graphql
+++ b/client/src/app/generated/server.model.graphql
@@ -6140,6 +6140,11 @@ type Query {
     """
     evidenceStatusFilter: MolecularProfileDisplayFilter
 
+    """
+    Filter molecular profiles to the CIViC ID of the feature(s) involved.
+    """
+    featureId: Int
+
     """
     Returns the first _n_ elements from the list.
     """
@@ -6654,6 +6659,11 @@ type Query {
     """
     before: String
 
+    """
+    Filter variant types by internal CIViC id a feature
+    """
+    featureId: Int
+
     """
     Returns the first _n_ elements from the list.
     """
@@ -6709,6 +6719,11 @@ type Query {
     """
     before: String
 
+    """
+    Feature that the variants are associated with.
+    """
+    featureId: Int
+
     """
     Returns the first _n_ elements from the list.
     """
diff --git a/client/src/app/generated/server.schema.json b/client/src/app/generated/server.schema.json
index 5c9f37f10..39a8785f2 100644
--- a/client/src/app/generated/server.schema.json
+++ b/client/src/app/generated/server.schema.json
@@ -28682,6 +28682,18 @@
                   "isDeprecated": false,
                   "deprecationReason": null
                 },
+                {
+                  "name": "featureId",
+                  "description": "Filter molecular profiles to the CIViC ID of the feature(s) involved.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
                 {
                   "name": "variantId",
                   "description": "Filter molecular profiles by the CIViC ID of an involved variant.",
@@ -30948,6 +30960,18 @@
                   "isDeprecated": false,
                   "deprecationReason": null
                 },
+                {
+                  "name": "featureId",
+                  "description": "Filter variant types by internal CIViC id a feature",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
                 {
                   "name": "sortBy",
                   "description": "Sort order for the variant type. Defaults to most recent.",
@@ -31049,6 +31073,18 @@
                   "isDeprecated": false,
                   "deprecationReason": null
                 },
+                {
+                  "name": "featureId",
+                  "description": "Feature that the variants are associated with.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
                 {
                   "name": "variantTypeIds",
                   "description": "A list of CIViC identifiers for variant types",
diff --git a/client/src/app/views/features/features-detail/features-summary/features-summary.page.html b/client/src/app/views/features/features-detail/features-summary/features-summary.page.html
index 332f99330..d63faf877 100644
--- a/client/src/app/views/features/features-detail/features-summary/features-summary.page.html
+++ b/client/src/app/views/features/features-detail/features-summary/features-summary.page.html
@@ -11,12 +11,12 @@
       <nz-tabset nzType="card">
         <nz-tab nzTitle="Molecular Profiles">
           <cvc-molecular-profile-menu
-            [geneId]="feature.id"></cvc-molecular-profile-menu>
+            [featureId]="feature.id"></cvc-molecular-profile-menu>
         </nz-tab>
         <nz-tab nzTitle="Variants">
           <cvc-variant-menu
-            [geneId]="feature.id"
-            [geneName]="feature.name"></cvc-variant-menu>
+            [featureId]="feature.id"
+            [featureName]="feature.name"></cvc-variant-menu>
         </nz-tab>
       </nz-tabset>
     </nz-col>
diff --git a/server/app/graphql/resolvers/top_level_molecular_profiles.rb b/server/app/graphql/resolvers/top_level_molecular_profiles.rb
index b831657a3..315e064c3 100644
--- a/server/app/graphql/resolvers/top_level_molecular_profiles.rb
+++ b/server/app/graphql/resolvers/top_level_molecular_profiles.rb
@@ -43,6 +43,11 @@ class Resolvers::TopLevelMolecularProfiles < GraphQL::Schema::Resolver
       .where('genes.id = ?', value)
   end
 
+  option(:feature_id, type: Int, description: "Filter molecular profiles to the CIViC ID of the feature(s) involved.") do |scope, value|
+    scope.joins(variants: [:feature])
+      .where('features.id = ?', value)
+  end
+
   option(:variant_id, type: Int, description: 'Filter molecular profiles by the CIViC ID of an involved variant.') do |scope, value|
     scope.joins(:variants).where('variants.id = ?', value)
   end
diff --git a/server/app/graphql/resolvers/top_level_variant_types.rb b/server/app/graphql/resolvers/top_level_variant_types.rb
index d7236fe8c..7e41fae76 100644
--- a/server/app/graphql/resolvers/top_level_variant_types.rb
+++ b/server/app/graphql/resolvers/top_level_variant_types.rb
@@ -36,6 +36,10 @@ class Resolvers::TopLevelVariantTypes < GraphQL::Schema::Resolver
     scope.joins(variants: [:gene]).where(gene: {id: value})
   end
 
+  option(:feature_id, type: Int, description: 'Filter variant types by internal CIViC id a feature') do |scope, value|
+    scope.joins(variants: [:feature]).where(feature: {id: value})
+  end
+
   option(:sort_by, type: Types::BrowseTables::VariantTypeSortType, description: 'Sort order for the variant type. Defaults to most recent.') do |scope, value|
     scope.reorder("#{value.column} #{value.direction}")
   end
diff --git a/server/app/graphql/resolvers/top_level_variants.rb b/server/app/graphql/resolvers/top_level_variants.rb
index bc79797f5..d08c63f07 100644
--- a/server/app/graphql/resolvers/top_level_variants.rb
+++ b/server/app/graphql/resolvers/top_level_variants.rb
@@ -18,6 +18,10 @@ class Resolvers::TopLevelVariants < GraphQL::Schema::Resolver
     scope.where(gene_id: value)
   end
 
+  option(:feature_id, type: GraphQL::Types::Int, description: 'Feature that the variants are associated with.') do |scope, value|
+    scope.where(feature_id: value)
+  end
+
   option(:variant_type_ids, type: [GraphQL::Types::Int], description: 'A list of CIViC identifiers for variant types') do  |scope, value|
     if value.size > 0
       scope.joins(:variant_types).where(variant_types: { id: value })

From 7870cea261ccfbd9d76dda3c55b3786713dbd442 Mon Sep 17 00:00:00 2001
From: Susanna Kiwala <susanna.kiwala@wustl.edu>
Date: Mon, 11 Dec 2023 14:10:59 -0600
Subject: [PATCH 005/125] Add FeatureTag and Popover

---
 .../feature-popover.component.html            | 73 +++++++++++++++++++
 .../feature-popover.component.less            |  1 +
 .../feature-popover.component.ts              | 32 ++++++++
 .../feature-popover/feature-popover.module.ts | 31 ++++++++
 .../feature-popover/feature-popover.query.gql | 26 +++++++
 .../feature-tag/feature-tag.component.html    | 43 +++++++++++
 .../feature-tag/feature-tag.component.ts      | 47 ++++++++++++
 .../feature-tag/feature-tag.module.ts         | 28 +++++++
 .../variant-popover.component.html            |  8 +-
 .../variant-popover/variant-popover.module.ts |  4 +-
 .../variant-popover/variant-popover.query.gql |  2 +-
 .../src/app/generated/civic.apollo-helpers.ts |  3 +-
 client/src/app/generated/civic.apollo.ts      | 60 ++++++++++++---
 client/src/app/generated/server.model.graphql |  1 +
 client/src/app/generated/server.schema.json   | 16 ++++
 .../variants-detail/variants-detail.module.ts |  4 +-
 .../variants-detail/variants-detail.query.gql |  2 +-
 .../variants-detail/variants-detail.view.html |  6 +-
 .../variants-summary.module.ts                |  4 +-
 .../variants-summary.page.html                |  8 +-
 .../variants-summary.query.gql                |  3 +-
 .../types/interfaces/feature_interface.rb     |  5 ++
 server/app/models/feature.rb                  |  4 +
 server/app/models/features/gene.rb            |  4 -
 24 files changed, 381 insertions(+), 34 deletions(-)
 create mode 100644 client/src/app/components/features/feature-popover/feature-popover.component.html
 create mode 100644 client/src/app/components/features/feature-popover/feature-popover.component.less
 create mode 100644 client/src/app/components/features/feature-popover/feature-popover.component.ts
 create mode 100644 client/src/app/components/features/feature-popover/feature-popover.module.ts
 create mode 100644 client/src/app/components/features/feature-popover/feature-popover.query.gql
 create mode 100644 client/src/app/components/features/feature-tag/feature-tag.component.html
 create mode 100644 client/src/app/components/features/feature-tag/feature-tag.component.ts
 create mode 100644 client/src/app/components/features/feature-tag/feature-tag.module.ts

diff --git a/client/src/app/components/features/feature-popover/feature-popover.component.html b/client/src/app/components/features/feature-popover/feature-popover.component.html
new file mode 100644
index 000000000..b5bdd1b5d
--- /dev/null
+++ b/client/src/app/components/features/feature-popover/feature-popover.component.html
@@ -0,0 +1,73 @@
+<div id="popover-content">
+  <ng-container *ngIf="feature$ | ngrxPush as feature">
+    <nz-card
+      [nzTitle]="cardTitle"
+      nzBordered="false"
+      id="card-content">
+      <ng-template #cardTitle>
+        <i
+          nz-icon
+          nzTheme="twotone"
+          [nzTwotoneColor]="'Gene' | entityColor"
+          nzType="civic-gene"></i>
+        {{ feature.officialName }}
+      </ng-template>
+
+      <nz-descriptions
+        nzSize="small"
+        [nzColumn]="2"
+        nzBordered="true">
+        <!-- aliases -->
+        <nz-descriptions-item
+          nzTitle="Aliases"
+          nzSpan="2"
+          *ngIf="feature.featureAliases.length > 0">
+          <nz-tag *ngFor="let alias of feature.featureAliases">{{ alias }}</nz-tag>
+        </nz-descriptions-item>
+
+        <!-- variant count-->
+        <nz-descriptions-item nzTitle="Variants">
+          {{ feature.variants.totalCount }}
+        </nz-descriptions-item>
+      </nz-descriptions>
+
+      <!-- entity comment, flags, etc. tags -->
+      <nz-row id="entity-child-counts">
+        <nz-col nzSpan="24">
+          <nz-space nzSize="small">
+            <a
+              routerLink="/features/{{ feature.id }}/flags"
+              *nzSpaceItem>
+              <nz-tag nzColor="red">
+                <i
+                  nz-icon
+                  nzType="civic-flag"></i>
+                Flags <!-- ({{ feature.flags.totalCount }}) -->
+              </nz-tag>
+            </a>
+            <a
+              routerLink="/features/{{ feature.id }}/revisions"
+              *nzSpaceItem>
+              <nz-tag nzColor="orange">
+                <i
+                  nz-icon
+                  nzType="civic-revision"></i>
+                Revisions <!-- ({{ feature.revisions.totalCount }}) -->
+              </nz-tag>
+            </a>
+            <a
+              routerLink="/features/{{ feature.id }}/comments"
+              *nzSpaceItem>
+              <nz-tag nzColor="blue">
+                <i
+                  nz-icon
+                  nzType="civic-comment"></i>
+                Comments <!-- ({{ feature.comments.totalCount }}) -->
+              </nz-tag>
+            </a>
+          </nz-space>
+        </nz-col>
+      </nz-row>
+    </nz-card>
+  </ng-container>
+</div>
diff --git a/client/src/app/components/features/feature-popover/feature-popover.component.less b/client/src/app/components/features/feature-popover/feature-popover.component.less
new file mode 100644
index 000000000..08b626e98
--- /dev/null
+++ b/client/src/app/components/features/feature-popover/feature-popover.component.less
@@ -0,0 +1 @@
+@import "themes/overrides/entity-popover.overrides.less";
diff --git a/client/src/app/components/features/feature-popover/feature-popover.component.ts b/client/src/app/components/features/feature-popover/feature-popover.component.ts
new file mode 100644
index 000000000..ee99d3030
--- /dev/null
+++ b/client/src/app/components/features/feature-popover/feature-popover.component.ts
@@ -0,0 +1,32 @@
+import { Component, Input, OnInit } from '@angular/core'
+import {
+  FeaturePopoverFragment,
+  FeaturePopoverGQL,
+  Maybe,
+} from '@app/generated/civic.apollo'
+import { Observable } from 'rxjs'
+import { isNonNulled } from 'rxjs-etc'
+import { filter, map } from 'rxjs/operators'
+
+@Component({
+  selector: 'cvc-feature-popover',
+  templateUrl: './feature-popover.component.html',
+  styleUrls: ['./feature-popover.component.less'],
+})
+export class CvcFeaturePopoverComponent implements OnInit {
+  @Input() featureId!: number
+
+  feature$?: Observable<Maybe<FeaturePopoverFragment>>
+
+  constructor(private gql: FeaturePopoverGQL) {}
+
+  ngOnInit() {
+    if (this.featureId == undefined) {
+      throw new Error('cvc-feature-popover requires valid featureId input.')
+    }
+    this.feature$ = this.gql.watch({ featureId: this.featureId }).valueChanges.pipe(
+      map(({ data }) => data?.feature),
+      filter(isNonNulled)
+    )
+  }
+}
diff --git a/client/src/app/components/features/feature-popover/feature-popover.module.ts b/client/src/app/components/features/feature-popover/feature-popover.module.ts
new file mode 100644
index 000000000..32e5c8a1d
--- /dev/null
+++ b/client/src/app/components/features/feature-popover/feature-popover.module.ts
@@ -0,0 +1,31 @@
+import { CommonModule } from '@angular/common'
+import { NgModule } from '@angular/core'
+import { RouterModule } from '@angular/router'
+import { CvcPipesModule } from '@app/core/pipes/pipes.module'
+import { LetDirective, PushPipe } from '@ngrx/component'
+import { NzCardModule } from 'ng-zorro-antd/card'
+import { NzDescriptionsModule } from 'ng-zorro-antd/descriptions'
+import { NzGridModule } from 'ng-zorro-antd/grid'
+import { NzIconModule } from 'ng-zorro-antd/icon'
+import { NzSpaceModule } from 'ng-zorro-antd/space'
+import { NzTagModule } from 'ng-zorro-antd/tag'
+import { CvcFeaturePopoverComponent } from './feature-popover.component'
+
+@NgModule({
+  declarations: [CvcFeaturePopoverComponent],
+  imports: [
+    CommonModule,
+    RouterModule,
+    LetDirective,
+    PushPipe,
+    NzCardModule,
+    NzGridModule,
+    NzDescriptionsModule,
+    NzTagModule,
+    NzIconModule,
+    NzSpaceModule,
+    CvcPipesModule,
+  ],
+  exports: [CvcFeaturePopoverComponent],
+})
+export class CvcFeaturePopoverModule {}
diff --git a/client/src/app/components/features/feature-popover/feature-popover.query.gql b/client/src/app/components/features/feature-popover/feature-popover.query.gql
new file mode 100644
index 000000000..5e225c199
--- /dev/null
+++ b/client/src/app/components/features/feature-popover/feature-popover.query.gql
@@ -0,0 +1,26 @@
+query FeaturePopover($featureId: Int!) {
+  feature(id: $featureId) {
+    ...featurePopover
+  }
+}
+
+fragment featurePopover on FeatureInterface {
+  id
+  name
+  ... on Gene {
+    officialName
+  }
+  featureAliases
+  variants {
+    totalCount
+  }
+  # revisions(status: NEW) {
+  #   totalCount
+  # }
+  # comments {
+  #   totalCount
+  # }
+  # flags(state: OPEN) {
+  #   totalCount
+  # }
+}
diff --git a/client/src/app/components/features/feature-tag/feature-tag.component.html b/client/src/app/components/features/feature-tag/feature-tag.component.html
new file mode 100644
index 000000000..c70c81015
--- /dev/null
+++ b/client/src/app/components/features/feature-tag/feature-tag.component.html
@@ -0,0 +1,43 @@
+<ng-container *ngIf="linked; else unlinked">
+  <a [routerLink]="feature.link">
+    <ng-template [ngTemplateOutlet]="tag"></ng-template>
+  </a>
+</ng-container>
+
+<ng-template #tag>
+  <nz-tag
+    nz-popover
+    [nzPopoverMouseEnterDelay]="this.onCloseClicked ? 0 : 0.5"
+    [nzPopoverContent]="featurePopover"
+    [nzPopoverTrigger]="enablePopover ? 'hover' : null"
+    [nzMode]="this.onCloseClicked ? 'closeable' : 'default'"
+    (nzOnClose)="itemClosed($event)">
+    <ng-template [ngTemplateOutlet]="tagContent"></ng-template>
+  </nz-tag>
+  <ng-template #featurePopover>
+    <cvc-feature-popover [featureId]="feature.id"></cvc-feature-popover>
+  </ng-template>
+</ng-template>
+
+<ng-template #unlinked>
+  <ng-template [ngTemplateOutlet]="tag"></ng-template>
+</ng-template>
+
+<ng-template #tagContent>
+  <cvc-icon-badges
+    [flagged]="feature.flagged"
+    [entityColor]="iconColor">
+    <i
+      nz-icon
+      nzType="civic-gene"
+      nzTheme="twotone"
+      [nzTwotoneColor]="'Gene' | entityColor"></i>
+  </cvc-icon-badges>
+  <!-- gene name length mean: 8; mode: 12 (15306); max: 25 -->
+  <ng-container *ngIf="this.truncateLongName; else fullName">
+    {{ feature.name | truncate : 12 }}
+  </ng-container>
+  <ng-template #fullName>
+    {{ feature.name }}
+  </ng-template>
+</ng-template>
diff --git a/client/src/app/components/features/feature-tag/feature-tag.component.ts b/client/src/app/components/features/feature-tag/feature-tag.component.ts
new file mode 100644
index 000000000..f90415439
--- /dev/null
+++ b/client/src/app/components/features/feature-tag/feature-tag.component.ts
@@ -0,0 +1,47 @@
+import {
+  ChangeDetectionStrategy,
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core'
+import { BaseCloseableTag } from '@app/core/utilities/closeable-tag-base'
+import { getEntityColor } from '@app/core/utilities/get-entity-color'
+import { Maybe } from '@app/generated/civic.apollo'
+
+export interface LinkableFeature {
+  id: number
+  name: string
+  link: string
+  flagged?: boolean
+}
+
+@Component({
+  selector: 'cvc-feature-tag',
+  templateUrl: './feature-tag.component.html',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class CvcFeatureTagComponent extends BaseCloseableTag implements OnInit {
+  @Input() feature!: LinkableFeature
+  @Input() enablePopover: Maybe<boolean> = true
+  @Input() truncateLongName: Maybe<boolean> = false
+
+  iconColor: string
+
+  constructor() {
+    super()
+    this.iconColor = getEntityColor('Gene')
+  }
+
+  idFunction(): number {
+    return this.feature.id
+  }
+
+  ngOnInit() {
+    super.ngOnInit()
+    if (this.feature === undefined) {
+      throw new Error(
+        'cvc-feature-tag requires LinkableFeature input, none supplied.'
+      )
+    }
+  }
+}
diff --git a/client/src/app/components/features/feature-tag/feature-tag.module.ts b/client/src/app/components/features/feature-tag/feature-tag.module.ts
new file mode 100644
index 000000000..489efe468
--- /dev/null
+++ b/client/src/app/components/features/feature-tag/feature-tag.module.ts
@@ -0,0 +1,28 @@
+import { NgModule } from '@angular/core'
+import { CommonModule } from '@angular/common'
+import { CvcFeatureTagComponent } from './feature-tag.component'
+import { RouterModule } from '@angular/router'
+import { NzTagModule } from 'ng-zorro-antd/tag'
+import { NzIconModule } from 'ng-zorro-antd/icon'
+import { NzPopoverModule } from 'ng-zorro-antd/popover'
+import { CvcPipesModule } from '@app/core/pipes/pipes.module'
+import { NzBadgeModule } from 'ng-zorro-antd/badge'
+import { CvcIconBadgesModule } from '@app/components/shared/icon-badges/icon-badges.module'
+import { CvcFeaturePopoverModule } from '../feature-popover/feature-popover.module'
+
+@NgModule({
+  declarations: [CvcFeatureTagComponent],
+  imports: [
+    CommonModule,
+    RouterModule,
+    NzTagModule,
+    NzPopoverModule,
+    NzIconModule,
+    NzBadgeModule,
+    CvcPipesModule,
+    CvcFeaturePopoverModule,
+    CvcIconBadgesModule,
+  ],
+  exports: [CvcFeatureTagComponent],
+})
+export class CvcFeatureTagModule {}
diff --git a/client/src/app/components/variants/variant-popover/variant-popover.component.html b/client/src/app/components/variants/variant-popover/variant-popover.component.html
index c4214f7d2..8785005f5 100644
--- a/client/src/app/components/variants/variant-popover/variant-popover.component.html
+++ b/client/src/app/components/variants/variant-popover/variant-popover.component.html
@@ -4,7 +4,7 @@
       [nzTitle]="cardTitle"
       nzBordered="false"
       id="card-content"
-      [nzExtra]="gene">
+      [nzExtra]="feature">
       <ng-template #cardTitle>
         <i
           nz-icon
@@ -13,10 +13,10 @@
           nzType="civic-variant"></i>
         {{ variant.name }}
       </ng-template>
-      <ng-template #gene>
-        <cvc-gene-tag
+      <ng-template #feature>
+        <cvc-feature-tag
           [enablePopover]="false"
-          [gene]="variant.gene"></cvc-gene-tag>
+          [feature]="variant.feature"></cvc-feature-tag>
       </ng-template>
 
       <nz-descriptions
diff --git a/client/src/app/components/variants/variant-popover/variant-popover.module.ts b/client/src/app/components/variants/variant-popover/variant-popover.module.ts
index ac81ecf40..2ddf3415d 100644
--- a/client/src/app/components/variants/variant-popover/variant-popover.module.ts
+++ b/client/src/app/components/variants/variant-popover/variant-popover.module.ts
@@ -9,9 +9,9 @@ import { NzDescriptionsModule } from 'ng-zorro-antd/descriptions'
 import { NzTagModule } from 'ng-zorro-antd/tag'
 import { NzIconModule } from 'ng-zorro-antd/icon'
 import { NzSpaceModule } from 'ng-zorro-antd/space'
-import { CvcGeneTagModule } from '@app/components/genes/gene-tag/gene-tag.module'
 import { CvcLinkTagModule } from '@app/components/shared/link-tag/link-tag.module'
 import { CvcPipesModule } from '@app/core/pipes/pipes.module'
+import { CvcFeatureTagModule } from '@app/components/features/feature-tag/feature-tag.module'
 
 @NgModule({
   declarations: [CvcVariantPopoverComponent],
@@ -27,7 +27,7 @@ import { CvcPipesModule } from '@app/core/pipes/pipes.module'
     NzIconModule,
     NzSpaceModule,
     CvcPipesModule,
-    CvcGeneTagModule,
+    CvcFeatureTagModule,
     CvcLinkTagModule,
   ],
   exports: [CvcVariantPopoverComponent],
diff --git a/client/src/app/components/variants/variant-popover/variant-popover.query.gql b/client/src/app/components/variants/variant-popover/variant-popover.query.gql
index bb70d20f1..19376ed3c 100644
--- a/client/src/app/components/variants/variant-popover/variant-popover.query.gql
+++ b/client/src/app/components/variants/variant-popover/variant-popover.query.gql
@@ -9,7 +9,7 @@ fragment variantPopoverFields on Variant {
   name
   variantAliases
   alleleRegistryId
-  gene {
+  feature {
     id
     name
     link
diff --git a/client/src/app/generated/civic.apollo-helpers.ts b/client/src/app/generated/civic.apollo-helpers.ts
index 3b0b6dd03..fc2c6c6bf 100644
--- a/client/src/app/generated/civic.apollo-helpers.ts
+++ b/client/src/app/generated/civic.apollo-helpers.ts
@@ -781,11 +781,12 @@ export type FdaCodeFieldPolicy = {
 	code?: FieldPolicy<any> | FieldReadFunction<any>,
 	description?: FieldPolicy<any> | FieldReadFunction<any>
 };
-export type FeatureInterfaceKeySpecifier = ('description' | 'featureAliases' | 'id' | 'name' | 'sources' | 'variants' | FeatureInterfaceKeySpecifier)[];
+export type FeatureInterfaceKeySpecifier = ('description' | 'featureAliases' | 'id' | 'link' | 'name' | 'sources' | 'variants' | FeatureInterfaceKeySpecifier)[];
 export type FeatureInterfaceFieldPolicy = {
 	description?: FieldPolicy<any> | FieldReadFunction<any>,
 	featureAliases?: FieldPolicy<any> | FieldReadFunction<any>,
 	id?: FieldPolicy<any> | FieldReadFunction<any>,
+	link?: FieldPolicy<any> | FieldReadFunction<any>,
 	name?: FieldPolicy<any> | FieldReadFunction<any>,
 	sources?: FieldPolicy<any> | FieldReadFunction<any>,
 	variants?: FieldPolicy<any> | FieldReadFunction<any>
diff --git a/client/src/app/generated/civic.apollo.ts b/client/src/app/generated/civic.apollo.ts
index b883dcb47..bad21f40b 100644
--- a/client/src/app/generated/civic.apollo.ts
+++ b/client/src/app/generated/civic.apollo.ts
@@ -1786,6 +1786,7 @@ export type FeatureInterface = {
   description: Scalars['String'];
   featureAliases: Array<Scalars['String']>;
   id: Scalars['Int'];
+  link: Scalars['String'];
   name: Scalars['String'];
   sources: Array<Source>;
   /** List and filter variants. */
@@ -6134,6 +6135,15 @@ export type EvidenceBrowseQuery = { __typename: 'Query', evidenceItems: { __type
 
 export type EvidenceGridFieldsFragment = { __typename: 'EvidenceItem', id: number, name: string, link: string, status: EvidenceStatus, flagged: boolean, therapyInteractionType?: TherapyInteraction | undefined, description: string, evidenceType: EvidenceType, evidenceDirection: EvidenceDirection, evidenceLevel: EvidenceLevel, evidenceRating?: number | undefined, significance: EvidenceSignificance, variantOrigin: VariantOrigin, disease?: { __typename: 'Disease', id: number, name: string, link: string } | undefined, therapies: Array<{ __typename: 'Therapy', id: number, name: string, link: string }>, molecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, parsedName: Array<{ __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfileTextSegment', text: string } | { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean }> } };
 
+export type FeaturePopoverQueryVariables = Exact<{
+  featureId: Scalars['Int'];
+}>;
+
+
+export type FeaturePopoverQuery = { __typename: 'Query', feature?: { __typename: 'Gene', officialName: string, id: number, name: string, featureAliases: Array<string>, variants: { __typename: 'VariantConnection', totalCount: number } } | undefined };
+
+export type FeaturePopoverFragment = { __typename: 'Gene', officialName: string, id: number, name: string, featureAliases: Array<string>, variants: { __typename: 'VariantConnection', totalCount: number } };
+
 export type FlagListQueryVariables = Exact<{
   flaggable?: InputMaybe<FlaggableInput>;
   flaggingUserId?: InputMaybe<Scalars['Int']>;
@@ -6641,9 +6651,9 @@ export type VariantPopoverQueryVariables = Exact<{
 }>;
 
 
-export type VariantPopoverQuery = { __typename: 'Query', variant?: { __typename: 'Variant', id: number, name: string, variantAliases: Array<string>, alleleRegistryId?: string | undefined, gene: { __typename: 'Gene', id: number, name: string, link: string }, molecularProfiles: { __typename: 'MolecularProfileConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, flags: { __typename: 'FlagConnection', totalCount: number } } | undefined };
+export type VariantPopoverQuery = { __typename: 'Query', variant?: { __typename: 'Variant', id: number, name: string, variantAliases: Array<string>, alleleRegistryId?: string | undefined, feature: { __typename: 'Gene', id: number, name: string, link: string }, molecularProfiles: { __typename: 'MolecularProfileConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, flags: { __typename: 'FlagConnection', totalCount: number } } | undefined };
 
-export type VariantPopoverFieldsFragment = { __typename: 'Variant', id: number, name: string, variantAliases: Array<string>, alleleRegistryId?: string | undefined, gene: { __typename: 'Gene', id: number, name: string, link: string }, molecularProfiles: { __typename: 'MolecularProfileConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, flags: { __typename: 'FlagConnection', totalCount: number } };
+export type VariantPopoverFieldsFragment = { __typename: 'Variant', id: number, name: string, variantAliases: Array<string>, alleleRegistryId?: string | undefined, feature: { __typename: 'Gene', id: number, name: string, link: string }, molecularProfiles: { __typename: 'MolecularProfileConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, flags: { __typename: 'FlagConnection', totalCount: number } };
 
 export type VariantsMenuQueryVariables = Exact<{
   geneId?: InputMaybe<Scalars['Int']>;
@@ -7652,18 +7662,18 @@ export type VariantDetailQueryVariables = Exact<{
 }>;
 
 
-export type VariantDetailQuery = { __typename: 'Query', variant?: { __typename: 'Variant', id: number, name: string, deprecated: boolean, deprecationReason?: VariantDeprecationReason | undefined, variantAliases: Array<string>, deprecationActivity?: { __typename: 'DeprecateVariantActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, gene: { __typename: 'Gene', id: number, name: string, link: string }, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number } } | undefined };
+export type VariantDetailQuery = { __typename: 'Query', variant?: { __typename: 'Variant', id: number, name: string, deprecated: boolean, deprecationReason?: VariantDeprecationReason | undefined, variantAliases: Array<string>, deprecationActivity?: { __typename: 'DeprecateVariantActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, feature: { __typename: 'Gene', id: number, name: string, link: string }, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number } } | undefined };
 
-export type VariantDetailFieldsFragment = { __typename: 'Variant', id: number, name: string, deprecated: boolean, deprecationReason?: VariantDeprecationReason | undefined, variantAliases: Array<string>, deprecationActivity?: { __typename: 'DeprecateVariantActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, gene: { __typename: 'Gene', id: number, name: string, link: string }, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number } };
+export type VariantDetailFieldsFragment = { __typename: 'Variant', id: number, name: string, deprecated: boolean, deprecationReason?: VariantDeprecationReason | undefined, variantAliases: Array<string>, deprecationActivity?: { __typename: 'DeprecateVariantActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, feature: { __typename: 'Gene', id: number, name: string, link: string }, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number } };
 
 export type VariantSummaryQueryVariables = Exact<{
   variantId: Scalars['Int'];
 }>;
 
 
-export type VariantSummaryQuery = { __typename: 'Query', variant?: { __typename: 'Variant', id: number, name: string, variantAliases: Array<string>, alleleRegistryId?: string | undefined, openCravatUrl?: string | undefined, maneSelectTranscript?: string | undefined, hgvsDescriptions: Array<string>, clinvarIds: Array<string>, referenceBuild?: ReferenceBuild | undefined, ensemblVersion?: number | undefined, referenceBases?: string | undefined, variantBases?: string | undefined, gene: { __typename: 'Gene', id: number, name: string, link: string }, variantTypes: Array<{ __typename: 'VariantType', id: number, link: string, soid: string, name: string }>, primaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, secondaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, myVariantInfo?: { __typename: 'MyVariantInfo', myVariantInfoId: string, caddConsequence: Array<string>, caddDetail: Array<string>, caddScore?: number | undefined, caddPhred?: number | undefined, clinvarClinicalSignificance: Array<string>, clinvarHgvsCoding: Array<string>, clinvarHgvsGenomic: Array<string>, clinvarHgvsNonCoding: Array<string>, clinvarHgvsProtein: Array<string>, clinvarId?: number | undefined, clinvarOmim?: string | undefined, cosmicId?: string | undefined, dbnsfpInterproDomain: Array<string>, dbsnpRsid?: string | undefined, eglClass?: string | undefined, eglHgvs: Array<string>, eglProtein?: string | undefined, eglTranscript?: string | undefined, exacAlleleCount?: number | undefined, exacAlleleFrequency?: number | undefined, exacAlleleNumber?: number | undefined, fathmmMklPrediction?: string | undefined, fathmmMklScore?: number | undefined, fathmmPrediction: Array<string>, fathmmScore: Array<number>, fitconsScore?: number | undefined, gerp?: number | undefined, gnomadExomeAlleleCount?: number | undefined, gnomadExomeAlleleFrequency?: number | undefined, gnomadExomeAlleleNumber?: number | undefined, gnomadExomeFilter?: string | undefined, gnomadGenomeAlleleCount?: number | undefined, gnomadGenomeAlleleFrequency?: number | undefined, gnomadGenomeAlleleNumber?: number | undefined, gnomadGenomeFilter?: string | undefined, lrtPrediction?: string | undefined, lrtScore?: number | undefined, metalrPrediction?: string | undefined, metalrScore?: number | undefined, metasvmPrediction?: string | undefined, metasvmScore?: number | undefined, mutationassessorPrediction: Array<string>, mutationassessorScore: Array<number>, mutationtasterPrediction: Array<string>, mutationtasterScore: Array<number>, phastcons100way?: number | undefined, phastcons30way?: number | undefined, phyloP100way?: number | undefined, phyloP30way?: number | undefined, polyphen2HdivPrediction: Array<string>, polyphen2HdivScore: Array<number>, polyphen2HvarPrediction: Array<string>, polyphen2HvarScore: Array<number>, proveanPrediction: Array<string>, proveanScore: Array<number>, revelScore?: Array<number> | undefined, siftPrediction: Array<string>, siftScore: Array<number>, siphy?: number | undefined, snpeffSnpEffect: Array<string>, snpeffSnpImpact: Array<string> } | undefined, lastSubmittedRevisionEvent?: { __typename: 'Event', originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, lastAcceptedRevisionEvent?: { __typename: 'Event', originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, creationActivity?: { __typename: 'CreateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, deprecationActivity?: { __typename: 'DeprecateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined } | undefined };
+export type VariantSummaryQuery = { __typename: 'Query', variant?: { __typename: 'Variant', id: number, name: string, variantAliases: Array<string>, alleleRegistryId?: string | undefined, openCravatUrl?: string | undefined, maneSelectTranscript?: string | undefined, hgvsDescriptions: Array<string>, clinvarIds: Array<string>, referenceBuild?: ReferenceBuild | undefined, ensemblVersion?: number | undefined, referenceBases?: string | undefined, variantBases?: string | undefined, feature: { __typename: 'Gene', id: number, name: string, link: string }, variantTypes: Array<{ __typename: 'VariantType', id: number, link: string, soid: string, name: string }>, primaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, secondaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, myVariantInfo?: { __typename: 'MyVariantInfo', myVariantInfoId: string, caddConsequence: Array<string>, caddDetail: Array<string>, caddScore?: number | undefined, caddPhred?: number | undefined, clinvarClinicalSignificance: Array<string>, clinvarHgvsCoding: Array<string>, clinvarHgvsGenomic: Array<string>, clinvarHgvsNonCoding: Array<string>, clinvarHgvsProtein: Array<string>, clinvarId?: number | undefined, clinvarOmim?: string | undefined, cosmicId?: string | undefined, dbnsfpInterproDomain: Array<string>, dbsnpRsid?: string | undefined, eglClass?: string | undefined, eglHgvs: Array<string>, eglProtein?: string | undefined, eglTranscript?: string | undefined, exacAlleleCount?: number | undefined, exacAlleleFrequency?: number | undefined, exacAlleleNumber?: number | undefined, fathmmMklPrediction?: string | undefined, fathmmMklScore?: number | undefined, fathmmPrediction: Array<string>, fathmmScore: Array<number>, fitconsScore?: number | undefined, gerp?: number | undefined, gnomadExomeAlleleCount?: number | undefined, gnomadExomeAlleleFrequency?: number | undefined, gnomadExomeAlleleNumber?: number | undefined, gnomadExomeFilter?: string | undefined, gnomadGenomeAlleleCount?: number | undefined, gnomadGenomeAlleleFrequency?: number | undefined, gnomadGenomeAlleleNumber?: number | undefined, gnomadGenomeFilter?: string | undefined, lrtPrediction?: string | undefined, lrtScore?: number | undefined, metalrPrediction?: string | undefined, metalrScore?: number | undefined, metasvmPrediction?: string | undefined, metasvmScore?: number | undefined, mutationassessorPrediction: Array<string>, mutationassessorScore: Array<number>, mutationtasterPrediction: Array<string>, mutationtasterScore: Array<number>, phastcons100way?: number | undefined, phastcons30way?: number | undefined, phyloP100way?: number | undefined, phyloP30way?: number | undefined, polyphen2HdivPrediction: Array<string>, polyphen2HdivScore: Array<number>, polyphen2HvarPrediction: Array<string>, polyphen2HvarScore: Array<number>, proveanPrediction: Array<string>, proveanScore: Array<number>, revelScore?: Array<number> | undefined, siftPrediction: Array<string>, siftScore: Array<number>, siphy?: number | undefined, snpeffSnpEffect: Array<string>, snpeffSnpImpact: Array<string> } | undefined, lastSubmittedRevisionEvent?: { __typename: 'Event', originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, lastAcceptedRevisionEvent?: { __typename: 'Event', originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, creationActivity?: { __typename: 'CreateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, deprecationActivity?: { __typename: 'DeprecateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined } | undefined };
 
-export type VariantSummaryFieldsFragment = { __typename: 'Variant', id: number, name: string, variantAliases: Array<string>, alleleRegistryId?: string | undefined, openCravatUrl?: string | undefined, maneSelectTranscript?: string | undefined, hgvsDescriptions: Array<string>, clinvarIds: Array<string>, referenceBuild?: ReferenceBuild | undefined, ensemblVersion?: number | undefined, referenceBases?: string | undefined, variantBases?: string | undefined, gene: { __typename: 'Gene', id: number, name: string, link: string }, variantTypes: Array<{ __typename: 'VariantType', id: number, link: string, soid: string, name: string }>, primaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, secondaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, myVariantInfo?: { __typename: 'MyVariantInfo', myVariantInfoId: string, caddConsequence: Array<string>, caddDetail: Array<string>, caddScore?: number | undefined, caddPhred?: number | undefined, clinvarClinicalSignificance: Array<string>, clinvarHgvsCoding: Array<string>, clinvarHgvsGenomic: Array<string>, clinvarHgvsNonCoding: Array<string>, clinvarHgvsProtein: Array<string>, clinvarId?: number | undefined, clinvarOmim?: string | undefined, cosmicId?: string | undefined, dbnsfpInterproDomain: Array<string>, dbsnpRsid?: string | undefined, eglClass?: string | undefined, eglHgvs: Array<string>, eglProtein?: string | undefined, eglTranscript?: string | undefined, exacAlleleCount?: number | undefined, exacAlleleFrequency?: number | undefined, exacAlleleNumber?: number | undefined, fathmmMklPrediction?: string | undefined, fathmmMklScore?: number | undefined, fathmmPrediction: Array<string>, fathmmScore: Array<number>, fitconsScore?: number | undefined, gerp?: number | undefined, gnomadExomeAlleleCount?: number | undefined, gnomadExomeAlleleFrequency?: number | undefined, gnomadExomeAlleleNumber?: number | undefined, gnomadExomeFilter?: string | undefined, gnomadGenomeAlleleCount?: number | undefined, gnomadGenomeAlleleFrequency?: number | undefined, gnomadGenomeAlleleNumber?: number | undefined, gnomadGenomeFilter?: string | undefined, lrtPrediction?: string | undefined, lrtScore?: number | undefined, metalrPrediction?: string | undefined, metalrScore?: number | undefined, metasvmPrediction?: string | undefined, metasvmScore?: number | undefined, mutationassessorPrediction: Array<string>, mutationassessorScore: Array<number>, mutationtasterPrediction: Array<string>, mutationtasterScore: Array<number>, phastcons100way?: number | undefined, phastcons30way?: number | undefined, phyloP100way?: number | undefined, phyloP30way?: number | undefined, polyphen2HdivPrediction: Array<string>, polyphen2HdivScore: Array<number>, polyphen2HvarPrediction: Array<string>, polyphen2HvarScore: Array<number>, proveanPrediction: Array<string>, proveanScore: Array<number>, revelScore?: Array<number> | undefined, siftPrediction: Array<string>, siftScore: Array<number>, siphy?: number | undefined, snpeffSnpEffect: Array<string>, snpeffSnpImpact: Array<string> } | undefined, lastSubmittedRevisionEvent?: { __typename: 'Event', originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, lastAcceptedRevisionEvent?: { __typename: 'Event', originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, creationActivity?: { __typename: 'CreateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, deprecationActivity?: { __typename: 'DeprecateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined };
+export type VariantSummaryFieldsFragment = { __typename: 'Variant', id: number, name: string, variantAliases: Array<string>, alleleRegistryId?: string | undefined, openCravatUrl?: string | undefined, maneSelectTranscript?: string | undefined, hgvsDescriptions: Array<string>, clinvarIds: Array<string>, referenceBuild?: ReferenceBuild | undefined, ensemblVersion?: number | undefined, referenceBases?: string | undefined, variantBases?: string | undefined, feature: { __typename: 'Gene', id: number, name: string, link: string }, variantTypes: Array<{ __typename: 'VariantType', id: number, link: string, soid: string, name: string }>, primaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, secondaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, myVariantInfo?: { __typename: 'MyVariantInfo', myVariantInfoId: string, caddConsequence: Array<string>, caddDetail: Array<string>, caddScore?: number | undefined, caddPhred?: number | undefined, clinvarClinicalSignificance: Array<string>, clinvarHgvsCoding: Array<string>, clinvarHgvsGenomic: Array<string>, clinvarHgvsNonCoding: Array<string>, clinvarHgvsProtein: Array<string>, clinvarId?: number | undefined, clinvarOmim?: string | undefined, cosmicId?: string | undefined, dbnsfpInterproDomain: Array<string>, dbsnpRsid?: string | undefined, eglClass?: string | undefined, eglHgvs: Array<string>, eglProtein?: string | undefined, eglTranscript?: string | undefined, exacAlleleCount?: number | undefined, exacAlleleFrequency?: number | undefined, exacAlleleNumber?: number | undefined, fathmmMklPrediction?: string | undefined, fathmmMklScore?: number | undefined, fathmmPrediction: Array<string>, fathmmScore: Array<number>, fitconsScore?: number | undefined, gerp?: number | undefined, gnomadExomeAlleleCount?: number | undefined, gnomadExomeAlleleFrequency?: number | undefined, gnomadExomeAlleleNumber?: number | undefined, gnomadExomeFilter?: string | undefined, gnomadGenomeAlleleCount?: number | undefined, gnomadGenomeAlleleFrequency?: number | undefined, gnomadGenomeAlleleNumber?: number | undefined, gnomadGenomeFilter?: string | undefined, lrtPrediction?: string | undefined, lrtScore?: number | undefined, metalrPrediction?: string | undefined, metalrScore?: number | undefined, metasvmPrediction?: string | undefined, metasvmScore?: number | undefined, mutationassessorPrediction: Array<string>, mutationassessorScore: Array<number>, mutationtasterPrediction: Array<string>, mutationtasterScore: Array<number>, phastcons100way?: number | undefined, phastcons30way?: number | undefined, phyloP100way?: number | undefined, phyloP30way?: number | undefined, polyphen2HdivPrediction: Array<string>, polyphen2HdivScore: Array<number>, polyphen2HvarPrediction: Array<string>, polyphen2HvarScore: Array<number>, proveanPrediction: Array<string>, proveanScore: Array<number>, revelScore?: Array<number> | undefined, siftPrediction: Array<string>, siftScore: Array<number>, siphy?: number | undefined, snpeffSnpEffect: Array<string>, snpeffSnpImpact: Array<string> } | undefined, lastSubmittedRevisionEvent?: { __typename: 'Event', originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, lastAcceptedRevisionEvent?: { __typename: 'Event', originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, creationActivity?: { __typename: 'CreateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, deprecationActivity?: { __typename: 'DeprecateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined };
 
 export type MyVariantInfoFieldsFragment = { __typename: 'MyVariantInfo', myVariantInfoId: string, caddConsequence: Array<string>, caddDetail: Array<string>, caddScore?: number | undefined, caddPhred?: number | undefined, clinvarClinicalSignificance: Array<string>, clinvarHgvsCoding: Array<string>, clinvarHgvsGenomic: Array<string>, clinvarHgvsNonCoding: Array<string>, clinvarHgvsProtein: Array<string>, clinvarId?: number | undefined, clinvarOmim?: string | undefined, cosmicId?: string | undefined, dbnsfpInterproDomain: Array<string>, dbsnpRsid?: string | undefined, eglClass?: string | undefined, eglHgvs: Array<string>, eglProtein?: string | undefined, eglTranscript?: string | undefined, exacAlleleCount?: number | undefined, exacAlleleFrequency?: number | undefined, exacAlleleNumber?: number | undefined, fathmmMklPrediction?: string | undefined, fathmmMklScore?: number | undefined, fathmmPrediction: Array<string>, fathmmScore: Array<number>, fitconsScore?: number | undefined, gerp?: number | undefined, gnomadExomeAlleleCount?: number | undefined, gnomadExomeAlleleFrequency?: number | undefined, gnomadExomeAlleleNumber?: number | undefined, gnomadExomeFilter?: string | undefined, gnomadGenomeAlleleCount?: number | undefined, gnomadGenomeAlleleFrequency?: number | undefined, gnomadGenomeAlleleNumber?: number | undefined, gnomadGenomeFilter?: string | undefined, lrtPrediction?: string | undefined, lrtScore?: number | undefined, metalrPrediction?: string | undefined, metalrScore?: number | undefined, metasvmPrediction?: string | undefined, metasvmScore?: number | undefined, mutationassessorPrediction: Array<string>, mutationassessorScore: Array<number>, mutationtasterPrediction: Array<string>, mutationtasterScore: Array<number>, phastcons100way?: number | undefined, phastcons30way?: number | undefined, phyloP100way?: number | undefined, phyloP30way?: number | undefined, polyphen2HdivPrediction: Array<string>, polyphen2HdivScore: Array<number>, polyphen2HvarPrediction: Array<string>, polyphen2HvarScore: Array<number>, proveanPrediction: Array<string>, proveanScore: Array<number>, revelScore?: Array<number> | undefined, siftPrediction: Array<string>, siftScore: Array<number>, siphy?: number | undefined, snpeffSnpEffect: Array<string>, snpeffSnpImpact: Array<string> };
 
@@ -8135,6 +8145,19 @@ export const EvidenceGridFieldsFragmentDoc = gql`
   variantOrigin
 }
     ${MolecularProfileParsedNameFragmentDoc}`;
+export const FeaturePopoverFragmentDoc = gql`
+    fragment featurePopover on FeatureInterface {
+  id
+  name
+  ... on Gene {
+    officialName
+  }
+  featureAliases
+  variants {
+    totalCount
+  }
+}
+    `;
 export const FlagFragmentDoc = gql`
     fragment flag on Flag {
   id
@@ -8756,7 +8779,7 @@ export const VariantPopoverFieldsFragmentDoc = gql`
   name
   variantAliases
   alleleRegistryId
-  gene {
+  feature {
     id
     name
     link
@@ -10215,7 +10238,7 @@ export const VariantDetailFieldsFragmentDoc = gql`
       ...parsedCommentFragment
     }
   }
-  gene {
+  feature {
     id
     name
     link
@@ -10302,7 +10325,8 @@ export const VariantSummaryFieldsFragmentDoc = gql`
     fragment VariantSummaryFields on Variant {
   id
   name
-  gene {
+  feature {
+    __typename
     id
     name
     link
@@ -10841,6 +10865,24 @@ export const EvidenceBrowseDocument = gql`
   export class EvidenceBrowseGQL extends Apollo.Query<EvidenceBrowseQuery, EvidenceBrowseQueryVariables> {
     document = EvidenceBrowseDocument;
     
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
+export const FeaturePopoverDocument = gql`
+    query FeaturePopover($featureId: Int!) {
+  feature(id: $featureId) {
+    ...featurePopover
+  }
+}
+    ${FeaturePopoverFragmentDoc}`;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class FeaturePopoverGQL extends Apollo.Query<FeaturePopoverQuery, FeaturePopoverQueryVariables> {
+    document = FeaturePopoverDocument;
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
diff --git a/client/src/app/generated/server.model.graphql b/client/src/app/generated/server.model.graphql
index 376841d12..7281863ed 100644
--- a/client/src/app/generated/server.model.graphql
+++ b/client/src/app/generated/server.model.graphql
@@ -2803,6 +2803,7 @@ interface FeatureInterface {
   description: String!
   featureAliases: [String!]!
   id: Int!
+  link: String!
   name: String!
   sources: [Source!]!
 
diff --git a/client/src/app/generated/server.schema.json b/client/src/app/generated/server.schema.json
index 39a8785f2..bd243a32b 100644
--- a/client/src/app/generated/server.schema.json
+++ b/client/src/app/generated/server.schema.json
@@ -14120,6 +14120,22 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "link",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "name",
               "description": null,
diff --git a/client/src/app/views/variants/variants-detail/variants-detail.module.ts b/client/src/app/views/variants/variants-detail/variants-detail.module.ts
index df702b651..8765923be 100644
--- a/client/src/app/views/variants/variants-detail/variants-detail.module.ts
+++ b/client/src/app/views/variants/variants-detail/variants-detail.module.ts
@@ -1,8 +1,8 @@
 import { CommonModule } from '@angular/common'
 import { NgModule } from '@angular/core'
 import { CvcCommentBodyModule } from '@app/components/comments/comment-body/comment-body.module'
+import { CvcFeatureTagModule } from '@app/components/features/feature-tag/feature-tag.module'
 import { CvcFlaggableModule } from '@app/components/flags/flaggable/flaggable.module'
-import { CvcGeneTagModule } from '@app/components/genes/gene-tag/gene-tag.module'
 import { CvcContributorAvatarsModule } from '@app/components/shared/contributor-avatars/contributor-avatars.module'
 import { CvcEntitySubscriptionButtonModule } from '@app/components/shared/entity-subscription-button/entity-subscription-button.module'
 import { CvcSectionNavigationModule } from '@app/components/shared/section-navigation/section-navigation.module'
@@ -39,7 +39,7 @@ import { VariantsDetailView } from './variants-detail.view'
     CvcContributorAvatarsModule,
     CvcTabNavigationModule,
     CvcFlaggableModule,
-    CvcGeneTagModule,
+    CvcFeatureTagModule,
     CvcSectionNavigationModule,
     CvcEntitySubscriptionButtonModule,
     CvcPipesModule,
diff --git a/client/src/app/views/variants/variants-detail/variants-detail.query.gql b/client/src/app/views/variants/variants-detail/variants-detail.query.gql
index 0ea9f0210..1c296ccb0 100644
--- a/client/src/app/views/variants/variants-detail/variants-detail.query.gql
+++ b/client/src/app/views/variants/variants-detail/variants-detail.query.gql
@@ -14,7 +14,7 @@ fragment VariantDetailFields on Variant {
       ...parsedCommentFragment
     }
   }
-  gene {
+  feature {
     id
     name
     link
diff --git a/client/src/app/views/variants/variants-detail/variants-detail.view.html b/client/src/app/views/variants/variants-detail/variants-detail.view.html
index 4934fe48b..837264a50 100644
--- a/client/src/app/views/variants/variants-detail/variants-detail.view.html
+++ b/client/src/app/views/variants/variants-detail/variants-detail.view.html
@@ -1,6 +1,6 @@
 <ng-container *ngIf="variant$ | ngrxPush as variant">
   <cvc-section-navigation
-    [displayName]="variant.gene.name + ' ' + variant.name"
+    [displayName]="variant.feature.name + ' ' + variant.name"
     [relationsTpl]="variantRelations">
   </cvc-section-navigation>
   <ng-template #variantRelations>
@@ -15,8 +15,8 @@
       <span
         *nzSpaceItem
         class="tags">
-        <a routerLink="/genes/{{ variant.gene.id }}">
-          <cvc-gene-tag [gene]="variant.gene"></cvc-gene-tag>
+        <a routerLink="/features/{{ variant.feature.id }}">
+          <cvc-feature-tag [feature]="variant.feature"></cvc-feature-tag>
         </a>
       </span>
     </nz-space>
diff --git a/client/src/app/views/variants/variants-detail/variants-summary/variants-summary.module.ts b/client/src/app/views/variants/variants-detail/variants-summary/variants-summary.module.ts
index dff5ba62f..1df6f5c14 100644
--- a/client/src/app/views/variants/variants-detail/variants-summary/variants-summary.module.ts
+++ b/client/src/app/views/variants/variants-detail/variants-summary/variants-summary.module.ts
@@ -18,9 +18,9 @@ import { CvcPipesModule } from '@app/core/pipes/pipes.module'
 import { NzIconModule } from 'ng-zorro-antd/icon'
 import { CvcUserTagModule } from '@app/components/users/user-tag/user-tag.module'
 import { NzTagModule } from 'ng-zorro-antd/tag'
-import { CvcGeneTagModule } from '@app/components/genes/gene-tag/gene-tag.module'
 import { CvcCoordinatesCardModule } from '@app/components/variants/coordinates-card/coordinates-card.module'
 import { CvcMolecularProfilesTableModule } from '@app/components/molecular-profiles/molecular-profile-table/molecular-profile-table.module'
+import { CvcFeatureTagModule } from '@app/components/features/feature-tag/feature-tag.module'
 
 @NgModule({
   declarations: [VariantsSummaryPage],
@@ -40,7 +40,7 @@ import { CvcMolecularProfilesTableModule } from '@app/components/molecular-profi
     CvcTagListModule,
     CvcUserTagModule,
     CvcSourceTagModule,
-    CvcGeneTagModule,
+    CvcFeatureTagModule,
     CvcVariantTypeTagModule,
     CvcLinkTagModule,
     CvcMyVariantInfoModule,
diff --git a/client/src/app/views/variants/variants-detail/variants-summary/variants-summary.page.html b/client/src/app/views/variants/variants-detail/variants-summary/variants-summary.page.html
index a0303b7d7..cac238ad5 100644
--- a/client/src/app/views/variants/variants-detail/variants-summary/variants-summary.page.html
+++ b/client/src/app/views/variants/variants-detail/variants-summary/variants-summary.page.html
@@ -5,7 +5,7 @@
     <nz-col [nzSpan]="12">
       <!-- left col layout row -->
       <nz-row [nzGutter]="[8,8]">
-        <!-- gene attributes block -->
+        <!-- variant attributes block -->
         <nz-col nzSpan="24">
           <nz-descriptions
             nzLayout="horizontal"
@@ -143,9 +143,9 @@
             nzSize="small"
             [nzColumn]="{ xxl: 2, xl: 2, lg: 1, md: 1, sm: 1, xs: 1 }"
             nzBordered="true">
-            <!-- gene -->
-            <nz-descriptions-item nzTitle="Gene">
-              <cvc-gene-tag [gene]="variant.gene"></cvc-gene-tag>
+            <!-- feature -->
+            <nz-descriptions-item [nzTitle]="variant.feature.__typename">
+              <cvc-feature-tag [feature]="variant.feature"></cvc-feature-tag>
             </nz-descriptions-item>
 
             <!-- allele reg. id -->
diff --git a/client/src/app/views/variants/variants-detail/variants-summary/variants-summary.query.gql b/client/src/app/views/variants/variants-detail/variants-summary/variants-summary.query.gql
index 4373eb52b..250d5e88d 100644
--- a/client/src/app/views/variants/variants-detail/variants-summary/variants-summary.query.gql
+++ b/client/src/app/views/variants/variants-detail/variants-summary/variants-summary.query.gql
@@ -7,7 +7,8 @@ query VariantSummary($variantId: Int!) {
 fragment VariantSummaryFields on Variant {
   id
   name
-  gene {
+  feature {
+    __typename
     id
     name
     link
diff --git a/server/app/graphql/types/interfaces/feature_interface.rb b/server/app/graphql/types/interfaces/feature_interface.rb
index 28c43b450..6c792730b 100644
--- a/server/app/graphql/types/interfaces/feature_interface.rb
+++ b/server/app/graphql/types/interfaces/feature_interface.rb
@@ -10,6 +10,7 @@ module FeatureInterface
     field :feature_aliases, [String], null: false
     field :sources, [Types::Entities::SourceType], null: false
     field :variants, resolver: Resolvers::Variants
+    field :link, String, null: false
 
     orphan_types(
       Types::Entities::GeneType
@@ -33,6 +34,10 @@ def variants
       Loaders::AssociationLoader.for(Feature, :variants).load(object)
     end
 
+    def link
+      object.feature.link
+    end
+
     definition_methods do
       def resolve_type(object, context)
         case object
diff --git a/server/app/models/feature.rb b/server/app/models/feature.rb
index 4c5a42ee2..ccd7412fc 100644
--- a/server/app/models/feature.rb
+++ b/server/app/models/feature.rb
@@ -4,4 +4,8 @@ class Feature < ApplicationRecord
   has_and_belongs_to_many :sources
 
   has_many :variants
+
+  def link
+    Rails.application.routes.url_helpers.url_for("/features/#{self.id}")
+  end
 end
diff --git a/server/app/models/features/gene.rb b/server/app/models/features/gene.rb
index 8885f262b..0536c9d01 100644
--- a/server/app/models/features/gene.rb
+++ b/server/app/models/features/gene.rb
@@ -25,10 +25,6 @@ def search_data
       }
     end
 
-    def link
-      Rails.application.routes.url_helpers.url_for("/genes/#{self.id}")
-    end
-
     def display_name
       name
     end

From 1facf9c39866db5d70f0479bbdee8af7f852e688 Mon Sep 17 00:00:00 2001
From: Susanna Kiwala <susanna.kiwala@wustl.edu>
Date: Tue, 12 Dec 2023 10:33:51 -0600
Subject: [PATCH 006/125] Add feature browse table

---
 .../features-table.component.html             | 237 ++++++
 .../features-table.component.less             |   5 +
 .../features-table.component.ts               | 208 +++++
 .../features-table/features-table.module.ts   |  57 ++
 .../features-table/features-table.query.gql   |  62 ++
 .../src/app/generated/civic.apollo-helpers.ts |  46 +-
 client/src/app/generated/civic.apollo.ts      | 182 ++++-
 .../src/app/generated/civic.possible-types.ts |   1 +
 client/src/app/generated/server.model.graphql | 164 ++++
 client/src/app/generated/server.schema.json   | 744 ++++++++++++++++++
 .../features-home/features-home.module.ts     |   4 +-
 .../features-home/features-home.page.html     |   2 +-
 .../app/graphql/resolvers/browse_features.rb  |  48 ++
 .../browse_tables/browse_feature_type.rb      |  38 +
 .../browse_tables/features_sort_columns.rb    |  12 +
 .../types/browse_tables/features_sort_type.rb |   6 +
 server/app/graphql/types/query_type.rb        |   1 +
 .../feature_browse_table_row.rb               |   2 +
 ...145853_create_feature_browse_table_rows.rb |   5 +
 server/db/schema.rb                           |  45 +-
 .../views/feature_browse_table_rows_v01.sql   |  45 ++
 21 files changed, 1904 insertions(+), 10 deletions(-)
 create mode 100644 client/src/app/components/features/features-table/features-table.component.html
 create mode 100644 client/src/app/components/features/features-table/features-table.component.less
 create mode 100644 client/src/app/components/features/features-table/features-table.component.ts
 create mode 100644 client/src/app/components/features/features-table/features-table.module.ts
 create mode 100644 client/src/app/components/features/features-table/features-table.query.gql
 create mode 100644 server/app/graphql/resolvers/browse_features.rb
 create mode 100644 server/app/graphql/types/browse_tables/browse_feature_type.rb
 create mode 100644 server/app/graphql/types/browse_tables/features_sort_columns.rb
 create mode 100644 server/app/graphql/types/browse_tables/features_sort_type.rb
 create mode 100644 server/app/models/materialized_views/feature_browse_table_row.rb
 create mode 100644 server/db/migrate/20231212145853_create_feature_browse_table_rows.rb
 create mode 100644 server/db/views/feature_browse_table_rows_v01.sql

diff --git a/client/src/app/components/features/features-table/features-table.component.html b/client/src/app/components/features/features-table/features-table.component.html
new file mode 100644
index 000000000..931b2fc1d
--- /dev/null
+++ b/client/src/app/components/features/features-table/features-table.component.html
@@ -0,0 +1,237 @@
+<!-- if cvcHeight not specified, render table without card height container & viewport target -->
+<ng-container *ngIf="!cvcHeight; else setHeightCard">
+  <!-- adjust nz-card's cvcAutoHeightCard to equalize padding around this table's container e.g. entity-home's nz-page-header components -->
+  <nz-card
+    [nzTitle]="titleTemplate"
+    [nzExtra]="extraTemplate"
+    nzSize="small"
+    cvcAutoHeightCard
+    cvcAutoHeightTarget="viewport">
+    <ng-template [ngTemplateOutlet]="table"> </ng-template>
+  </nz-card>
+</ng-container>
+
+<!-- if cvcHeight is specified, render table in container w/ specified height-->
+<ng-template #setHeightCard>
+  <div
+    class="card-container"
+    [ngStyle]="{ height: cvcHeight }">
+    <nz-card
+      [nzTitle]="titleTemplate"
+      [nzExtra]="extraTemplate"
+      cvcAutoHeightCard
+      nzSize="small">
+      <ng-template [ngTemplateOutlet]="table"> </ng-template>
+    </nz-card>
+  </div>
+</ng-template>
+
+<ng-template #table>
+  <!-- nzVirtualItemSize can be determined by inspecting the row element in Dev tools, and noting the height calculated in its Styles tab. this probably shouldn't change much, if at all. -->
+  <nz-table
+    #virtualTable
+    nzSize="small"
+    [nzData]="(row$ | ngrxPush) || []"
+    [nzLoading]="!(row$ | ngrxPush)"
+    [cvcAutoHeightTable]="25"
+    [nzVirtualItemSize]="29"
+    cvcTableScroll
+    (cvcTableScrollOnScroll)="scrollEvent$.next($event)"
+    [cvcTableScrollQueryRef]="queryRef"
+    [cvcTableScrollPageInfo]="pageInfo$ | ngrxPush"
+    [cvcTableScrollToIndex]="(scrollIndex$ | ngrxPush)!"
+    [nzVirtualForTrackBy]="trackByIndex"
+    [nzScroll]="{ x: '680px', y: '800px' }"
+    [nzFrontPagination]="false"
+    [nzShowPagination]="false">
+    <thead (nzSortOrderChange)="sortChange$.next($event)">
+      <tr class="col-header-row">
+        <th
+          nzWidth="150px"
+          nzLeft
+          [nzColumnKey]="sortColumns.FeatureName"
+          [nzSortFn]="true">
+          Name
+        </th>
+        <th
+          nzLeft
+          nzWidth="200px">
+          Aliases
+        </th>
+        <th nzWidth="250px">Diseases</th>
+        <th nzWidth="225px">Therapies</th>
+        <th
+          nzWidth="75px"
+          nzRight
+          nzAlign="right"
+          [nzColumnKey]="sortColumns.MolecularProfileCount"
+          [nzSortFn]="true"
+          [nzSortDirections]="['descend', 'ascend', null]"
+          nz-tooltip
+          nzTooltipTitle="Molecular Profile Count">
+          <i
+            nz-icon
+            nzType="civic-molecularprofile"></i>
+          Count
+        </th>
+        <th
+          nzWidth="75px"
+          nzRight
+          nzAlign="right"
+          [nzColumnKey]="sortColumns.VariantCount"
+          [nzSortFn]="true"
+          [nzSortDirections]="['descend', 'ascend', null]"
+          nz-tooltip
+          nzTooltipTitle="Variant Count">
+          <i
+            nz-icon
+            nzType="civic-variant"></i>
+          Count
+        </th>
+        <th
+          nzWidth="75px"
+          nzRight
+          nzAlign="right"
+          [nzColumnKey]="sortColumns.EvidenceItemCount"
+          [nzSortFn]="true"
+          [nzSortDirections]="['descend', 'ascend', null]"
+          nz-tooltip
+          nzTooltipTitle="Evidence Count">
+          <i
+            nz-icon
+            nzType="civic-evidence"></i>
+          Count
+        </th>
+        <th
+          nzWidth="75px"
+          nzRight
+          nzAlign="right"
+          [nzColumnKey]="sortColumns.AssertionCount"
+          [nzSortFn]="true"
+          [nzSortDirections]="['descend', 'ascend', null]"
+          nz-tooltip
+          nzTooltipTitle="Assertion Count">
+          <i
+            nz-icon
+            nzType="civic-assertion"></i>
+          Count
+        </th>
+      </tr>
+      <tr class="filter-row">
+        <th nzLeft>
+          <cvc-clearable-input-filter
+            [(inputModel)]="nameInput"
+            (inputModelChange)="
+              filterChange$.next()
+            "></cvc-clearable-input-filter>
+        </th>
+        <th nzLeft>
+          <cvc-clearable-input-filter
+            [(inputModel)]="aliasInput"
+            (inputModelChange)="
+              filterChange$.next()
+            "></cvc-clearable-input-filter>
+        </th>
+        <th>
+          <cvc-clearable-input-filter
+            [(inputModel)]="diseaseInput"
+            (inputModelChange)="
+              filterChange$.next()
+            "></cvc-clearable-input-filter>
+        </th>
+        <th>
+          <cvc-clearable-input-filter
+            [(inputModel)]="therapyInput"
+            (inputModelChange)="
+              filterChange$.next()
+            "></cvc-clearable-input-filter>
+        </th>
+        <th nzRight></th>
+        <th nzRight></th>
+        <th nzRight></th>
+        <th nzRight></th>
+      </tr>
+    </thead>
+    <tbody>
+      <ng-template
+        nz-virtual-scroll
+        let-feature
+        let-index="index">
+        <tr class="data-row">
+          <td nzLeft>
+            <cvc-feature-tag [feature]="feature"></cvc-feature-tag>
+          </td>
+          <td nzLeft>
+            <cvc-plain-tag-overflow
+              [tags]="feature.featureAliases"
+              [matchingText]="aliasInput"></cvc-plain-tag-overflow>
+          </td>
+          <td>
+            <cvc-tag-overflow
+              tagType="disease"
+              [maxDisplayCount]="1"
+              [tags]="feature.diseases"
+              [matchingText]="diseaseInput">
+            </cvc-tag-overflow>
+          </td>
+          <td>
+            <cvc-tag-overflow
+              tagType="therapy"
+              [maxDisplayCount]="1"
+              [tags]="feature.therapies"
+              [matchingText]="therapyInput">
+            </cvc-tag-overflow>
+          </td>
+          <td
+            nzRight
+            nzAlign="right">
+            {{ feature.molecularProfileCount }}
+          </td>
+          <td
+            nzRight
+            nzAlign="right">
+            {{ feature.variantCount }}
+          </td>
+          <td
+            nzRight
+            nzAlign="right">
+            {{ feature.evidenceItemCount }}
+          </td>
+          <td
+            nzRight
+            nzAlign="right">
+            {{ feature.assertionCount }}
+          </td>
+        </tr>
+      </ng-template>
+    </tbody>
+  </nz-table>
+</ng-template>
+
+<!-- card's title template -->
+<ng-template #titleTemplate>
+  <ng-container *ngIf="this.cvcTitleTemplate">
+    <ng-template [ngTemplateOutlet]="cvcTitleTemplate"></ng-template>
+  </ng-container>
+  <ng-container *ngIf="this.cvcTitle">
+    {{ this.cvcTitle }}
+  </ng-container>
+  <span class="table-info">
+    <cvc-table-counts
+      [cvcTableCountsConnection]="connection$"></cvc-table-counts>
+  </span>
+</ng-template>
+
+<!-- card's extra template -->
+<ng-template #extraTemplate>
+  <nz-tag
+    *ngIf="moreLoading$ | ngrxPush"
+    nzColor="processing">
+    <i
+      nz-icon
+      nzType="sync"
+      nzSpin></i>
+    <span>Loading…</span>
+  </nz-tag>
+  <cvc-no-more-rows [cvcShowTag]="noMoreRows$ | ngrxPush"></cvc-no-more-rows>
+</ng-template>
diff --git a/client/src/app/components/features/features-table/features-table.component.less b/client/src/app/components/features/features-table/features-table.component.less
new file mode 100644
index 000000000..cf33193fb
--- /dev/null
+++ b/client/src/app/components/features/features-table/features-table.component.less
@@ -0,0 +1,5 @@
+@import "themes/overrides/card-table.overrides.less";
+
+:host {
+  display: block;
+}
diff --git a/client/src/app/components/features/features-table/features-table.component.ts b/client/src/app/components/features/features-table/features-table.component.ts
new file mode 100644
index 000000000..d30fd9522
--- /dev/null
+++ b/client/src/app/components/features/features-table/features-table.component.ts
@@ -0,0 +1,208 @@
+import {
+  ChangeDetectionStrategy,
+  ChangeDetectorRef,
+  Component,
+  Input,
+  OnInit,
+  TemplateRef,
+} from '@angular/core'
+import { ApolloQueryResult } from '@apollo/client/core'
+import {
+  buildSortParams,
+  SortDirectionEvent,
+} from '@app/core/utilities/datatable-helpers'
+import { ScrollEvent } from '@app/directives/table-scroll/table-scroll.directive'
+import {
+  BrowseFeatureConnection,
+  BrowseFeaturesFieldsFragment,
+  BrowseFeaturesGQL,
+  BrowseFeaturesQuery,
+  BrowseFeaturesQueryVariables,
+  FeaturesSortColumns,
+  Maybe,
+  PageInfo,
+} from '@app/generated/civic.apollo'
+import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy'
+import { QueryRef } from 'apollo-angular'
+import { BehaviorSubject, Observable, Subject } from 'rxjs'
+import { isNonNulled } from 'rxjs-etc'
+import {
+  takeWhile,
+  debounceTime,
+  distinctUntilChanged,
+  filter,
+  map,
+  skip,
+  take,
+  withLatestFrom,
+} from 'rxjs/operators'
+import { pluck } from 'rxjs-etc/operators'
+
+export interface BrowseFeaturesTableUserFilters {
+  diseaseInput?: Maybe<string>
+  therapyInput?: Maybe<string>
+  nameInput?: Maybe<string>
+  aliasInput?: Maybe<string>
+}
+
+@UntilDestroy()
+@Component({
+  selector: 'cvc-features-table',
+  templateUrl: './features-table.component.html',
+  styleUrls: ['./features-table.component.less'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class CvcFeaturesTableComponent implements OnInit {
+  @Input() cvcHeight?: number
+  @Input() cvcTitleTemplate: Maybe<TemplateRef<void>>
+  @Input() cvcTitle: Maybe<string>
+  @Input() initialPageSize: number = 35
+  @Input()
+  set initialUserFilters(f: Maybe<BrowseFeaturesTableUserFilters>) {
+    // assign any attributes in filters object to this class
+    if (f) Object.assign(this, f)
+  }
+
+  // SOURCE STREAMS
+  scrollEvent$: BehaviorSubject<ScrollEvent>
+  sortChange$: Subject<SortDirectionEvent>
+  filterChange$: Subject<void>
+
+  // INTERMEDIATE STREAMS
+  queryRef!: QueryRef<BrowseFeaturesQuery, BrowseFeaturesQueryVariables>
+  result$!: Observable<ApolloQueryResult<BrowseFeaturesQuery>>
+  connection$!: Observable<BrowseFeatureConnection>
+  pageInfo$!: Observable<PageInfo>
+
+  // PRESENTATION STREAMS
+  initialLoading$!: Observable<boolean>
+  moreLoading$!: Observable<boolean>
+  row$!: Observable<Maybe<BrowseFeaturesFieldsFragment>[]>
+  scrollIndex$: Subject<number>
+  noMoreRows$: BehaviorSubject<boolean>
+
+  // need a static var for scrolling state b/c sub/unsub in
+  // virtual scroll rows degrades performance
+  isScrolling: boolean = false
+
+  // filters
+  diseaseInput: Maybe<string>
+  therapyInput: Maybe<string>
+  nameInput: Maybe<string>
+  aliasInput: Maybe<string>
+
+  sortColumns: typeof FeaturesSortColumns = FeaturesSortColumns
+
+  private debouncedQuery = new Subject<void>()
+  constructor(private query: BrowseFeaturesGQL, private cdr: ChangeDetectorRef) {
+    this.noMoreRows$ = new BehaviorSubject<boolean>(false)
+    this.scrollEvent$ = new BehaviorSubject<ScrollEvent>('stop')
+    this.sortChange$ = new Subject<SortDirectionEvent>()
+    this.filterChange$ = new Subject<void>()
+    this.scrollIndex$ = new Subject<number>()
+  }
+
+  ngOnInit() {
+    this.queryRef = this.query.watch({ first: this.initialPageSize })
+
+    this.result$ = this.queryRef.valueChanges
+
+    // toggles table overlay 'Loading...' spinner
+    this.initialLoading$ = this.result$.pipe(
+      pluck('loading'),
+      distinctUntilChanged(),
+      takeWhile((l) => l !== false, true)
+    ) // only activate on 1st true/false sequence
+
+    // toggles table header 'Loading...' tag
+    this.moreLoading$ = this.result$.pipe(
+      pluck('loading'),
+      distinctUntilChanged(),
+      skip(2)
+    ) // skip 1st true/false sequence
+
+    this.connection$ = this.result$.pipe(
+      pluck('data', 'browseFeatures'),
+      filter(isNonNulled)
+    ) as Observable<BrowseFeatureConnection>
+
+    this.row$ = this.connection$.pipe(
+      pluck('edges'),
+      filter(isNonNulled),
+      map((edges) => edges.map((e) => e.node))
+    )
+
+    // provided to table-scroll directive for fetchMore queries
+    this.pageInfo$ = this.connection$.pipe(
+      pluck('pageInfo'),
+      filter(isNonNulled)
+    )
+
+    // refetch when column sort changes
+    this.sortChange$
+      .pipe(untilDestroyed(this))
+      .subscribe((e: SortDirectionEvent) => {
+        this.queryRef.refetch({ sortBy: buildSortParams(e) })
+      })
+
+    // refresh when filters change
+    this.filterChange$
+      .pipe(debounceTime(500), untilDestroyed(this))
+      .subscribe(() => {
+        this.refresh()
+      })
+
+    // for every onScrolled event, convert to bool & set isScrolling
+    this.scrollEvent$
+      .pipe(
+        map((e: ScrollEvent) => (e === 'stop' ? false : true)),
+        distinctUntilChanged(),
+        untilDestroyed(this)
+      )
+      .subscribe((e) => {
+        this.isScrolling = e
+        this.cdr.detectChanges()
+      })
+
+    // emit event from noMoreRow$ if hasNextPage false
+    this.scrollEvent$
+      .pipe(
+        filter((e) => e === 'bottom'),
+        withLatestFrom(this.pageInfo$),
+        map(([_, pageInfo]: [ScrollEvent, PageInfo]) => pageInfo),
+        untilDestroyed(this)
+      )
+      .subscribe((pageInfo: PageInfo) => {
+        if (!pageInfo.hasNextPage) {
+          this.noMoreRows$.next(true)
+          this.cdr.detectChanges()
+
+          // need to send a followup 'false' here or else
+          // ng won't interpret subsequent 'true' events as changes
+          setInterval(() => this.noMoreRows$.next(false))
+        }
+      })
+  } // ngOnInit()
+
+  refresh() {
+    this.queryRef
+      .refetch({
+        featureName: this.nameInput,
+        featureAlias: this.aliasInput,
+        diseaseName: this.diseaseInput,
+        therapyName: this.therapyInput,
+      })
+      .then(() => this.scrollIndex$.next(0))
+
+    this.cdr.detectChanges()
+  }
+
+  onModelUpdated(_: Maybe<string>) {
+    this.debouncedQuery.next()
+  }
+
+  // virtual scroll helpers
+  trackByIndex(_: number, data: Maybe<BrowseFeaturesFieldsFragment>): Maybe<number> {
+    return data?.id
+  }
+}
diff --git a/client/src/app/components/features/features-table/features-table.module.ts b/client/src/app/components/features/features-table/features-table.module.ts
new file mode 100644
index 000000000..9d97c3ad2
--- /dev/null
+++ b/client/src/app/components/features/features-table/features-table.module.ts
@@ -0,0 +1,57 @@
+import { CommonModule } from '@angular/common'
+import { NgModule } from '@angular/core'
+import { FormsModule } from '@angular/forms'
+import { CvcClearableInputFilterModule } from '@app/components/shared/clearable-input-filter/clearable-input-filter.module'
+import { CvcNoMoreRowsModule } from '@app/components/shared/no-more-rows/no-more-rows.module'
+import { CvcPlainTagOverflowModule } from '@app/components/shared/plain-tag-overflow/plain-tag-overflow.module'
+import { CvcTableCountsModule } from '@app/components/shared/table-counts/table-counts.module'
+import { CvcTagOverflowModule } from '@app/components/shared/tag-overflow/tag-overflow.module'
+import { CvcPipesModule } from '@app/core/pipes/pipes.module'
+import { CvcAutoHeightCardModule } from '@app/directives/auto-height-card/auto-height-card.module'
+import { CvcAutoHeightTableModule } from '@app/directives/auto-height-table/auto-height-table.module'
+import { CvcTableScrollModule } from '@app/directives/table-scroll/table-scroll.module'
+import { LetDirective, PushPipe } from '@ngrx/component'
+import { NzButtonModule } from 'ng-zorro-antd/button'
+import { NzCardModule } from 'ng-zorro-antd/card'
+import { NzFormModule } from 'ng-zorro-antd/form'
+import { NzIconModule } from 'ng-zorro-antd/icon'
+import { NzInputModule } from 'ng-zorro-antd/input'
+import { NzTableModule } from 'ng-zorro-antd/table'
+import { NzTagModule } from 'ng-zorro-antd/tag'
+import { NzToolTipModule } from 'ng-zorro-antd/tooltip'
+import { NzTypographyModule } from 'ng-zorro-antd/typography'
+import { CvcFeatureTagModule } from '../feature-tag/feature-tag.module'
+import { CvcFeaturesTableComponent } from './features-table.component'
+
+@NgModule({
+  declarations: [CvcFeaturesTableComponent],
+  imports: [
+    CommonModule,
+    FormsModule,
+    LetDirective,
+    PushPipe,
+
+    NzButtonModule,
+    NzCardModule,
+    NzFormModule,
+    NzIconModule,
+    NzInputModule,
+    NzTableModule,
+    NzTagModule,
+    NzToolTipModule,
+    NzTypographyModule,
+
+    CvcAutoHeightCardModule,
+    CvcAutoHeightTableModule,
+    CvcClearableInputFilterModule,
+    CvcFeatureTagModule,
+    CvcNoMoreRowsModule,
+    CvcPlainTagOverflowModule,
+    CvcPipesModule,
+    CvcTableCountsModule,
+    CvcTableScrollModule,
+    CvcTagOverflowModule,
+  ],
+  exports: [CvcFeaturesTableComponent],
+})
+export class CvcFeaturesTableModule {}
diff --git a/client/src/app/components/features/features-table/features-table.query.gql b/client/src/app/components/features/features-table/features-table.query.gql
new file mode 100644
index 000000000..9d52d5a61
--- /dev/null
+++ b/client/src/app/components/features/features-table/features-table.query.gql
@@ -0,0 +1,62 @@
+query BrowseFeatures(
+  $featureName: String
+  $therapyName: String
+  $featureAlias: String
+  $diseaseName: String
+  $sortBy: FeaturesSort
+  $first: Int
+  $last: Int
+  $before: String
+  $after: String
+) {
+  browseFeatures(
+    featureName: $featureName
+    therapyName: $therapyName
+    featureAlias: $featureAlias
+    diseaseName: $diseaseName
+    sortBy: $sortBy
+    first: $first
+    last: $last
+    before: $before
+    after: $after
+  ) {
+    edges {
+      cursor
+      node {
+        ...BrowseFeaturesFields
+      }
+    }
+    pageInfo {
+      startCursor
+      endCursor
+      hasPreviousPage
+      hasNextPage
+    }
+    lastUpdated
+    totalCount
+    filteredCount
+    pageCount
+  }
+}
+
+fragment BrowseFeaturesFields on BrowseFeature {
+  id
+  name
+  link
+  #flagged
+  featureAliases
+  diseases {
+    name
+    id
+    link
+  }
+  therapies {
+    name
+    id
+    link
+  }
+  variantCount
+  evidenceItemCount
+  assertionCount
+  molecularProfileCount
+}
diff --git a/client/src/app/generated/civic.apollo-helpers.ts b/client/src/app/generated/civic.apollo-helpers.ts
index fc2c6c6bf..85142b881 100644
--- a/client/src/app/generated/civic.apollo-helpers.ts
+++ b/client/src/app/generated/civic.apollo-helpers.ts
@@ -188,6 +188,37 @@ export type BrowseDiseaseEdgeFieldPolicy = {
 	cursor?: FieldPolicy<any> | FieldReadFunction<any>,
 	node?: FieldPolicy<any> | FieldReadFunction<any>
 };
+export type BrowseFeatureKeySpecifier = ('assertionCount' | 'description' | 'diseases' | 'evidenceItemCount' | 'featureAliases' | 'flagged' | 'flags' | 'id' | 'link' | 'molecularProfileCount' | 'name' | 'therapies' | 'variantCount' | BrowseFeatureKeySpecifier)[];
+export type BrowseFeatureFieldPolicy = {
+	assertionCount?: FieldPolicy<any> | FieldReadFunction<any>,
+	description?: FieldPolicy<any> | FieldReadFunction<any>,
+	diseases?: FieldPolicy<any> | FieldReadFunction<any>,
+	evidenceItemCount?: FieldPolicy<any> | FieldReadFunction<any>,
+	featureAliases?: FieldPolicy<any> | FieldReadFunction<any>,
+	flagged?: FieldPolicy<any> | FieldReadFunction<any>,
+	flags?: FieldPolicy<any> | FieldReadFunction<any>,
+	id?: FieldPolicy<any> | FieldReadFunction<any>,
+	link?: FieldPolicy<any> | FieldReadFunction<any>,
+	molecularProfileCount?: FieldPolicy<any> | FieldReadFunction<any>,
+	name?: FieldPolicy<any> | FieldReadFunction<any>,
+	therapies?: FieldPolicy<any> | FieldReadFunction<any>,
+	variantCount?: FieldPolicy<any> | FieldReadFunction<any>
+};
+export type BrowseFeatureConnectionKeySpecifier = ('edges' | 'filteredCount' | 'lastUpdated' | 'nodes' | 'pageCount' | 'pageInfo' | 'totalCount' | BrowseFeatureConnectionKeySpecifier)[];
+export type BrowseFeatureConnectionFieldPolicy = {
+	edges?: FieldPolicy<any> | FieldReadFunction<any>,
+	filteredCount?: FieldPolicy<any> | FieldReadFunction<any>,
+	lastUpdated?: FieldPolicy<any> | FieldReadFunction<any>,
+	nodes?: FieldPolicy<any> | FieldReadFunction<any>,
+	pageCount?: FieldPolicy<any> | FieldReadFunction<any>,
+	pageInfo?: FieldPolicy<any> | FieldReadFunction<any>,
+	totalCount?: FieldPolicy<any> | FieldReadFunction<any>
+};
+export type BrowseFeatureEdgeKeySpecifier = ('cursor' | 'node' | BrowseFeatureEdgeKeySpecifier)[];
+export type BrowseFeatureEdgeFieldPolicy = {
+	cursor?: FieldPolicy<any> | FieldReadFunction<any>,
+	node?: FieldPolicy<any> | FieldReadFunction<any>
+};
 export type BrowseGeneKeySpecifier = ('assertionCount' | 'description' | 'diseases' | 'entrezId' | 'evidenceItemCount' | 'flagged' | 'flags' | 'geneAliases' | 'id' | 'link' | 'molecularProfileCount' | 'name' | 'therapies' | 'variantCount' | BrowseGeneKeySpecifier)[];
 export type BrowseGeneFieldPolicy = {
 	assertionCount?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -1359,7 +1390,7 @@ export type PhenotypePopoverFieldPolicy = {
 	name?: FieldPolicy<any> | FieldReadFunction<any>,
 	url?: FieldPolicy<any> | FieldReadFunction<any>
 };
-export type QueryKeySpecifier = ('acmgCode' | 'acmgCodesTypeahead' | 'activities' | 'activity' | 'assertion' | 'assertions' | 'browseDiseases' | 'browseGenes' | 'browseMolecularProfiles' | 'browseSources' | 'browseVariantGroups' | 'browseVariants' | 'clingenCode' | 'clingenCodesTypeahead' | 'clinicalTrial' | 'clinicalTrials' | 'comment' | 'comments' | 'contributors' | 'countries' | 'dataReleases' | 'disease' | 'diseasePopover' | 'diseaseTypeahead' | 'entityTypeahead' | 'events' | 'evidenceItem' | 'evidenceItems' | 'feature' | 'flag' | 'flags' | 'gene' | 'geneTypeahead' | 'genes' | 'molecularProfile' | 'molecularProfiles' | 'nccnGuideline' | 'nccnGuidelinesTypeahead' | 'notifications' | 'organization' | 'organizationLeaderboards' | 'organizations' | 'phenotype' | 'phenotypePopover' | 'phenotypeTypeahead' | 'phenotypes' | 'previewCommentText' | 'previewMolecularProfileName' | 'remoteCitation' | 'revision' | 'revisions' | 'search' | 'searchByPermalink' | 'searchGenes' | 'source' | 'sourcePopover' | 'sourceSuggestionValues' | 'sourceSuggestions' | 'sourceTypeahead' | 'subscriptionForEntity' | 'therapies' | 'therapy' | 'therapyPopover' | 'therapyTypeahead' | 'timepointStats' | 'user' | 'userLeaderboards' | 'userTypeahead' | 'users' | 'validateRevisionsForAcceptance' | 'variant' | 'variantGroup' | 'variantGroups' | 'variantType' | 'variantTypePopover' | 'variantTypeTypeahead' | 'variantTypes' | 'variants' | 'viewer' | QueryKeySpecifier)[];
+export type QueryKeySpecifier = ('acmgCode' | 'acmgCodesTypeahead' | 'activities' | 'activity' | 'assertion' | 'assertions' | 'browseDiseases' | 'browseFeatures' | 'browseGenes' | 'browseMolecularProfiles' | 'browseSources' | 'browseVariantGroups' | 'browseVariants' | 'clingenCode' | 'clingenCodesTypeahead' | 'clinicalTrial' | 'clinicalTrials' | 'comment' | 'comments' | 'contributors' | 'countries' | 'dataReleases' | 'disease' | 'diseasePopover' | 'diseaseTypeahead' | 'entityTypeahead' | 'events' | 'evidenceItem' | 'evidenceItems' | 'feature' | 'flag' | 'flags' | 'gene' | 'geneTypeahead' | 'genes' | 'molecularProfile' | 'molecularProfiles' | 'nccnGuideline' | 'nccnGuidelinesTypeahead' | 'notifications' | 'organization' | 'organizationLeaderboards' | 'organizations' | 'phenotype' | 'phenotypePopover' | 'phenotypeTypeahead' | 'phenotypes' | 'previewCommentText' | 'previewMolecularProfileName' | 'remoteCitation' | 'revision' | 'revisions' | 'search' | 'searchByPermalink' | 'searchGenes' | 'source' | 'sourcePopover' | 'sourceSuggestionValues' | 'sourceSuggestions' | 'sourceTypeahead' | 'subscriptionForEntity' | 'therapies' | 'therapy' | 'therapyPopover' | 'therapyTypeahead' | 'timepointStats' | 'user' | 'userLeaderboards' | 'userTypeahead' | 'users' | 'validateRevisionsForAcceptance' | 'variant' | 'variantGroup' | 'variantGroups' | 'variantType' | 'variantTypePopover' | 'variantTypeTypeahead' | 'variantTypes' | 'variants' | 'viewer' | QueryKeySpecifier)[];
 export type QueryFieldPolicy = {
 	acmgCode?: FieldPolicy<any> | FieldReadFunction<any>,
 	acmgCodesTypeahead?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -1368,6 +1399,7 @@ export type QueryFieldPolicy = {
 	assertion?: FieldPolicy<any> | FieldReadFunction<any>,
 	assertions?: FieldPolicy<any> | FieldReadFunction<any>,
 	browseDiseases?: FieldPolicy<any> | FieldReadFunction<any>,
+	browseFeatures?: FieldPolicy<any> | FieldReadFunction<any>,
 	browseGenes?: FieldPolicy<any> | FieldReadFunction<any>,
 	browseMolecularProfiles?: FieldPolicy<any> | FieldReadFunction<any>,
 	browseSources?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -2098,6 +2130,18 @@ export type StrictTypedTypePolicies = {
 		keyFields?: false | BrowseDiseaseEdgeKeySpecifier | (() => undefined | BrowseDiseaseEdgeKeySpecifier),
 		fields?: BrowseDiseaseEdgeFieldPolicy,
 	},
+	BrowseFeature?: Omit<TypePolicy, "fields" | "keyFields"> & {
+		keyFields?: false | BrowseFeatureKeySpecifier | (() => undefined | BrowseFeatureKeySpecifier),
+		fields?: BrowseFeatureFieldPolicy,
+	},
+	BrowseFeatureConnection?: Omit<TypePolicy, "fields" | "keyFields"> & {
+		keyFields?: false | BrowseFeatureConnectionKeySpecifier | (() => undefined | BrowseFeatureConnectionKeySpecifier),
+		fields?: BrowseFeatureConnectionFieldPolicy,
+	},
+	BrowseFeatureEdge?: Omit<TypePolicy, "fields" | "keyFields"> & {
+		keyFields?: false | BrowseFeatureEdgeKeySpecifier | (() => undefined | BrowseFeatureEdgeKeySpecifier),
+		fields?: BrowseFeatureEdgeFieldPolicy,
+	},
 	BrowseGene?: Omit<TypePolicy, "fields" | "keyFields"> & {
 		keyFields?: false | BrowseGeneKeySpecifier | (() => undefined | BrowseGeneKeySpecifier),
 		fields?: BrowseGeneFieldPolicy,
diff --git a/client/src/app/generated/civic.apollo.ts b/client/src/app/generated/civic.apollo.ts
index bad21f40b..aa2448c13 100644
--- a/client/src/app/generated/civic.apollo.ts
+++ b/client/src/app/generated/civic.apollo.ts
@@ -528,6 +528,64 @@ export type BrowseDiseaseEdge = {
   node?: Maybe<BrowseDisease>;
 };
 
+export type BrowseFeature = Flaggable & {
+  __typename: 'BrowseFeature';
+  assertionCount: Scalars['Int'];
+  description: Scalars['String'];
+  diseases?: Maybe<Array<Disease>>;
+  evidenceItemCount: Scalars['Int'];
+  featureAliases?: Maybe<Array<Scalars['String']>>;
+  flagged: Scalars['Boolean'];
+  /** List and filter flags. */
+  flags: FlagConnection;
+  id: Scalars['Int'];
+  link: Scalars['String'];
+  molecularProfileCount: Scalars['Int'];
+  name: Scalars['String'];
+  therapies?: Maybe<Array<Therapy>>;
+  variantCount: Scalars['Int'];
+};
+
+
+export type BrowseFeatureFlagsArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  first?: InputMaybe<Scalars['Int']>;
+  flaggingUserId?: InputMaybe<Scalars['Int']>;
+  last?: InputMaybe<Scalars['Int']>;
+  resolvingUserId?: InputMaybe<Scalars['Int']>;
+  sortBy?: InputMaybe<DateSort>;
+  state?: InputMaybe<FlagState>;
+};
+
+/** The connection type for BrowseFeature. */
+export type BrowseFeatureConnection = {
+  __typename: 'BrowseFeatureConnection';
+  /** A list of edges. */
+  edges: Array<BrowseFeatureEdge>;
+  /** The total number of records in this set. */
+  filteredCount: Scalars['Int'];
+  /** The last time the data in this browse table was refreshed */
+  lastUpdated: Scalars['ISO8601DateTime'];
+  /** A list of nodes. */
+  nodes: Array<BrowseFeature>;
+  /** Total number of pages, based on filtered count and pagesize. */
+  pageCount: Scalars['Int'];
+  /** Information to aid in pagination. */
+  pageInfo: PageInfo;
+  /** The total number of records of this type, regardless of any filtering. */
+  totalCount: Scalars['Int'];
+};
+
+/** An edge in a connection. */
+export type BrowseFeatureEdge = {
+  __typename: 'BrowseFeatureEdge';
+  /** A cursor for use in pagination. */
+  cursor: Scalars['String'];
+  /** The item at the end of the edge. */
+  node?: Maybe<BrowseFeature>;
+};
+
 export type BrowseGene = Flaggable & {
   __typename: 'BrowseGene';
   assertionCount: Scalars['Int'];
@@ -1803,6 +1861,24 @@ export type FeatureInterfaceVariantsArgs = {
   name?: InputMaybe<Scalars['String']>;
 };
 
+export type FeaturesSort = {
+  /** Available columns for sorting */
+  column: FeaturesSortColumns;
+  /** Sort direction */
+  direction: SortDirection;
+};
+
+export enum FeaturesSortColumns {
+  AssertionCount = 'assertionCount',
+  DiseaseName = 'diseaseName',
+  EvidenceItemCount = 'evidenceItemCount',
+  FeatureAlias = 'featureAlias',
+  FeatureName = 'featureName',
+  MolecularProfileCount = 'molecularProfileCount',
+  TherapyName = 'therapyName',
+  VariantCount = 'variantCount'
+}
+
 export type FieldName = {
   __typename: 'FieldName';
   /** The user facing representation of the field name. */
@@ -3379,6 +3455,7 @@ export type Query = {
   /** List and filter assertions. */
   assertions: AssertionConnection;
   browseDiseases: BrowseDiseaseConnection;
+  browseFeatures: BrowseFeatureConnection;
   browseGenes: BrowseGeneConnection;
   browseMolecularProfiles: BrowseMolecularProfileConnection;
   browseSources: BrowseSourceConnection;
@@ -3577,6 +3654,19 @@ export type QueryBrowseDiseasesArgs = {
 };
 
 
+export type QueryBrowseFeaturesArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  diseaseName?: InputMaybe<Scalars['String']>;
+  featureAlias?: InputMaybe<Scalars['String']>;
+  featureName?: InputMaybe<Scalars['String']>;
+  first?: InputMaybe<Scalars['Int']>;
+  last?: InputMaybe<Scalars['Int']>;
+  sortBy?: InputMaybe<FeaturesSort>;
+  therapyName?: InputMaybe<Scalars['String']>;
+};
+
+
 export type QueryBrowseGenesArgs = {
   after?: InputMaybe<Scalars['String']>;
   before?: InputMaybe<Scalars['String']>;
@@ -6144,6 +6234,23 @@ export type FeaturePopoverQuery = { __typename: 'Query', feature?: { __typename:
 
 export type FeaturePopoverFragment = { __typename: 'Gene', officialName: string, id: number, name: string, featureAliases: Array<string>, variants: { __typename: 'VariantConnection', totalCount: number } };
 
+export type BrowseFeaturesQueryVariables = Exact<{
+  featureName?: InputMaybe<Scalars['String']>;
+  therapyName?: InputMaybe<Scalars['String']>;
+  featureAlias?: InputMaybe<Scalars['String']>;
+  diseaseName?: InputMaybe<Scalars['String']>;
+  sortBy?: InputMaybe<FeaturesSort>;
+  first?: InputMaybe<Scalars['Int']>;
+  last?: InputMaybe<Scalars['Int']>;
+  before?: InputMaybe<Scalars['String']>;
+  after?: InputMaybe<Scalars['String']>;
+}>;
+
+
+export type BrowseFeaturesQuery = { __typename: 'Query', browseFeatures: { __typename: 'BrowseFeatureConnection', lastUpdated: any, totalCount: number, filteredCount: number, pageCount: number, edges: Array<{ __typename: 'BrowseFeatureEdge', cursor: string, node?: { __typename: 'BrowseFeature', id: number, name: string, link: string, featureAliases?: Array<string> | undefined, variantCount: number, evidenceItemCount: number, assertionCount: number, molecularProfileCount: number, diseases?: Array<{ __typename: 'Disease', name: string, id: number, link: string }> | undefined, therapies?: Array<{ __typename: 'Therapy', name: string, id: number, link: string }> | undefined } | undefined }>, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasPreviousPage: boolean, hasNextPage: boolean } } };
+
+export type BrowseFeaturesFieldsFragment = { __typename: 'BrowseFeature', id: number, name: string, link: string, featureAliases?: Array<string> | undefined, variantCount: number, evidenceItemCount: number, assertionCount: number, molecularProfileCount: number, diseases?: Array<{ __typename: 'Disease', name: string, id: number, link: string }> | undefined, therapies?: Array<{ __typename: 'Therapy', name: string, id: number, link: string }> | undefined };
+
 export type FlagListQueryVariables = Exact<{
   flaggable?: InputMaybe<FlaggableInput>;
   flaggingUserId?: InputMaybe<Scalars['Int']>;
@@ -6157,20 +6264,20 @@ export type FlagListQueryVariables = Exact<{
 }>;
 
 
-export type FlagListQuery = { __typename: 'Query', flags: { __typename: 'FlagConnection', totalCount: number, unfilteredCountForSubject?: number | undefined, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, uniqueFlaggingUsers: Array<{ __typename: 'User', username: string, id: number, profileImagePath?: string | undefined }>, uniqueResolvingUsers?: Array<{ __typename: 'User', username: string, id: number, profileImagePath?: string | undefined }> | undefined, edges: Array<{ __typename: 'FlagEdge', node?: { __typename: 'Flag', id: number, state: FlagState, flaggable: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'BrowseGene', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | { __typename: 'VariantGroup', id: number, name: string, link: string }, openActivity: { __typename: 'FlagEntityActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } }, resolutionActivity?: { __typename: 'ResolveFlagActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined } | undefined }> } };
+export type FlagListQuery = { __typename: 'Query', flags: { __typename: 'FlagConnection', totalCount: number, unfilteredCountForSubject?: number | undefined, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, uniqueFlaggingUsers: Array<{ __typename: 'User', username: string, id: number, profileImagePath?: string | undefined }>, uniqueResolvingUsers?: Array<{ __typename: 'User', username: string, id: number, profileImagePath?: string | undefined }> | undefined, edges: Array<{ __typename: 'FlagEdge', node?: { __typename: 'Flag', id: number, state: FlagState, flaggable: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'BrowseFeature', id: number, name: string, link: string } | { __typename: 'BrowseGene', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | { __typename: 'VariantGroup', id: number, name: string, link: string }, openActivity: { __typename: 'FlagEntityActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } }, resolutionActivity?: { __typename: 'ResolveFlagActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined } | undefined }> } };
 
-export type FlagListFragment = { __typename: 'FlagConnection', totalCount: number, unfilteredCountForSubject?: number | undefined, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, uniqueFlaggingUsers: Array<{ __typename: 'User', username: string, id: number, profileImagePath?: string | undefined }>, uniqueResolvingUsers?: Array<{ __typename: 'User', username: string, id: number, profileImagePath?: string | undefined }> | undefined, edges: Array<{ __typename: 'FlagEdge', node?: { __typename: 'Flag', id: number, state: FlagState, flaggable: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'BrowseGene', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | { __typename: 'VariantGroup', id: number, name: string, link: string }, openActivity: { __typename: 'FlagEntityActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } }, resolutionActivity?: { __typename: 'ResolveFlagActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined } | undefined }> };
+export type FlagListFragment = { __typename: 'FlagConnection', totalCount: number, unfilteredCountForSubject?: number | undefined, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, uniqueFlaggingUsers: Array<{ __typename: 'User', username: string, id: number, profileImagePath?: string | undefined }>, uniqueResolvingUsers?: Array<{ __typename: 'User', username: string, id: number, profileImagePath?: string | undefined }> | undefined, edges: Array<{ __typename: 'FlagEdge', node?: { __typename: 'Flag', id: number, state: FlagState, flaggable: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'BrowseFeature', id: number, name: string, link: string } | { __typename: 'BrowseGene', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | { __typename: 'VariantGroup', id: number, name: string, link: string }, openActivity: { __typename: 'FlagEntityActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } }, resolutionActivity?: { __typename: 'ResolveFlagActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined } | undefined }> };
 
-export type FlagFragment = { __typename: 'Flag', id: number, state: FlagState, flaggable: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'BrowseGene', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | { __typename: 'VariantGroup', id: number, name: string, link: string }, openActivity: { __typename: 'FlagEntityActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } }, resolutionActivity?: { __typename: 'ResolveFlagActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined };
+export type FlagFragment = { __typename: 'Flag', id: number, state: FlagState, flaggable: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'BrowseFeature', id: number, name: string, link: string } | { __typename: 'BrowseGene', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | { __typename: 'VariantGroup', id: number, name: string, link: string }, openActivity: { __typename: 'FlagEntityActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } }, resolutionActivity?: { __typename: 'ResolveFlagActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined };
 
 export type FlagPopoverQueryVariables = Exact<{
   flagId: Scalars['Int'];
 }>;
 
 
-export type FlagPopoverQuery = { __typename: 'Query', flag?: { __typename: 'Flag', id: number, name: string, state: FlagState, createdAt: any, flaggingUser: { __typename: 'User', id: number, displayName: string, role: UserRole }, flaggable: { __typename: 'Assertion', id: number, link: string, name: string } | { __typename: 'BrowseGene', id: number, link: string, name: string } | { __typename: 'EvidenceItem', id: number, link: string, name: string } | { __typename: 'Gene', id: number, link: string, name: string } | { __typename: 'MolecularProfile', id: number, link: string, name: string } | { __typename: 'Variant', id: number, link: string, name: string } | { __typename: 'VariantGroup', id: number, link: string, name: string }, openActivity: { __typename: 'FlagEntityActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } } | undefined };
+export type FlagPopoverQuery = { __typename: 'Query', flag?: { __typename: 'Flag', id: number, name: string, state: FlagState, createdAt: any, flaggingUser: { __typename: 'User', id: number, displayName: string, role: UserRole }, flaggable: { __typename: 'Assertion', id: number, link: string, name: string } | { __typename: 'BrowseFeature', id: number, link: string, name: string } | { __typename: 'BrowseGene', id: number, link: string, name: string } | { __typename: 'EvidenceItem', id: number, link: string, name: string } | { __typename: 'Gene', id: number, link: string, name: string } | { __typename: 'MolecularProfile', id: number, link: string, name: string } | { __typename: 'Variant', id: number, link: string, name: string } | { __typename: 'VariantGroup', id: number, link: string, name: string }, openActivity: { __typename: 'FlagEntityActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } } | undefined };
 
-export type FlagPopoverFragment = { __typename: 'Flag', id: number, name: string, state: FlagState, createdAt: any, flaggingUser: { __typename: 'User', id: number, displayName: string, role: UserRole }, flaggable: { __typename: 'Assertion', id: number, link: string, name: string } | { __typename: 'BrowseGene', id: number, link: string, name: string } | { __typename: 'EvidenceItem', id: number, link: string, name: string } | { __typename: 'Gene', id: number, link: string, name: string } | { __typename: 'MolecularProfile', id: number, link: string, name: string } | { __typename: 'Variant', id: number, link: string, name: string } | { __typename: 'VariantGroup', id: number, link: string, name: string }, openActivity: { __typename: 'FlagEntityActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } };
+export type FlagPopoverFragment = { __typename: 'Flag', id: number, name: string, state: FlagState, createdAt: any, flaggingUser: { __typename: 'User', id: number, displayName: string, role: UserRole }, flaggable: { __typename: 'Assertion', id: number, link: string, name: string } | { __typename: 'BrowseFeature', id: number, link: string, name: string } | { __typename: 'BrowseGene', id: number, link: string, name: string } | { __typename: 'EvidenceItem', id: number, link: string, name: string } | { __typename: 'Gene', id: number, link: string, name: string } | { __typename: 'MolecularProfile', id: number, link: string, name: string } | { __typename: 'Variant', id: number, link: string, name: string } | { __typename: 'VariantGroup', id: number, link: string, name: string }, openActivity: { __typename: 'FlagEntityActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } };
 
 export type GenePopoverQueryVariables = Exact<{
   geneId: Scalars['Int'];
@@ -8158,6 +8265,28 @@ export const FeaturePopoverFragmentDoc = gql`
   }
 }
     `;
+export const BrowseFeaturesFieldsFragmentDoc = gql`
+    fragment BrowseFeaturesFields on BrowseFeature {
+  id
+  name
+  link
+  featureAliases
+  diseases {
+    name
+    id
+    link
+  }
+  therapies {
+    name
+    id
+    link
+  }
+  variantCount
+  evidenceItemCount
+  assertionCount
+  molecularProfileCount
+}
+    `;
 export const FlagFragmentDoc = gql`
     fragment flag on Flag {
   id
@@ -10883,6 +11012,49 @@ export const FeaturePopoverDocument = gql`
   export class FeaturePopoverGQL extends Apollo.Query<FeaturePopoverQuery, FeaturePopoverQueryVariables> {
     document = FeaturePopoverDocument;
     
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
+export const BrowseFeaturesDocument = gql`
+    query BrowseFeatures($featureName: String, $therapyName: String, $featureAlias: String, $diseaseName: String, $sortBy: FeaturesSort, $first: Int, $last: Int, $before: String, $after: String) {
+  browseFeatures(
+    featureName: $featureName
+    therapyName: $therapyName
+    featureAlias: $featureAlias
+    diseaseName: $diseaseName
+    sortBy: $sortBy
+    first: $first
+    last: $last
+    before: $before
+    after: $after
+  ) {
+    edges {
+      cursor
+      node {
+        ...BrowseFeaturesFields
+      }
+    }
+    pageInfo {
+      startCursor
+      endCursor
+      hasPreviousPage
+      hasNextPage
+    }
+    lastUpdated
+    totalCount
+    filteredCount
+    pageCount
+  }
+}
+    ${BrowseFeaturesFieldsFragmentDoc}`;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class BrowseFeaturesGQL extends Apollo.Query<BrowseFeaturesQuery, BrowseFeaturesQueryVariables> {
+    document = BrowseFeaturesDocument;
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
diff --git a/client/src/app/generated/civic.possible-types.ts b/client/src/app/generated/civic.possible-types.ts
index 20f7a74ed..23c95d1b9 100644
--- a/client/src/app/generated/civic.possible-types.ts
+++ b/client/src/app/generated/civic.possible-types.ts
@@ -70,6 +70,7 @@
     ],
     "Flaggable": [
       "Assertion",
+      "BrowseFeature",
       "BrowseGene",
       "EvidenceItem",
       "Gene",
diff --git a/client/src/app/generated/server.model.graphql b/client/src/app/generated/server.model.graphql
index 7281863ed..a1b08b60f 100644
--- a/client/src/app/generated/server.model.graphql
+++ b/client/src/app/generated/server.model.graphql
@@ -878,6 +878,121 @@ type BrowseDiseaseEdge {
   node: BrowseDisease
 }
 
+type BrowseFeature implements Flaggable {
+  assertionCount: Int!
+  description: String!
+  diseases: [Disease!]
+  evidenceItemCount: Int!
+  featureAliases: [String!]
+  flagged: Boolean!
+
+  """
+  List and filter flags.
+  """
+  flags(
+    """
+    Returns the elements in the list that come after the specified cursor.
+    """
+    after: String
+
+    """
+    Returns the elements in the list that come before the specified cursor.
+    """
+    before: String
+
+    """
+    Returns the first _n_ elements from the list.
+    """
+    first: Int
+
+    """
+    Limit to flags added by a certain user
+    """
+    flaggingUserId: Int
+
+    """
+    Returns the last _n_ elements from the list.
+    """
+    last: Int
+
+    """
+    Limit to flags resolved by a certain user
+    """
+    resolvingUserId: Int
+
+    """
+    Sort order for the flags. Defaults to most recent.
+    """
+    sortBy: DateSort
+
+    """
+    Limit to flags in a particular state
+    """
+    state: FlagState
+  ): FlagConnection!
+  id: Int!
+  link: String!
+  molecularProfileCount: Int!
+  name: String!
+  therapies: [Therapy!]
+  variantCount: Int!
+}
+
+"""
+The connection type for BrowseFeature.
+"""
+type BrowseFeatureConnection {
+  """
+  A list of edges.
+  """
+  edges: [BrowseFeatureEdge!]!
+
+  """
+  The total number of records in this set.
+  """
+  filteredCount: Int!
+
+  """
+  The last time the data in this browse table was refreshed
+  """
+  lastUpdated: ISO8601DateTime!
+
+  """
+  A list of nodes.
+  """
+  nodes: [BrowseFeature!]!
+
+  """
+  Total number of pages, based on filtered count and pagesize.
+  """
+  pageCount: Int!
+
+  """
+  Information to aid in pagination.
+  """
+  pageInfo: PageInfo!
+
+  """
+  The total number of records of this type, regardless of any filtering.
+  """
+  totalCount: Int!
+}
+
+"""
+An edge in a connection.
+"""
+type BrowseFeatureEdge {
+  """
+  A cursor for use in pagination.
+  """
+  cursor: String!
+
+  """
+  The item at the end of the edge.
+  """
+  node: BrowseFeature
+}
+
 type BrowseGene implements Flaggable {
   assertionCount: Int!
   description: String!
@@ -2838,6 +2953,29 @@ interface FeatureInterface {
   ): VariantConnection!
 }
 
+input FeaturesSort {
+  """
+  Available columns for sorting
+  """
+  column: FeaturesSortColumns!
+
+  """
+  Sort direction
+  """
+  direction: SortDirection!
+}
+
+enum FeaturesSortColumns {
+  assertionCount
+  diseaseName
+  evidenceItemCount
+  featureAlias
+  featureName
+  molecularProfileCount
+  therapyName
+  variantCount
+}
+
 type FieldName {
   """
   The user facing representation of the field name.
@@ -5535,6 +5673,32 @@ type Query {
     name: String
     sortBy: DiseasesSort
   ): BrowseDiseaseConnection!
+  browseFeatures(
+    """
+    Returns the elements in the list that come after the specified cursor.
+    """
+    after: String
+
+    """
+    Returns the elements in the list that come before the specified cursor.
+    """
+    before: String
+    diseaseName: String
+    featureAlias: String
+    featureName: String
+
+    """
+    Returns the first _n_ elements from the list.
+    """
+    first: Int
+
+    """
+    Returns the last _n_ elements from the list.
+    """
+    last: Int
+    sortBy: FeaturesSort
+    therapyName: String
+  ): BrowseFeatureConnection!
   browseGenes(
     """
     Returns the elements in the list that come after the specified cursor.
diff --git a/client/src/app/generated/server.schema.json b/client/src/app/generated/server.schema.json
index bd243a32b..34ea43eae 100644
--- a/client/src/app/generated/server.schema.json
+++ b/client/src/app/generated/server.schema.json
@@ -3967,6 +3967,518 @@
           "enumValues": null,
           "possibleTypes": null
         },
+        {
+          "kind": "OBJECT",
+          "name": "BrowseFeature",
+          "description": null,
+          "fields": [
+            {
+              "name": "assertionCount",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "description",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "diseases",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "OBJECT",
+                    "name": "Disease",
+                    "ofType": null
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "evidenceItemCount",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "featureAliases",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "flagged",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Boolean",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "flags",
+              "description": "List and filter flags.",
+              "args": [
+                {
+                  "name": "flaggingUserId",
+                  "description": "Limit to flags added by a certain user",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "resolvingUserId",
+                  "description": "Limit to flags resolved by a certain user",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "state",
+                  "description": "Limit to flags in a particular state",
+                  "type": {
+                    "kind": "ENUM",
+                    "name": "FlagState",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "sortBy",
+                  "description": "Sort order for the flags. Defaults to most recent.",
+                  "type": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "DateSort",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "after",
+                  "description": "Returns the elements in the list that come after the specified cursor.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "before",
+                  "description": "Returns the elements in the list that come before the specified cursor.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "first",
+                  "description": "Returns the first _n_ elements from the list.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "last",
+                  "description": "Returns the last _n_ elements from the list.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                }
+              ],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "FlagConnection",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "id",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "link",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "molecularProfileCount",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "name",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "therapies",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "OBJECT",
+                    "name": "Therapy",
+                    "ofType": null
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "variantCount",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [
+            {
+              "kind": "INTERFACE",
+              "name": "Flaggable",
+              "ofType": null
+            }
+          ],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "BrowseFeatureConnection",
+          "description": "The connection type for BrowseFeature.",
+          "fields": [
+            {
+              "name": "edges",
+              "description": "A list of edges.",
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "BrowseFeatureEdge",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "filteredCount",
+              "description": "The total number of records in this set.",
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "lastUpdated",
+              "description": "The last time the data in this browse table was refreshed",
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "ISO8601DateTime",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "nodes",
+              "description": "A list of nodes.",
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "BrowseFeature",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "pageCount",
+              "description": "Total number of pages, based on filtered count and pagesize.",
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "pageInfo",
+              "description": "Information to aid in pagination.",
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "PageInfo",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "totalCount",
+              "description": "The total number of records of this type, regardless of any filtering.",
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "BrowseFeatureEdge",
+          "description": "An edge in a connection.",
+          "fields": [
+            {
+              "name": "cursor",
+              "description": "A cursor for use in pagination.",
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "node",
+              "description": "The item at the end of the edge.",
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "BrowseFeature",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
         {
           "kind": "OBJECT",
           "name": "BrowseGene",
@@ -14265,6 +14777,108 @@
             }
           ]
         },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "FeaturesSort",
+          "description": null,
+          "fields": null,
+          "inputFields": [
+            {
+              "name": "column",
+              "description": "Available columns for sorting",
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "ENUM",
+                  "name": "FeaturesSortColumns",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "direction",
+              "description": "Sort direction",
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "ENUM",
+                  "name": "SortDirection",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "ENUM",
+          "name": "FeaturesSortColumns",
+          "description": null,
+          "fields": null,
+          "inputFields": null,
+          "interfaces": null,
+          "enumValues": [
+            {
+              "name": "featureName",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "therapyName",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "featureAlias",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "diseaseName",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "variantCount",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "evidenceItemCount",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "assertionCount",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "molecularProfileCount",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "possibleTypes": null
+        },
         {
           "kind": "OBJECT",
           "name": "FieldName",
@@ -15484,6 +16098,11 @@
               "name": "Assertion",
               "ofType": null
             },
+            {
+              "kind": "OBJECT",
+              "name": "BrowseFeature",
+              "ofType": null
+            },
             {
               "kind": "OBJECT",
               "name": "BrowseGene",
@@ -26380,6 +26999,131 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "browseFeatures",
+              "description": null,
+              "args": [
+                {
+                  "name": "featureName",
+                  "description": null,
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "featureAlias",
+                  "description": null,
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "diseaseName",
+                  "description": null,
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "therapyName",
+                  "description": null,
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "sortBy",
+                  "description": null,
+                  "type": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "FeaturesSort",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "after",
+                  "description": "Returns the elements in the list that come after the specified cursor.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "before",
+                  "description": "Returns the elements in the list that come before the specified cursor.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "first",
+                  "description": "Returns the first _n_ elements from the list.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "last",
+                  "description": "Returns the last _n_ elements from the list.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                }
+              ],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "BrowseFeatureConnection",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "browseGenes",
               "description": null,
diff --git a/client/src/app/views/features/features-home/features-home.module.ts b/client/src/app/views/features/features-home/features-home.module.ts
index ab49324d8..9e57f932d 100644
--- a/client/src/app/views/features/features-home/features-home.module.ts
+++ b/client/src/app/views/features/features-home/features-home.module.ts
@@ -1,6 +1,6 @@
 import { CommonModule } from '@angular/common'
 import { NgModule } from '@angular/core'
-import { CvcGenesTableModule } from '@app/components/genes/genes-table/genes-table.module'
+import { CvcFeaturesTableModule } from '@app/components/features/features-table/features-table.module'
 import { CvcSectionNavigationModule } from '@app/components/shared/section-navigation/section-navigation.module'
 import { CvcPipesModule } from '@app/core/pipes/pipes.module'
 import { NzButtonModule } from 'ng-zorro-antd/button'
@@ -23,7 +23,7 @@ import { FeaturesHomePage } from './features-home.page'
     NzGridModule,
     CvcPipesModule,
     CvcSectionNavigationModule,
-    CvcGenesTableModule,
+    CvcFeaturesTableModule,
   ],
   exports: [FeaturesHomePage],
 })
diff --git a/client/src/app/views/features/features-home/features-home.page.html b/client/src/app/views/features/features-home/features-home.page.html
index 791073a94..7b0ef91f5 100644
--- a/client/src/app/views/features/features-home/features-home.page.html
+++ b/client/src/app/views/features/features-home/features-home.page.html
@@ -64,7 +64,7 @@ <h2>Features</h2>
     <nz-row>
       <nz-col [nzSpan]="24">
         <div class="content">
-          <cvc-genes-table cvcTitle="Browse All Genes"></cvc-genes-table>
+          <cvc-features-table cvcTitle="Browse All Features"></cvc-features-table>
         </div>
       </nz-col>
     </nz-row>
diff --git a/server/app/graphql/resolvers/browse_features.rb b/server/app/graphql/resolvers/browse_features.rb
new file mode 100644
index 000000000..86b06ee25
--- /dev/null
+++ b/server/app/graphql/resolvers/browse_features.rb
@@ -0,0 +1,48 @@
+require 'search_object'
+require 'search_object/plugin/graphql'
+
+class Resolvers::BrowseFeatures < GraphQL::Schema::Resolver
+  # include SearchObject for GraphQL
+  include SearchObject.module(:graphql)
+
+  type Types::BrowseTables::BrowseFeatureType.connection_type, null: false
+
+  scope { MaterializedViews::FeatureBrowseTableRow.all }
+
+  option(:feature_name, type: String) { |scope, value| scope.where("name ILIKE ?", "#{value}%") }
+  option(:feature_alias, type: String)    { |scope, value| scope.where(array_query_for_column('alias_names'), "#{value}%") }
+  option(:disease_name, type: String)  { |scope, value| scope.where(json_name_query_for_column('diseases'), "%#{value}%") }
+  option(:therapy_name, type: String)     { |scope, value| scope.where(json_name_query_for_column('therapies'), "%#{value}%") }
+
+  option :sort_by, type: Types::BrowseTables::FeaturesSortType do |scope, value|
+    case value.column
+    when "featureName"
+      scope.order "feature_browse_table_rows.name #{value.direction}"
+    when "therapyName"
+      scope.order "drug_names #{value.direction}"
+    when "geneAlias"
+      scope.order "alias_names #{value.direction}"
+    when "diseaseName"
+      scope.order "disease_names #{value.direction}"
+    when "variantCount"
+      scope.order "variant_count #{value.direction}"
+    when "evidenceItemCount"
+      scope.order "evidence_item_count #{value.direction}"
+    when "assertionCount"
+      scope.order "assertion_count #{value.direction}"
+    when "molecularProfileCount"
+      scope.order "molecular_profile_count #{value.direction}"
+    end
+  end
+
+  private
+  def array_query_for_column(col)
+    raise 'Must supply a column name' if col.nil?
+    "EXISTS (SELECT * FROM (SELECT unnest(#{col})) x(name) where name ILIKE ?)"
+  end
+
+  def json_name_query_for_column(col)
+    raise 'Must supply a column name' if col.nil?
+    "feature_browse_table_rows.id IN (select fb.id FROM feature_browse_table_rows fb, json_array_elements(fb.#{col}) d where d->>'name' ILIKE ?)"
+  end
+end
diff --git a/server/app/graphql/types/browse_tables/browse_feature_type.rb b/server/app/graphql/types/browse_tables/browse_feature_type.rb
new file mode 100644
index 000000000..3e93164ff
--- /dev/null
+++ b/server/app/graphql/types/browse_tables/browse_feature_type.rb
@@ -0,0 +1,38 @@
+module Types::BrowseTables
+  class BrowseFeatureType < Types::BaseObject
+    implements Types::Interfaces::Flaggable
+    connection_type_class(Types::Connections::BrowseTableConnection)
+
+    field :id, Int, null: false
+    field :name, String, null: false
+    field :link, String, null: false
+    field :description, String, null: false
+    field :feature_aliases, [String], null: true
+    field :diseases, [Types::Entities::DiseaseType], null: true
+    field :therapies, [Types::Entities::TherapyType], null: true
+    field :variant_count, Int, null: false
+    field :evidence_item_count, Int, null: false
+    field :assertion_count, Int, null: false
+    field :molecular_profile_count, Int, null: false
+
+    def link
+      Rails.application.routes.url_helpers.url_for("/features/#{object.id}")
+    end
+
+    def feature_aliases
+      object.alias_names.compact
+    end
+
+    def diseases
+      Array(object.diseases)
+        .sort_by { |d| -d['total'] }
+        .map { |d| { name: d['name'], id: d['id'], link: "/diseases/#{d['id']}" } }
+    end
+
+    def therapies
+      Array(object.therapies)
+        .sort_by { |d| -d['total'] }
+        .map { |d| { name: d['name'], id: d['id'], link: "/therapies/#{d['id']}"  } }
+    end
+  end
+end
diff --git a/server/app/graphql/types/browse_tables/features_sort_columns.rb b/server/app/graphql/types/browse_tables/features_sort_columns.rb
new file mode 100644
index 000000000..7c6d12247
--- /dev/null
+++ b/server/app/graphql/types/browse_tables/features_sort_columns.rb
@@ -0,0 +1,12 @@
+module Types::BrowseTables
+  class FeaturesSortColumns < Types::BaseEnum
+    value "featureName"
+    value "therapyName"
+    value "featureAlias"
+    value "diseaseName"
+    value "variantCount"
+    value "evidenceItemCount"
+    value "assertionCount"
+    value "molecularProfileCount"
+  end
+end
diff --git a/server/app/graphql/types/browse_tables/features_sort_type.rb b/server/app/graphql/types/browse_tables/features_sort_type.rb
new file mode 100644
index 000000000..ee0597dec
--- /dev/null
+++ b/server/app/graphql/types/browse_tables/features_sort_type.rb
@@ -0,0 +1,6 @@
+module Types::BrowseTables
+  class FeaturesSortType < Types::BaseInputObject
+    argument :column, Types::BrowseTables::FeaturesSortColumns, "Available columns for sorting", required: true
+    argument :direction, Types::SortDirection, "Sort direction", required: true
+  end
+end
diff --git a/server/app/graphql/types/query_type.rb b/server/app/graphql/types/query_type.rb
index d3f6f032d..e7026a687 100644
--- a/server/app/graphql/types/query_type.rb
+++ b/server/app/graphql/types/query_type.rb
@@ -15,6 +15,7 @@ class QueryType < Types::BaseObject
     # Add root-level fields here.
     # They will be entry points for queries on your schema.
     field :browseGenes, resolver: Resolvers::BrowseGenes
+    field :browseFeatures, resolver: Resolvers::BrowseFeatures
     field :browseVariants, resolver: Resolvers::BrowseVariants
     field :browseSources, resolver: Resolvers::BrowseSources
     field :browseVariantGroups, resolver: Resolvers::BrowseVariantGroups
diff --git a/server/app/models/materialized_views/feature_browse_table_row.rb b/server/app/models/materialized_views/feature_browse_table_row.rb
new file mode 100644
index 000000000..cc3c88a99
--- /dev/null
+++ b/server/app/models/materialized_views/feature_browse_table_row.rb
@@ -0,0 +1,2 @@
+class MaterializedViews::FeatureBrowseTableRow < MaterializedViews::MaterializedView
+end
diff --git a/server/db/migrate/20231212145853_create_feature_browse_table_rows.rb b/server/db/migrate/20231212145853_create_feature_browse_table_rows.rb
new file mode 100644
index 000000000..01db1894e
--- /dev/null
+++ b/server/db/migrate/20231212145853_create_feature_browse_table_rows.rb
@@ -0,0 +1,5 @@
+class CreateFeatureBrowseTableRows < ActiveRecord::Migration[6.1]
+  def change
+    create_view :feature_browse_table_rows, materialized: true
+  end
+end
diff --git a/server/db/schema.rb b/server/db/schema.rb
index 77f5f99cb..8dfbc79cc 100644
--- a/server/db/schema.rb
+++ b/server/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2023_12_04_203813) do
+ActiveRecord::Schema.define(version: 2023_12_12_145853) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -1260,4 +1260,47 @@
        JOIN evidence_items ei ON (((mp.id = ei.molecular_profile_id) AND (ei.deleted = false) AND ((ei.status)::text <> 'rejected'::text))))
     GROUP BY mp.id;
   SQL
+  create_view "feature_browse_table_rows", materialized: true, sql_definition: <<-SQL
+      SELECT outer_features.id,
+      outer_features.name,
+      array_agg(DISTINCT feature_aliases.name ORDER BY feature_aliases.name) AS alias_names,
+      json_agg(DISTINCT jsonb_build_object('name', diseases.name, 'id', diseases.id, 'total', disease_count.total)) FILTER (WHERE (diseases.name IS NOT NULL)) AS diseases,
+      json_agg(DISTINCT jsonb_build_object('name', therapies.name, 'id', therapies.id, 'total', therapy_count.total)) FILTER (WHERE (therapies.name IS NOT NULL)) AS therapies,
+      count(DISTINCT variants.id) AS variant_count,
+      count(DISTINCT evidence_items.id) AS evidence_item_count,
+      count(DISTINCT assertions.id) AS assertion_count,
+      count(DISTINCT molecular_profiles.id) AS molecular_profile_count
+     FROM ((((((((((((features outer_features
+       LEFT JOIN feature_aliases_features ON ((feature_aliases_features.feature_id = outer_features.id)))
+       LEFT JOIN feature_aliases ON ((feature_aliases.id = feature_aliases_features.feature_alias_id)))
+       JOIN variants ON ((variants.feature_id = outer_features.id)))
+       JOIN molecular_profiles_variants ON ((molecular_profiles_variants.variant_id = variants.id)))
+       JOIN molecular_profiles ON ((molecular_profiles.id = molecular_profiles_variants.molecular_profile_id)))
+       JOIN evidence_items ON ((evidence_items.molecular_profile_id = molecular_profiles.id)))
+       LEFT JOIN diseases ON ((diseases.id = evidence_items.disease_id)))
+       LEFT JOIN evidence_items_therapies ON ((evidence_items_therapies.evidence_item_id = evidence_items.id)))
+       LEFT JOIN therapies ON ((therapies.id = evidence_items_therapies.therapy_id)))
+       LEFT JOIN assertions ON ((assertions.molecular_profile_id = molecular_profiles.id)))
+       LEFT JOIN LATERAL ( SELECT therapies_1.id AS therapy_id,
+              count(DISTINCT evidence_items_1.id) AS total
+             FROM (((((evidence_items evidence_items_1
+               JOIN molecular_profiles molecular_profiles_1 ON ((molecular_profiles_1.id = evidence_items_1.molecular_profile_id)))
+               JOIN molecular_profiles_variants molecular_profiles_variants_1 ON ((molecular_profiles_variants_1.molecular_profile_id = molecular_profiles_1.id)))
+               JOIN variants variants_1 ON ((variants_1.id = molecular_profiles_variants_1.variant_id)))
+               JOIN evidence_items_therapies evidence_items_therapies_1 ON ((evidence_items_therapies_1.evidence_item_id = evidence_items_1.id)))
+               JOIN therapies therapies_1 ON ((therapies_1.id = evidence_items_therapies_1.therapy_id)))
+            WHERE (variants_1.feature_id = outer_features.id)
+            GROUP BY therapies_1.id) therapy_count ON ((therapies.id = therapy_count.therapy_id)))
+       LEFT JOIN LATERAL ( SELECT diseases_1.id AS disease_id,
+              count(DISTINCT evidence_items_1.id) AS total
+             FROM ((((evidence_items evidence_items_1
+               JOIN molecular_profiles molecular_profiles_1 ON ((molecular_profiles_1.id = evidence_items_1.molecular_profile_id)))
+               JOIN molecular_profiles_variants molecular_profiles_variants_1 ON ((molecular_profiles_variants_1.molecular_profile_id = molecular_profiles_1.id)))
+               JOIN variants variants_1 ON ((variants_1.id = molecular_profiles_variants_1.variant_id)))
+               JOIN diseases diseases_1 ON ((diseases_1.id = evidence_items_1.disease_id)))
+            WHERE (variants_1.feature_id = outer_features.id)
+            GROUP BY diseases_1.id) disease_count ON ((diseases.id = disease_count.disease_id)))
+    WHERE (((evidence_items.status)::text <> 'rejected'::text) AND (molecular_profiles.deprecated = false) AND (variants.deprecated = false))
+    GROUP BY outer_features.id, outer_features.name;
+  SQL
 end
diff --git a/server/db/views/feature_browse_table_rows_v01.sql b/server/db/views/feature_browse_table_rows_v01.sql
new file mode 100644
index 000000000..e1843149c
--- /dev/null
+++ b/server/db/views/feature_browse_table_rows_v01.sql
@@ -0,0 +1,45 @@
+SELECT outer_features.id,
+  outer_features.name,
+  --outer_features.flagged,
+  array_agg(distinct(feature_aliases.name) order by feature_aliases.name) as alias_names,
+  json_agg(distinct jsonb_build_object('name', diseases.name, 'id', diseases.id, 'total', disease_count.total))  FILTER (WHERE diseases.name IS NOT NULL) as diseases,
+  json_agg(distinct jsonb_build_object('name', therapies.name, 'id', therapies.id, 'total', therapy_count.total))  FILTER (WHERE therapies.name IS NOT NULL) as therapies,
+  count(distinct(variants.id)) as variant_count,
+  count(distinct(evidence_items.id)) as evidence_item_count,
+  count(distinct(assertions.id)) as assertion_count,
+  count(distinct(molecular_profiles.id)) as molecular_profile_count
+FROM features outer_features
+LEFT OUTER JOIN feature_aliases_features ON feature_aliases_features.feature_id = outer_features.id
+LEFT OUTER JOIN feature_aliases ON feature_aliases.id = feature_aliases_features.feature_alias_id
+INNER JOIN variants ON variants.feature_id = outer_features.id
+INNER JOIN molecular_profiles_variants ON molecular_profiles_variants.variant_id = variants.id
+INNER JOIN molecular_profiles ON molecular_profiles.id = molecular_profiles_variants.molecular_profile_id
+INNER JOIN evidence_items ON evidence_items.molecular_profile_id = molecular_profiles.id
+LEFT OUTER JOIN diseases ON diseases.id = evidence_items.disease_id
+LEFT OUTER JOIN evidence_items_therapies ON evidence_items_therapies.evidence_item_id = evidence_items.id
+LEFT OUTER JOIN therapies ON therapies.id = evidence_items_therapies.therapy_id
+LEFT OUTER JOIN assertions on assertions.molecular_profile_id = molecular_profiles.id
+LEFT JOIN LATERAL (SELECT therapies.id as therapy_id, COUNT(DISTINCT(evidence_items.id)) as total
+  FROM evidence_items
+  INNER JOIN molecular_profiles ON molecular_profiles.id = evidence_items.molecular_profile_id
+  INNER JOIN molecular_profiles_variants ON molecular_profiles_variants.molecular_profile_id = molecular_profiles.id
+  INNER JOIN variants ON variants.id = molecular_profiles_variants.variant_id
+  INNER JOIN evidence_items_therapies ON evidence_items_therapies.evidence_item_id = evidence_items.id
+  INNER JOIN therapies ON therapies.id = evidence_items_therapies.therapy_id
+  WHERE variants.feature_id = outer_features.id
+  GROUP BY therapies.id
+) therapy_count on therapies.id = therapy_count.therapy_id
+
+LEFT JOIN LATERAL (SELECT diseases.id as disease_id, COUNT(DISTINCT(evidence_items.id)) as total
+  FROM evidence_items
+  INNER JOIN molecular_profiles ON molecular_profiles.id = evidence_items.molecular_profile_id
+  INNER JOIN molecular_profiles_variants ON molecular_profiles_variants.molecular_profile_id = molecular_profiles.id
+  INNER JOIN variants ON variants.id = molecular_profiles_variants.variant_id
+  INNER JOIN diseases ON diseases.id = evidence_items.disease_id
+  WHERE variants.feature_id = outer_features.id
+  GROUP BY diseases.id
+) disease_count on diseases.id = disease_count.disease_id
+WHERE evidence_items.status != 'rejected'
+  AND molecular_profiles.deprecated = 'f'
+  AND variants.deprecated = 'f'
+GROUP BY outer_features.id, outer_features.name;

From 31a1428499481162fcbbc103b1199d4e5794bc21 Mon Sep 17 00:00:00 2001
From: Susanna Kiwala <susanna.kiwala@wustl.edu>
Date: Tue, 12 Dec 2023 13:55:39 -0600
Subject: [PATCH 007/125] Replace Genes with Features in sidebar navigation
 menu

---
 client/src/app/layout/layout.component.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/app/layout/layout.component.html b/client/src/app/layout/layout.component.html
index 520a649d2..44faeca36 100644
--- a/client/src/app/layout/layout.component.html
+++ b/client/src/app/layout/layout.component.html
@@ -77,13 +77,13 @@
             nz-menu-item
             nz-tooltip
             nzTooltipPlacement="right"
-            [nzTooltipTitle]="isCollapsed ? 'Genes' : ''"
+            [nzTooltipTitle]="isCollapsed ? 'Features' : ''"
             nzSelected
             nzMatchRouter>
             <i
               nz-icon
               nzType="civic-gene"></i>
-            <span> <a routerLink="/genes">Genes</a> </span>
+            <span> <a routerLink="/features">Features</a> </span>
           </li>
 
           <li

From 2c01b405ec6aa7d8727478ba34e39359b0afce6f Mon Sep 17 00:00:00 2001
From: Susanna Kiwala <susanna.kiwala@wustl.edu>
Date: Thu, 14 Dec 2023 12:16:51 -0600
Subject: [PATCH 008/125] Move flags from Gene to Feature

---
 .../feature-popover.component.html            |   5 +-
 .../feature-popover/feature-popover.query.gql |  14 +-
 .../features-table/features-table.query.gql   |   2 +-
 .../src/app/generated/civic.apollo-helpers.ts |  16 +-
 client/src/app/generated/civic.apollo.ts      | 166 +++++++-------
 .../src/app/generated/civic.possible-types.ts |   3 +-
 client/src/app/generated/server.model.graphql |  65 +++++-
 client/src/app/generated/server.schema.json   | 213 ++++++++++++++++--
 .../assertions-detail.view.ts                 |   5 +
 .../evidence-detail/evidence-detail.view.ts   |   5 +
 .../features-detail/features-detail.query.gql |  14 +-
 .../features-detail/features-detail.view.html |  18 +-
 .../features-detail/features-detail.view.ts   |   9 +-
 .../features-flags/features-flags.page.ts     |   2 +-
 .../features-summary.page.html                |   4 +-
 .../features-summary.query.gql                |  38 ++--
 .../genes-summary/genes-summary.query.gql     |  24 --
 .../molecular-profiles-detail.view.ts         |   5 +
 .../variants-detail/variants-detail.view.ts   |   5 +
 .../graphql/types/entities/feature_type.rb    |  67 ++++++
 .../app/graphql/types/entities/gene_type.rb   |   5 +-
 .../graphql/types/entities/variant_type.rb    |   8 +-
 .../graphql/types/feature_instance_type.rb    |  14 ++
 .../flaggable/flaggable_entities_type.rb      |   1 +
 .../types/flaggable/flaggable_input.rb        |   4 +-
 .../types/interfaces/feature_interface.rb     |  52 -----
 .../app/graphql/types/interfaces/flaggable.rb |   2 +
 .../molecular_profile_segment_type.rb         |   6 +-
 server/app/graphql/types/query_type.rb        |   4 +-
 .../models/concerns/is_feature_instance.rb    |   4 +
 server/app/models/feature.rb                  |   3 +
 server/app/models/features/gene.rb            |   1 -
 ...12195608_add_flagged_column_to_features.rb |   5 +
 ..._feature_browse_table_rows_to_version_2.rb |  10 +
 server/db/schema.rb                           |   6 +-
 .../views/feature_browse_table_rows_v02.sql   |  45 ++++
 .../features/backfill_feature_flags.rb        |  11 +
 37 files changed, 617 insertions(+), 244 deletions(-)
 create mode 100644 server/app/graphql/types/entities/feature_type.rb
 create mode 100644 server/app/graphql/types/feature_instance_type.rb
 delete mode 100644 server/app/graphql/types/interfaces/feature_interface.rb
 create mode 100644 server/db/migrate/20231212195608_add_flagged_column_to_features.rb
 create mode 100644 server/db/migrate/20231213150951_update_feature_browse_table_rows_to_version_2.rb
 create mode 100644 server/db/views/feature_browse_table_rows_v02.sql
 create mode 100644 server/misc_scripts/features/backfill_feature_flags.rb

diff --git a/client/src/app/components/features/feature-popover/feature-popover.component.html b/client/src/app/components/features/feature-popover/feature-popover.component.html
index b5bdd1b5d..e2fd3ead6 100644
--- a/client/src/app/components/features/feature-popover/feature-popover.component.html
+++ b/client/src/app/components/features/feature-popover/feature-popover.component.html
@@ -10,7 +10,8 @@
           nzTheme="twotone"
           [nzTwotoneColor]="'Gene' | entityColor"
           nzType="civic-gene"></i>
-        {{ feature.officialName }}
+        {{ feature.featureInstance.__typename }} - {{ feature.name }}
+        <!-- {{ feature.officialName }} -->
       </ng-template>
 
       <nz-descriptions
@@ -42,7 +43,7 @@
                 <i
                   nz-icon
                   nzType="civic-flag"></i>
-                Flags <!-- ({{ feature.flags.totalCount }}) -->
+                Flags ({{ feature.flags.totalCount }})
               </nz-tag>
             </a>
             <a
diff --git a/client/src/app/components/features/feature-popover/feature-popover.query.gql b/client/src/app/components/features/feature-popover/feature-popover.query.gql
index 5e225c199..5e96548ac 100644
--- a/client/src/app/components/features/feature-popover/feature-popover.query.gql
+++ b/client/src/app/components/features/feature-popover/feature-popover.query.gql
@@ -4,11 +4,13 @@ query FeaturePopover($featureId: Int!) {
   }
 }
 
-fragment featurePopover on FeatureInterface {
+fragment featurePopover on Feature {
   id
   name
-  ... on Gene {
-    officialName
+  featureInstance {
+    ... on Gene {
+      officialName
+    }
   }
   featureAliases
   variants {
@@ -20,7 +22,7 @@ fragment featurePopover on FeatureInterface {
   # comments {
   #   totalCount
   # }
-  # flags(state: OPEN) {
-  #   totalCount
-  # }
+  flags(state: OPEN) {
+    totalCount
+  }
 }
diff --git a/client/src/app/components/features/features-table/features-table.query.gql b/client/src/app/components/features/features-table/features-table.query.gql
index 9d52d5a61..c9c427981 100644
--- a/client/src/app/components/features/features-table/features-table.query.gql
+++ b/client/src/app/components/features/features-table/features-table.query.gql
@@ -43,7 +43,7 @@ fragment BrowseFeaturesFields on BrowseFeature {
   id
   name
   link
-  #flagged
+  flagged
   featureAliases
   diseases {
     name
diff --git a/client/src/app/generated/civic.apollo-helpers.ts b/client/src/app/generated/civic.apollo-helpers.ts
index 85142b881..b5ffc699c 100644
--- a/client/src/app/generated/civic.apollo-helpers.ts
+++ b/client/src/app/generated/civic.apollo-helpers.ts
@@ -812,10 +812,13 @@ export type FdaCodeFieldPolicy = {
 	code?: FieldPolicy<any> | FieldReadFunction<any>,
 	description?: FieldPolicy<any> | FieldReadFunction<any>
 };
-export type FeatureInterfaceKeySpecifier = ('description' | 'featureAliases' | 'id' | 'link' | 'name' | 'sources' | 'variants' | FeatureInterfaceKeySpecifier)[];
-export type FeatureInterfaceFieldPolicy = {
+export type FeatureKeySpecifier = ('description' | 'featureAliases' | 'featureInstance' | 'flagged' | 'flags' | 'id' | 'link' | 'name' | 'sources' | 'variants' | FeatureKeySpecifier)[];
+export type FeatureFieldPolicy = {
 	description?: FieldPolicy<any> | FieldReadFunction<any>,
 	featureAliases?: FieldPolicy<any> | FieldReadFunction<any>,
+	featureInstance?: FieldPolicy<any> | FieldReadFunction<any>,
+	flagged?: FieldPolicy<any> | FieldReadFunction<any>,
+	flags?: FieldPolicy<any> | FieldReadFunction<any>,
 	id?: FieldPolicy<any> | FieldReadFunction<any>,
 	link?: FieldPolicy<any> | FieldReadFunction<any>,
 	name?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -890,13 +893,14 @@ export type FlaggableFieldPolicy = {
 	link?: FieldPolicy<any> | FieldReadFunction<any>,
 	name?: FieldPolicy<any> | FieldReadFunction<any>
 };
-export type GeneKeySpecifier = ('comments' | 'description' | 'entrezId' | 'events' | 'featureAliases' | 'flagged' | 'flags' | 'id' | 'lastAcceptedRevisionEvent' | 'lastCommentEvent' | 'lastSubmittedRevisionEvent' | 'link' | 'myGeneInfoDetails' | 'name' | 'officialName' | 'revisions' | 'sources' | 'variants' | GeneKeySpecifier)[];
+export type GeneKeySpecifier = ('comments' | 'description' | 'entrezId' | 'events' | 'featureAliases' | 'featureInstance' | 'flagged' | 'flags' | 'id' | 'lastAcceptedRevisionEvent' | 'lastCommentEvent' | 'lastSubmittedRevisionEvent' | 'link' | 'myGeneInfoDetails' | 'name' | 'officialName' | 'revisions' | 'sources' | 'variants' | GeneKeySpecifier)[];
 export type GeneFieldPolicy = {
 	comments?: FieldPolicy<any> | FieldReadFunction<any>,
 	description?: FieldPolicy<any> | FieldReadFunction<any>,
 	entrezId?: FieldPolicy<any> | FieldReadFunction<any>,
 	events?: FieldPolicy<any> | FieldReadFunction<any>,
 	featureAliases?: FieldPolicy<any> | FieldReadFunction<any>,
+	featureInstance?: FieldPolicy<any> | FieldReadFunction<any>,
 	flagged?: FieldPolicy<any> | FieldReadFunction<any>,
 	flags?: FieldPolicy<any> | FieldReadFunction<any>,
 	id?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -2402,9 +2406,9 @@ export type StrictTypedTypePolicies = {
 		keyFields?: false | FdaCodeKeySpecifier | (() => undefined | FdaCodeKeySpecifier),
 		fields?: FdaCodeFieldPolicy,
 	},
-	FeatureInterface?: Omit<TypePolicy, "fields" | "keyFields"> & {
-		keyFields?: false | FeatureInterfaceKeySpecifier | (() => undefined | FeatureInterfaceKeySpecifier),
-		fields?: FeatureInterfaceFieldPolicy,
+	Feature?: Omit<TypePolicy, "fields" | "keyFields"> & {
+		keyFields?: false | FeatureKeySpecifier | (() => undefined | FeatureKeySpecifier),
+		fields?: FeatureFieldPolicy,
 	},
 	FieldName?: Omit<TypePolicy, "fields" | "keyFields"> & {
 		keyFields?: false | FieldNameKeySpecifier | (() => undefined | FieldNameKeySpecifier),
diff --git a/client/src/app/generated/civic.apollo.ts b/client/src/app/generated/civic.apollo.ts
index aa2448c13..04c727015 100644
--- a/client/src/app/generated/civic.apollo.ts
+++ b/client/src/app/generated/civic.apollo.ts
@@ -1840,9 +1840,14 @@ export type FdaCode = {
 };
 
 /** The Feature that a Variant can belong to */
-export type FeatureInterface = {
+export type Feature = Flaggable & {
+  __typename: 'Feature';
   description: Scalars['String'];
   featureAliases: Array<Scalars['String']>;
+  featureInstance: FeatureInstance;
+  flagged: Scalars['Boolean'];
+  /** List and filter flags. */
+  flags: FlagConnection;
   id: Scalars['Int'];
   link: Scalars['String'];
   name: Scalars['String'];
@@ -1853,7 +1858,20 @@ export type FeatureInterface = {
 
 
 /** The Feature that a Variant can belong to */
-export type FeatureInterfaceVariantsArgs = {
+export type FeatureFlagsArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  first?: InputMaybe<Scalars['Int']>;
+  flaggingUserId?: InputMaybe<Scalars['Int']>;
+  last?: InputMaybe<Scalars['Int']>;
+  resolvingUserId?: InputMaybe<Scalars['Int']>;
+  sortBy?: InputMaybe<DateSort>;
+  state?: InputMaybe<FlagState>;
+};
+
+
+/** The Feature that a Variant can belong to */
+export type FeatureVariantsArgs = {
   after?: InputMaybe<Scalars['String']>;
   before?: InputMaybe<Scalars['String']>;
   first?: InputMaybe<Scalars['Int']>;
@@ -1861,6 +1879,9 @@ export type FeatureInterfaceVariantsArgs = {
   name?: InputMaybe<Scalars['String']>;
 };
 
+/** The specific type of a feature instance */
+export type FeatureInstance = Gene;
+
 export type FeaturesSort = {
   /** Available columns for sorting */
   column: FeaturesSortColumns;
@@ -2042,6 +2063,7 @@ export type FlaggableFlagsArgs = {
 export enum FlaggableEntities {
   Assertion = 'ASSERTION',
   EvidenceItem = 'EVIDENCE_ITEM',
+  Feature = 'FEATURE',
   Gene = 'GENE',
   MolecularProfile = 'MOLECULAR_PROFILE',
   Variant = 'VARIANT',
@@ -2056,7 +2078,8 @@ export type FlaggableInput = {
   id: Scalars['Int'];
 };
 
-export type Gene = Commentable & EventSubject & FeatureInterface & Flaggable & MolecularProfileComponent & WithRevisions & {
+/** The Feature that a Variant can belong to */
+export type Gene = Commentable & EventSubject & Flaggable & MolecularProfileComponent & WithRevisions & {
   __typename: 'Gene';
   /** List and filter comments. */
   comments: CommentConnection;
@@ -2065,6 +2088,7 @@ export type Gene = Commentable & EventSubject & FeatureInterface & Flaggable & M
   /** List and filter events for an object */
   events: EventConnection;
   featureAliases: Array<Scalars['String']>;
+  featureInstance: FeatureInstance;
   flagged: Scalars['Boolean'];
   /** List and filter flags. */
   flags: FlagConnection;
@@ -2084,6 +2108,7 @@ export type Gene = Commentable & EventSubject & FeatureInterface & Flaggable & M
 };
 
 
+/** The Feature that a Variant can belong to */
 export type GeneCommentsArgs = {
   after?: InputMaybe<Scalars['String']>;
   before?: InputMaybe<Scalars['String']>;
@@ -2097,6 +2122,7 @@ export type GeneCommentsArgs = {
 };
 
 
+/** The Feature that a Variant can belong to */
 export type GeneEventsArgs = {
   after?: InputMaybe<Scalars['String']>;
   before?: InputMaybe<Scalars['String']>;
@@ -2109,6 +2135,7 @@ export type GeneEventsArgs = {
 };
 
 
+/** The Feature that a Variant can belong to */
 export type GeneFlagsArgs = {
   after?: InputMaybe<Scalars['String']>;
   before?: InputMaybe<Scalars['String']>;
@@ -2121,6 +2148,7 @@ export type GeneFlagsArgs = {
 };
 
 
+/** The Feature that a Variant can belong to */
 export type GeneRevisionsArgs = {
   after?: InputMaybe<Scalars['String']>;
   before?: InputMaybe<Scalars['String']>;
@@ -2134,6 +2162,7 @@ export type GeneRevisionsArgs = {
 };
 
 
+/** The Feature that a Variant can belong to */
 export type GeneVariantsArgs = {
   after?: InputMaybe<Scalars['String']>;
   before?: InputMaybe<Scalars['String']>;
@@ -3492,7 +3521,7 @@ export type Query = {
   /** List and filter evidence items. */
   evidenceItems: EvidenceItemConnection;
   /** Find a single feature by CIViC ID */
-  feature?: Maybe<Gene>;
+  feature?: Maybe<Feature>;
   /** Find a flag by CIViC ID */
   flag?: Maybe<Flag>;
   /** List and filter flags. */
@@ -5551,7 +5580,7 @@ export type Variant = Commentable & EventOriginObject & EventSubject & Flaggable
   ensemblVersion?: Maybe<Scalars['Int']>;
   /** List and filter events for an object */
   events: EventConnection;
-  feature: FeatureInterface;
+  feature: Feature;
   flagged: Scalars['Boolean'];
   /** List and filter flags. */
   flags: FlagConnection;
@@ -6230,9 +6259,9 @@ export type FeaturePopoverQueryVariables = Exact<{
 }>;
 
 
-export type FeaturePopoverQuery = { __typename: 'Query', feature?: { __typename: 'Gene', officialName: string, id: number, name: string, featureAliases: Array<string>, variants: { __typename: 'VariantConnection', totalCount: number } } | undefined };
+export type FeaturePopoverQuery = { __typename: 'Query', feature?: { __typename: 'Feature', id: number, name: string, featureAliases: Array<string>, featureInstance: { __typename: 'Gene', officialName: string }, variants: { __typename: 'VariantConnection', totalCount: number }, flags: { __typename: 'FlagConnection', totalCount: number } } | undefined };
 
-export type FeaturePopoverFragment = { __typename: 'Gene', officialName: string, id: number, name: string, featureAliases: Array<string>, variants: { __typename: 'VariantConnection', totalCount: number } };
+export type FeaturePopoverFragment = { __typename: 'Feature', id: number, name: string, featureAliases: Array<string>, featureInstance: { __typename: 'Gene', officialName: string }, variants: { __typename: 'VariantConnection', totalCount: number }, flags: { __typename: 'FlagConnection', totalCount: number } };
 
 export type BrowseFeaturesQueryVariables = Exact<{
   featureName?: InputMaybe<Scalars['String']>;
@@ -6247,9 +6276,9 @@ export type BrowseFeaturesQueryVariables = Exact<{
 }>;
 
 
-export type BrowseFeaturesQuery = { __typename: 'Query', browseFeatures: { __typename: 'BrowseFeatureConnection', lastUpdated: any, totalCount: number, filteredCount: number, pageCount: number, edges: Array<{ __typename: 'BrowseFeatureEdge', cursor: string, node?: { __typename: 'BrowseFeature', id: number, name: string, link: string, featureAliases?: Array<string> | undefined, variantCount: number, evidenceItemCount: number, assertionCount: number, molecularProfileCount: number, diseases?: Array<{ __typename: 'Disease', name: string, id: number, link: string }> | undefined, therapies?: Array<{ __typename: 'Therapy', name: string, id: number, link: string }> | undefined } | undefined }>, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasPreviousPage: boolean, hasNextPage: boolean } } };
+export type BrowseFeaturesQuery = { __typename: 'Query', browseFeatures: { __typename: 'BrowseFeatureConnection', lastUpdated: any, totalCount: number, filteredCount: number, pageCount: number, edges: Array<{ __typename: 'BrowseFeatureEdge', cursor: string, node?: { __typename: 'BrowseFeature', id: number, name: string, link: string, flagged: boolean, featureAliases?: Array<string> | undefined, variantCount: number, evidenceItemCount: number, assertionCount: number, molecularProfileCount: number, diseases?: Array<{ __typename: 'Disease', name: string, id: number, link: string }> | undefined, therapies?: Array<{ __typename: 'Therapy', name: string, id: number, link: string }> | undefined } | undefined }>, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasPreviousPage: boolean, hasNextPage: boolean } } };
 
-export type BrowseFeaturesFieldsFragment = { __typename: 'BrowseFeature', id: number, name: string, link: string, featureAliases?: Array<string> | undefined, variantCount: number, evidenceItemCount: number, assertionCount: number, molecularProfileCount: number, diseases?: Array<{ __typename: 'Disease', name: string, id: number, link: string }> | undefined, therapies?: Array<{ __typename: 'Therapy', name: string, id: number, link: string }> | undefined };
+export type BrowseFeaturesFieldsFragment = { __typename: 'BrowseFeature', id: number, name: string, link: string, flagged: boolean, featureAliases?: Array<string> | undefined, variantCount: number, evidenceItemCount: number, assertionCount: number, molecularProfileCount: number, diseases?: Array<{ __typename: 'Disease', name: string, id: number, link: string }> | undefined, therapies?: Array<{ __typename: 'Therapy', name: string, id: number, link: string }> | undefined };
 
 export type FlagListQueryVariables = Exact<{
   flaggable?: InputMaybe<FlaggableInput>;
@@ -6264,20 +6293,20 @@ export type FlagListQueryVariables = Exact<{
 }>;
 
 
-export type FlagListQuery = { __typename: 'Query', flags: { __typename: 'FlagConnection', totalCount: number, unfilteredCountForSubject?: number | undefined, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, uniqueFlaggingUsers: Array<{ __typename: 'User', username: string, id: number, profileImagePath?: string | undefined }>, uniqueResolvingUsers?: Array<{ __typename: 'User', username: string, id: number, profileImagePath?: string | undefined }> | undefined, edges: Array<{ __typename: 'FlagEdge', node?: { __typename: 'Flag', id: number, state: FlagState, flaggable: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'BrowseFeature', id: number, name: string, link: string } | { __typename: 'BrowseGene', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | { __typename: 'VariantGroup', id: number, name: string, link: string }, openActivity: { __typename: 'FlagEntityActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } }, resolutionActivity?: { __typename: 'ResolveFlagActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined } | undefined }> } };
+export type FlagListQuery = { __typename: 'Query', flags: { __typename: 'FlagConnection', totalCount: number, unfilteredCountForSubject?: number | undefined, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, uniqueFlaggingUsers: Array<{ __typename: 'User', username: string, id: number, profileImagePath?: string | undefined }>, uniqueResolvingUsers?: Array<{ __typename: 'User', username: string, id: number, profileImagePath?: string | undefined }> | undefined, edges: Array<{ __typename: 'FlagEdge', node?: { __typename: 'Flag', id: number, state: FlagState, flaggable: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'BrowseFeature', id: number, name: string, link: string } | { __typename: 'BrowseGene', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | { __typename: 'VariantGroup', id: number, name: string, link: string }, openActivity: { __typename: 'FlagEntityActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } }, resolutionActivity?: { __typename: 'ResolveFlagActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined } | undefined }> } };
 
-export type FlagListFragment = { __typename: 'FlagConnection', totalCount: number, unfilteredCountForSubject?: number | undefined, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, uniqueFlaggingUsers: Array<{ __typename: 'User', username: string, id: number, profileImagePath?: string | undefined }>, uniqueResolvingUsers?: Array<{ __typename: 'User', username: string, id: number, profileImagePath?: string | undefined }> | undefined, edges: Array<{ __typename: 'FlagEdge', node?: { __typename: 'Flag', id: number, state: FlagState, flaggable: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'BrowseFeature', id: number, name: string, link: string } | { __typename: 'BrowseGene', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | { __typename: 'VariantGroup', id: number, name: string, link: string }, openActivity: { __typename: 'FlagEntityActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } }, resolutionActivity?: { __typename: 'ResolveFlagActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined } | undefined }> };
+export type FlagListFragment = { __typename: 'FlagConnection', totalCount: number, unfilteredCountForSubject?: number | undefined, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, uniqueFlaggingUsers: Array<{ __typename: 'User', username: string, id: number, profileImagePath?: string | undefined }>, uniqueResolvingUsers?: Array<{ __typename: 'User', username: string, id: number, profileImagePath?: string | undefined }> | undefined, edges: Array<{ __typename: 'FlagEdge', node?: { __typename: 'Flag', id: number, state: FlagState, flaggable: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'BrowseFeature', id: number, name: string, link: string } | { __typename: 'BrowseGene', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | { __typename: 'VariantGroup', id: number, name: string, link: string }, openActivity: { __typename: 'FlagEntityActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } }, resolutionActivity?: { __typename: 'ResolveFlagActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined } | undefined }> };
 
-export type FlagFragment = { __typename: 'Flag', id: number, state: FlagState, flaggable: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'BrowseFeature', id: number, name: string, link: string } | { __typename: 'BrowseGene', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | { __typename: 'VariantGroup', id: number, name: string, link: string }, openActivity: { __typename: 'FlagEntityActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } }, resolutionActivity?: { __typename: 'ResolveFlagActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined };
+export type FlagFragment = { __typename: 'Flag', id: number, state: FlagState, flaggable: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'BrowseFeature', id: number, name: string, link: string } | { __typename: 'BrowseGene', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | { __typename: 'VariantGroup', id: number, name: string, link: string }, openActivity: { __typename: 'FlagEntityActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } }, resolutionActivity?: { __typename: 'ResolveFlagActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined };
 
 export type FlagPopoverQueryVariables = Exact<{
   flagId: Scalars['Int'];
 }>;
 
 
-export type FlagPopoverQuery = { __typename: 'Query', flag?: { __typename: 'Flag', id: number, name: string, state: FlagState, createdAt: any, flaggingUser: { __typename: 'User', id: number, displayName: string, role: UserRole }, flaggable: { __typename: 'Assertion', id: number, link: string, name: string } | { __typename: 'BrowseFeature', id: number, link: string, name: string } | { __typename: 'BrowseGene', id: number, link: string, name: string } | { __typename: 'EvidenceItem', id: number, link: string, name: string } | { __typename: 'Gene', id: number, link: string, name: string } | { __typename: 'MolecularProfile', id: number, link: string, name: string } | { __typename: 'Variant', id: number, link: string, name: string } | { __typename: 'VariantGroup', id: number, link: string, name: string }, openActivity: { __typename: 'FlagEntityActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } } | undefined };
+export type FlagPopoverQuery = { __typename: 'Query', flag?: { __typename: 'Flag', id: number, name: string, state: FlagState, createdAt: any, flaggingUser: { __typename: 'User', id: number, displayName: string, role: UserRole }, flaggable: { __typename: 'Assertion', id: number, link: string, name: string } | { __typename: 'BrowseFeature', id: number, link: string, name: string } | { __typename: 'BrowseGene', id: number, link: string, name: string } | { __typename: 'EvidenceItem', id: number, link: string, name: string } | { __typename: 'Feature', id: number, link: string, name: string } | { __typename: 'Gene', id: number, link: string, name: string } | { __typename: 'MolecularProfile', id: number, link: string, name: string } | { __typename: 'Variant', id: number, link: string, name: string } | { __typename: 'VariantGroup', id: number, link: string, name: string }, openActivity: { __typename: 'FlagEntityActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } } | undefined };
 
-export type FlagPopoverFragment = { __typename: 'Flag', id: number, name: string, state: FlagState, createdAt: any, flaggingUser: { __typename: 'User', id: number, displayName: string, role: UserRole }, flaggable: { __typename: 'Assertion', id: number, link: string, name: string } | { __typename: 'BrowseFeature', id: number, link: string, name: string } | { __typename: 'BrowseGene', id: number, link: string, name: string } | { __typename: 'EvidenceItem', id: number, link: string, name: string } | { __typename: 'Gene', id: number, link: string, name: string } | { __typename: 'MolecularProfile', id: number, link: string, name: string } | { __typename: 'Variant', id: number, link: string, name: string } | { __typename: 'VariantGroup', id: number, link: string, name: string }, openActivity: { __typename: 'FlagEntityActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } };
+export type FlagPopoverFragment = { __typename: 'Flag', id: number, name: string, state: FlagState, createdAt: any, flaggingUser: { __typename: 'User', id: number, displayName: string, role: UserRole }, flaggable: { __typename: 'Assertion', id: number, link: string, name: string } | { __typename: 'BrowseFeature', id: number, link: string, name: string } | { __typename: 'BrowseGene', id: number, link: string, name: string } | { __typename: 'EvidenceItem', id: number, link: string, name: string } | { __typename: 'Feature', id: number, link: string, name: string } | { __typename: 'Gene', id: number, link: string, name: string } | { __typename: 'MolecularProfile', id: number, link: string, name: string } | { __typename: 'Variant', id: number, link: string, name: string } | { __typename: 'VariantGroup', id: number, link: string, name: string }, openActivity: { __typename: 'FlagEntityActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } };
 
 export type GenePopoverQueryVariables = Exact<{
   geneId: Scalars['Int'];
@@ -6758,9 +6787,9 @@ export type VariantPopoverQueryVariables = Exact<{
 }>;
 
 
-export type VariantPopoverQuery = { __typename: 'Query', variant?: { __typename: 'Variant', id: number, name: string, variantAliases: Array<string>, alleleRegistryId?: string | undefined, feature: { __typename: 'Gene', id: number, name: string, link: string }, molecularProfiles: { __typename: 'MolecularProfileConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, flags: { __typename: 'FlagConnection', totalCount: number } } | undefined };
+export type VariantPopoverQuery = { __typename: 'Query', variant?: { __typename: 'Variant', id: number, name: string, variantAliases: Array<string>, alleleRegistryId?: string | undefined, feature: { __typename: 'Feature', id: number, name: string, link: string }, molecularProfiles: { __typename: 'MolecularProfileConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, flags: { __typename: 'FlagConnection', totalCount: number } } | undefined };
 
-export type VariantPopoverFieldsFragment = { __typename: 'Variant', id: number, name: string, variantAliases: Array<string>, alleleRegistryId?: string | undefined, feature: { __typename: 'Gene', id: number, name: string, link: string }, molecularProfiles: { __typename: 'MolecularProfileConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, flags: { __typename: 'FlagConnection', totalCount: number } };
+export type VariantPopoverFieldsFragment = { __typename: 'Variant', id: number, name: string, variantAliases: Array<string>, alleleRegistryId?: string | undefined, feature: { __typename: 'Feature', id: number, name: string, link: string }, molecularProfiles: { __typename: 'MolecularProfileConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, flags: { __typename: 'FlagConnection', totalCount: number } };
 
 export type VariantsMenuQueryVariables = Exact<{
   geneId?: InputMaybe<Scalars['Int']>;
@@ -7542,18 +7571,18 @@ export type FeatureDetailQueryVariables = Exact<{
 }>;
 
 
-export type FeatureDetailQuery = { __typename: 'Query', feature?: { __typename: 'Gene', officialName: string, id: number, name: string } | undefined };
+export type FeatureDetailQuery = { __typename: 'Query', feature?: { __typename: 'Feature', id: number, name: string, featureInstance: { __typename: 'Gene', officialName: string }, flags: { __typename: 'FlagConnection', totalCount: number } } | undefined };
 
-export type FeatureDetailFieldsFragment = { __typename: 'Gene', officialName: string, id: number, name: string };
+export type FeatureDetailFieldsFragment = { __typename: 'Feature', id: number, name: string, featureInstance: { __typename: 'Gene', officialName: string }, flags: { __typename: 'FlagConnection', totalCount: number } };
 
 export type FeaturesSummaryQueryVariables = Exact<{
   featureId: Scalars['Int'];
 }>;
 
 
-export type FeaturesSummaryQuery = { __typename: 'Query', feature?: { __typename: 'Gene', entrezId: number, officialName: string, myGeneInfoDetails?: any | undefined, description: string, featureAliases: Array<string>, id: number, name: string, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceUrl?: string | undefined, displayType: string, sourceType: SourceSource }>, variants: { __typename: 'VariantConnection', edges: Array<{ __typename: 'VariantEdge', node?: { __typename: 'Variant', id: number, name: string } | undefined }> } } | undefined };
+export type FeaturesSummaryQuery = { __typename: 'Query', feature?: { __typename: 'Feature', id: number, name: string, featureInstance: { __typename: 'Gene', id: number, description: string, featureAliases: Array<string>, name: string, entrezId: number, officialName: string, myGeneInfoDetails?: any | undefined, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceUrl?: string | undefined, displayType: string, sourceType: SourceSource }> } } | undefined };
 
-export type FeatureSummaryFieldsFragment = { __typename: 'Gene', entrezId: number, officialName: string, myGeneInfoDetails?: any | undefined, description: string, featureAliases: Array<string>, id: number, name: string, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceUrl?: string | undefined, displayType: string, sourceType: SourceSource }>, variants: { __typename: 'VariantConnection', edges: Array<{ __typename: 'VariantEdge', node?: { __typename: 'Variant', id: number, name: string } | undefined }> } };
+export type FeatureSummaryFieldsFragment = { __typename: 'Feature', id: number, name: string, featureInstance: { __typename: 'Gene', id: number, description: string, featureAliases: Array<string>, name: string, entrezId: number, officialName: string, myGeneInfoDetails?: any | undefined, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceUrl?: string | undefined, displayType: string, sourceType: SourceSource }> } };
 
 export type GeneDetailQueryVariables = Exact<{
   geneId: Scalars['Int'];
@@ -7569,9 +7598,9 @@ export type GenesSummaryQueryVariables = Exact<{
 }>;
 
 
-export type GenesSummaryQuery = { __typename: 'Query', gene?: { __typename: 'Gene', description: string, entrezId: number, featureAliases: Array<string>, id: number, name: string, officialName: string, myGeneInfoDetails?: any | undefined, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceUrl?: string | undefined, displayType: string, sourceType: SourceSource }>, variants: { __typename: 'VariantConnection', edges: Array<{ __typename: 'VariantEdge', node?: { __typename: 'Variant', id: number, name: string } | undefined }> }, lastSubmittedRevisionEvent?: { __typename: 'Event', originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, lastAcceptedRevisionEvent?: { __typename: 'Event', originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined } | undefined };
+export type GenesSummaryQuery = { __typename: 'Query', gene?: { __typename: 'Gene', description: string, entrezId: number, featureAliases: Array<string>, id: number, name: string, officialName: string, myGeneInfoDetails?: any | undefined, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceUrl?: string | undefined, displayType: string, sourceType: SourceSource }> } | undefined };
 
-export type GeneSummaryFieldsFragment = { __typename: 'Gene', description: string, entrezId: number, featureAliases: Array<string>, id: number, name: string, officialName: string, myGeneInfoDetails?: any | undefined, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceUrl?: string | undefined, displayType: string, sourceType: SourceSource }>, variants: { __typename: 'VariantConnection', edges: Array<{ __typename: 'VariantEdge', node?: { __typename: 'Variant', id: number, name: string } | undefined }> }, lastSubmittedRevisionEvent?: { __typename: 'Event', originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, lastAcceptedRevisionEvent?: { __typename: 'Event', originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined };
+export type GeneSummaryFieldsFragment = { __typename: 'Gene', description: string, entrezId: number, featureAliases: Array<string>, id: number, name: string, officialName: string, myGeneInfoDetails?: any | undefined, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceUrl?: string | undefined, displayType: string, sourceType: SourceSource }> };
 
 export type MolecularProfileDetailQueryVariables = Exact<{
   mpId: Scalars['Int'];
@@ -7769,18 +7798,18 @@ export type VariantDetailQueryVariables = Exact<{
 }>;
 
 
-export type VariantDetailQuery = { __typename: 'Query', variant?: { __typename: 'Variant', id: number, name: string, deprecated: boolean, deprecationReason?: VariantDeprecationReason | undefined, variantAliases: Array<string>, deprecationActivity?: { __typename: 'DeprecateVariantActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, feature: { __typename: 'Gene', id: number, name: string, link: string }, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number } } | undefined };
+export type VariantDetailQuery = { __typename: 'Query', variant?: { __typename: 'Variant', id: number, name: string, deprecated: boolean, deprecationReason?: VariantDeprecationReason | undefined, variantAliases: Array<string>, deprecationActivity?: { __typename: 'DeprecateVariantActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, feature: { __typename: 'Feature', id: number, name: string, link: string }, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number } } | undefined };
 
-export type VariantDetailFieldsFragment = { __typename: 'Variant', id: number, name: string, deprecated: boolean, deprecationReason?: VariantDeprecationReason | undefined, variantAliases: Array<string>, deprecationActivity?: { __typename: 'DeprecateVariantActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, feature: { __typename: 'Gene', id: number, name: string, link: string }, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number } };
+export type VariantDetailFieldsFragment = { __typename: 'Variant', id: number, name: string, deprecated: boolean, deprecationReason?: VariantDeprecationReason | undefined, variantAliases: Array<string>, deprecationActivity?: { __typename: 'DeprecateVariantActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, feature: { __typename: 'Feature', id: number, name: string, link: string }, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number } };
 
 export type VariantSummaryQueryVariables = Exact<{
   variantId: Scalars['Int'];
 }>;
 
 
-export type VariantSummaryQuery = { __typename: 'Query', variant?: { __typename: 'Variant', id: number, name: string, variantAliases: Array<string>, alleleRegistryId?: string | undefined, openCravatUrl?: string | undefined, maneSelectTranscript?: string | undefined, hgvsDescriptions: Array<string>, clinvarIds: Array<string>, referenceBuild?: ReferenceBuild | undefined, ensemblVersion?: number | undefined, referenceBases?: string | undefined, variantBases?: string | undefined, feature: { __typename: 'Gene', id: number, name: string, link: string }, variantTypes: Array<{ __typename: 'VariantType', id: number, link: string, soid: string, name: string }>, primaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, secondaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, myVariantInfo?: { __typename: 'MyVariantInfo', myVariantInfoId: string, caddConsequence: Array<string>, caddDetail: Array<string>, caddScore?: number | undefined, caddPhred?: number | undefined, clinvarClinicalSignificance: Array<string>, clinvarHgvsCoding: Array<string>, clinvarHgvsGenomic: Array<string>, clinvarHgvsNonCoding: Array<string>, clinvarHgvsProtein: Array<string>, clinvarId?: number | undefined, clinvarOmim?: string | undefined, cosmicId?: string | undefined, dbnsfpInterproDomain: Array<string>, dbsnpRsid?: string | undefined, eglClass?: string | undefined, eglHgvs: Array<string>, eglProtein?: string | undefined, eglTranscript?: string | undefined, exacAlleleCount?: number | undefined, exacAlleleFrequency?: number | undefined, exacAlleleNumber?: number | undefined, fathmmMklPrediction?: string | undefined, fathmmMklScore?: number | undefined, fathmmPrediction: Array<string>, fathmmScore: Array<number>, fitconsScore?: number | undefined, gerp?: number | undefined, gnomadExomeAlleleCount?: number | undefined, gnomadExomeAlleleFrequency?: number | undefined, gnomadExomeAlleleNumber?: number | undefined, gnomadExomeFilter?: string | undefined, gnomadGenomeAlleleCount?: number | undefined, gnomadGenomeAlleleFrequency?: number | undefined, gnomadGenomeAlleleNumber?: number | undefined, gnomadGenomeFilter?: string | undefined, lrtPrediction?: string | undefined, lrtScore?: number | undefined, metalrPrediction?: string | undefined, metalrScore?: number | undefined, metasvmPrediction?: string | undefined, metasvmScore?: number | undefined, mutationassessorPrediction: Array<string>, mutationassessorScore: Array<number>, mutationtasterPrediction: Array<string>, mutationtasterScore: Array<number>, phastcons100way?: number | undefined, phastcons30way?: number | undefined, phyloP100way?: number | undefined, phyloP30way?: number | undefined, polyphen2HdivPrediction: Array<string>, polyphen2HdivScore: Array<number>, polyphen2HvarPrediction: Array<string>, polyphen2HvarScore: Array<number>, proveanPrediction: Array<string>, proveanScore: Array<number>, revelScore?: Array<number> | undefined, siftPrediction: Array<string>, siftScore: Array<number>, siphy?: number | undefined, snpeffSnpEffect: Array<string>, snpeffSnpImpact: Array<string> } | undefined, lastSubmittedRevisionEvent?: { __typename: 'Event', originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, lastAcceptedRevisionEvent?: { __typename: 'Event', originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, creationActivity?: { __typename: 'CreateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, deprecationActivity?: { __typename: 'DeprecateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined } | undefined };
+export type VariantSummaryQuery = { __typename: 'Query', variant?: { __typename: 'Variant', id: number, name: string, variantAliases: Array<string>, alleleRegistryId?: string | undefined, openCravatUrl?: string | undefined, maneSelectTranscript?: string | undefined, hgvsDescriptions: Array<string>, clinvarIds: Array<string>, referenceBuild?: ReferenceBuild | undefined, ensemblVersion?: number | undefined, referenceBases?: string | undefined, variantBases?: string | undefined, feature: { __typename: 'Feature', id: number, name: string, link: string }, variantTypes: Array<{ __typename: 'VariantType', id: number, link: string, soid: string, name: string }>, primaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, secondaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, myVariantInfo?: { __typename: 'MyVariantInfo', myVariantInfoId: string, caddConsequence: Array<string>, caddDetail: Array<string>, caddScore?: number | undefined, caddPhred?: number | undefined, clinvarClinicalSignificance: Array<string>, clinvarHgvsCoding: Array<string>, clinvarHgvsGenomic: Array<string>, clinvarHgvsNonCoding: Array<string>, clinvarHgvsProtein: Array<string>, clinvarId?: number | undefined, clinvarOmim?: string | undefined, cosmicId?: string | undefined, dbnsfpInterproDomain: Array<string>, dbsnpRsid?: string | undefined, eglClass?: string | undefined, eglHgvs: Array<string>, eglProtein?: string | undefined, eglTranscript?: string | undefined, exacAlleleCount?: number | undefined, exacAlleleFrequency?: number | undefined, exacAlleleNumber?: number | undefined, fathmmMklPrediction?: string | undefined, fathmmMklScore?: number | undefined, fathmmPrediction: Array<string>, fathmmScore: Array<number>, fitconsScore?: number | undefined, gerp?: number | undefined, gnomadExomeAlleleCount?: number | undefined, gnomadExomeAlleleFrequency?: number | undefined, gnomadExomeAlleleNumber?: number | undefined, gnomadExomeFilter?: string | undefined, gnomadGenomeAlleleCount?: number | undefined, gnomadGenomeAlleleFrequency?: number | undefined, gnomadGenomeAlleleNumber?: number | undefined, gnomadGenomeFilter?: string | undefined, lrtPrediction?: string | undefined, lrtScore?: number | undefined, metalrPrediction?: string | undefined, metalrScore?: number | undefined, metasvmPrediction?: string | undefined, metasvmScore?: number | undefined, mutationassessorPrediction: Array<string>, mutationassessorScore: Array<number>, mutationtasterPrediction: Array<string>, mutationtasterScore: Array<number>, phastcons100way?: number | undefined, phastcons30way?: number | undefined, phyloP100way?: number | undefined, phyloP30way?: number | undefined, polyphen2HdivPrediction: Array<string>, polyphen2HdivScore: Array<number>, polyphen2HvarPrediction: Array<string>, polyphen2HvarScore: Array<number>, proveanPrediction: Array<string>, proveanScore: Array<number>, revelScore?: Array<number> | undefined, siftPrediction: Array<string>, siftScore: Array<number>, siphy?: number | undefined, snpeffSnpEffect: Array<string>, snpeffSnpImpact: Array<string> } | undefined, lastSubmittedRevisionEvent?: { __typename: 'Event', originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, lastAcceptedRevisionEvent?: { __typename: 'Event', originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, creationActivity?: { __typename: 'CreateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, deprecationActivity?: { __typename: 'DeprecateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined } | undefined };
 
-export type VariantSummaryFieldsFragment = { __typename: 'Variant', id: number, name: string, variantAliases: Array<string>, alleleRegistryId?: string | undefined, openCravatUrl?: string | undefined, maneSelectTranscript?: string | undefined, hgvsDescriptions: Array<string>, clinvarIds: Array<string>, referenceBuild?: ReferenceBuild | undefined, ensemblVersion?: number | undefined, referenceBases?: string | undefined, variantBases?: string | undefined, feature: { __typename: 'Gene', id: number, name: string, link: string }, variantTypes: Array<{ __typename: 'VariantType', id: number, link: string, soid: string, name: string }>, primaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, secondaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, myVariantInfo?: { __typename: 'MyVariantInfo', myVariantInfoId: string, caddConsequence: Array<string>, caddDetail: Array<string>, caddScore?: number | undefined, caddPhred?: number | undefined, clinvarClinicalSignificance: Array<string>, clinvarHgvsCoding: Array<string>, clinvarHgvsGenomic: Array<string>, clinvarHgvsNonCoding: Array<string>, clinvarHgvsProtein: Array<string>, clinvarId?: number | undefined, clinvarOmim?: string | undefined, cosmicId?: string | undefined, dbnsfpInterproDomain: Array<string>, dbsnpRsid?: string | undefined, eglClass?: string | undefined, eglHgvs: Array<string>, eglProtein?: string | undefined, eglTranscript?: string | undefined, exacAlleleCount?: number | undefined, exacAlleleFrequency?: number | undefined, exacAlleleNumber?: number | undefined, fathmmMklPrediction?: string | undefined, fathmmMklScore?: number | undefined, fathmmPrediction: Array<string>, fathmmScore: Array<number>, fitconsScore?: number | undefined, gerp?: number | undefined, gnomadExomeAlleleCount?: number | undefined, gnomadExomeAlleleFrequency?: number | undefined, gnomadExomeAlleleNumber?: number | undefined, gnomadExomeFilter?: string | undefined, gnomadGenomeAlleleCount?: number | undefined, gnomadGenomeAlleleFrequency?: number | undefined, gnomadGenomeAlleleNumber?: number | undefined, gnomadGenomeFilter?: string | undefined, lrtPrediction?: string | undefined, lrtScore?: number | undefined, metalrPrediction?: string | undefined, metalrScore?: number | undefined, metasvmPrediction?: string | undefined, metasvmScore?: number | undefined, mutationassessorPrediction: Array<string>, mutationassessorScore: Array<number>, mutationtasterPrediction: Array<string>, mutationtasterScore: Array<number>, phastcons100way?: number | undefined, phastcons30way?: number | undefined, phyloP100way?: number | undefined, phyloP30way?: number | undefined, polyphen2HdivPrediction: Array<string>, polyphen2HdivScore: Array<number>, polyphen2HvarPrediction: Array<string>, polyphen2HvarScore: Array<number>, proveanPrediction: Array<string>, proveanScore: Array<number>, revelScore?: Array<number> | undefined, siftPrediction: Array<string>, siftScore: Array<number>, siphy?: number | undefined, snpeffSnpEffect: Array<string>, snpeffSnpImpact: Array<string> } | undefined, lastSubmittedRevisionEvent?: { __typename: 'Event', originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, lastAcceptedRevisionEvent?: { __typename: 'Event', originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, creationActivity?: { __typename: 'CreateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, deprecationActivity?: { __typename: 'DeprecateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined };
+export type VariantSummaryFieldsFragment = { __typename: 'Variant', id: number, name: string, variantAliases: Array<string>, alleleRegistryId?: string | undefined, openCravatUrl?: string | undefined, maneSelectTranscript?: string | undefined, hgvsDescriptions: Array<string>, clinvarIds: Array<string>, referenceBuild?: ReferenceBuild | undefined, ensemblVersion?: number | undefined, referenceBases?: string | undefined, variantBases?: string | undefined, feature: { __typename: 'Feature', id: number, name: string, link: string }, variantTypes: Array<{ __typename: 'VariantType', id: number, link: string, soid: string, name: string }>, primaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, secondaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, myVariantInfo?: { __typename: 'MyVariantInfo', myVariantInfoId: string, caddConsequence: Array<string>, caddDetail: Array<string>, caddScore?: number | undefined, caddPhred?: number | undefined, clinvarClinicalSignificance: Array<string>, clinvarHgvsCoding: Array<string>, clinvarHgvsGenomic: Array<string>, clinvarHgvsNonCoding: Array<string>, clinvarHgvsProtein: Array<string>, clinvarId?: number | undefined, clinvarOmim?: string | undefined, cosmicId?: string | undefined, dbnsfpInterproDomain: Array<string>, dbsnpRsid?: string | undefined, eglClass?: string | undefined, eglHgvs: Array<string>, eglProtein?: string | undefined, eglTranscript?: string | undefined, exacAlleleCount?: number | undefined, exacAlleleFrequency?: number | undefined, exacAlleleNumber?: number | undefined, fathmmMklPrediction?: string | undefined, fathmmMklScore?: number | undefined, fathmmPrediction: Array<string>, fathmmScore: Array<number>, fitconsScore?: number | undefined, gerp?: number | undefined, gnomadExomeAlleleCount?: number | undefined, gnomadExomeAlleleFrequency?: number | undefined, gnomadExomeAlleleNumber?: number | undefined, gnomadExomeFilter?: string | undefined, gnomadGenomeAlleleCount?: number | undefined, gnomadGenomeAlleleFrequency?: number | undefined, gnomadGenomeAlleleNumber?: number | undefined, gnomadGenomeFilter?: string | undefined, lrtPrediction?: string | undefined, lrtScore?: number | undefined, metalrPrediction?: string | undefined, metalrScore?: number | undefined, metasvmPrediction?: string | undefined, metasvmScore?: number | undefined, mutationassessorPrediction: Array<string>, mutationassessorScore: Array<number>, mutationtasterPrediction: Array<string>, mutationtasterScore: Array<number>, phastcons100way?: number | undefined, phastcons30way?: number | undefined, phyloP100way?: number | undefined, phyloP30way?: number | undefined, polyphen2HdivPrediction: Array<string>, polyphen2HdivScore: Array<number>, polyphen2HvarPrediction: Array<string>, polyphen2HvarScore: Array<number>, proveanPrediction: Array<string>, proveanScore: Array<number>, revelScore?: Array<number> | undefined, siftPrediction: Array<string>, siftScore: Array<number>, siphy?: number | undefined, snpeffSnpEffect: Array<string>, snpeffSnpImpact: Array<string> } | undefined, lastSubmittedRevisionEvent?: { __typename: 'Event', originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, lastAcceptedRevisionEvent?: { __typename: 'Event', originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, creationActivity?: { __typename: 'CreateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, deprecationActivity?: { __typename: 'DeprecateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined };
 
 export type MyVariantInfoFieldsFragment = { __typename: 'MyVariantInfo', myVariantInfoId: string, caddConsequence: Array<string>, caddDetail: Array<string>, caddScore?: number | undefined, caddPhred?: number | undefined, clinvarClinicalSignificance: Array<string>, clinvarHgvsCoding: Array<string>, clinvarHgvsGenomic: Array<string>, clinvarHgvsNonCoding: Array<string>, clinvarHgvsProtein: Array<string>, clinvarId?: number | undefined, clinvarOmim?: string | undefined, cosmicId?: string | undefined, dbnsfpInterproDomain: Array<string>, dbsnpRsid?: string | undefined, eglClass?: string | undefined, eglHgvs: Array<string>, eglProtein?: string | undefined, eglTranscript?: string | undefined, exacAlleleCount?: number | undefined, exacAlleleFrequency?: number | undefined, exacAlleleNumber?: number | undefined, fathmmMklPrediction?: string | undefined, fathmmMklScore?: number | undefined, fathmmPrediction: Array<string>, fathmmScore: Array<number>, fitconsScore?: number | undefined, gerp?: number | undefined, gnomadExomeAlleleCount?: number | undefined, gnomadExomeAlleleFrequency?: number | undefined, gnomadExomeAlleleNumber?: number | undefined, gnomadExomeFilter?: string | undefined, gnomadGenomeAlleleCount?: number | undefined, gnomadGenomeAlleleFrequency?: number | undefined, gnomadGenomeAlleleNumber?: number | undefined, gnomadGenomeFilter?: string | undefined, lrtPrediction?: string | undefined, lrtScore?: number | undefined, metalrPrediction?: string | undefined, metalrScore?: number | undefined, metasvmPrediction?: string | undefined, metasvmScore?: number | undefined, mutationassessorPrediction: Array<string>, mutationassessorScore: Array<number>, mutationtasterPrediction: Array<string>, mutationtasterScore: Array<number>, phastcons100way?: number | undefined, phastcons30way?: number | undefined, phyloP100way?: number | undefined, phyloP30way?: number | undefined, polyphen2HdivPrediction: Array<string>, polyphen2HdivScore: Array<number>, polyphen2HvarPrediction: Array<string>, polyphen2HvarScore: Array<number>, proveanPrediction: Array<string>, proveanScore: Array<number>, revelScore?: Array<number> | undefined, siftPrediction: Array<string>, siftScore: Array<number>, siphy?: number | undefined, snpeffSnpEffect: Array<string>, snpeffSnpImpact: Array<string> };
 
@@ -8253,16 +8282,21 @@ export const EvidenceGridFieldsFragmentDoc = gql`
 }
     ${MolecularProfileParsedNameFragmentDoc}`;
 export const FeaturePopoverFragmentDoc = gql`
-    fragment featurePopover on FeatureInterface {
+    fragment featurePopover on Feature {
   id
   name
-  ... on Gene {
-    officialName
+  featureInstance {
+    ... on Gene {
+      officialName
+    }
   }
   featureAliases
   variants {
     totalCount
   }
+  flags(state: OPEN) {
+    totalCount
+  }
 }
     `;
 export const BrowseFeaturesFieldsFragmentDoc = gql`
@@ -8270,6 +8304,7 @@ export const BrowseFeaturesFieldsFragmentDoc = gql`
   id
   name
   link
+  flagged
   featureAliases
   diseases {
     name
@@ -9768,42 +9803,43 @@ export const EvidenceSummaryFieldsFragmentDoc = gql`
     ${MolecularProfileParsedNameFragmentDoc}
 ${ParsedCommentFragmentFragmentDoc}`;
 export const FeatureDetailFieldsFragmentDoc = gql`
-    fragment FeatureDetailFields on FeatureInterface {
+    fragment FeatureDetailFields on Feature {
   id
   name
-  ... on Gene {
-    officialName
+  featureInstance {
+    ... on Gene {
+      officialName
+    }
+  }
+  flags(state: OPEN) {
+    totalCount
   }
 }
     `;
 export const FeatureSummaryFieldsFragmentDoc = gql`
-    fragment FeatureSummaryFields on FeatureInterface {
-  __typename
-  description
-  featureAliases
+    fragment FeatureSummaryFields on Feature {
   id
   name
-  sources {
-    id
-    citation
-    link
-    sourceUrl
-    displayType
-    sourceType
-  }
-  variants {
-    edges {
-      node {
+  featureInstance {
+    __typename
+    ... on Gene {
+      id
+      description
+      featureAliases
+      name
+      sources {
         id
-        name
+        citation
+        link
+        sourceUrl
+        displayType
+        sourceType
       }
+      entrezId
+      officialName
+      myGeneInfoDetails
     }
   }
-  ... on Gene {
-    entrezId
-    officialName
-    myGeneInfoDetails
-  }
 }
     `;
 export const GeneDetailFieldsFragmentDoc = gql`
@@ -9839,31 +9875,7 @@ export const GeneSummaryFieldsFragmentDoc = gql`
     displayType
     sourceType
   }
-  variants {
-    edges {
-      node {
-        id
-        name
-      }
-    }
-  }
   myGeneInfoDetails
-  lastSubmittedRevisionEvent {
-    originatingUser {
-      id
-      displayName
-      role
-      profileImagePath(size: 32)
-    }
-  }
-  lastAcceptedRevisionEvent {
-    originatingUser {
-      id
-      displayName
-      role
-      profileImagePath(size: 32)
-    }
-  }
 }
     `;
 export const MolecularProfileDetailFieldsFragmentDoc = gql`
diff --git a/client/src/app/generated/civic.possible-types.ts b/client/src/app/generated/civic.possible-types.ts
index 23c95d1b9..13c50559a 100644
--- a/client/src/app/generated/civic.possible-types.ts
+++ b/client/src/app/generated/civic.possible-types.ts
@@ -65,7 +65,7 @@
       "Variant",
       "VariantGroup"
     ],
-    "FeatureInterface": [
+    "FeatureInstance": [
       "Gene"
     ],
     "Flaggable": [
@@ -73,6 +73,7 @@
       "BrowseFeature",
       "BrowseGene",
       "EvidenceItem",
+      "Feature",
       "Gene",
       "MolecularProfile",
       "Variant",
diff --git a/client/src/app/generated/server.model.graphql b/client/src/app/generated/server.model.graphql
index a1b08b60f..3a102a52b 100644
--- a/client/src/app/generated/server.model.graphql
+++ b/client/src/app/generated/server.model.graphql
@@ -2914,9 +2914,56 @@ type FdaCode {
 """
 The Feature that a Variant can belong to
 """
-interface FeatureInterface {
+type Feature implements Flaggable {
   description: String!
   featureAliases: [String!]!
+  featureInstance: FeatureInstance!
+  flagged: Boolean!
+
+  """
+  List and filter flags.
+  """
+  flags(
+    """
+    Returns the elements in the list that come after the specified cursor.
+    """
+    after: String
+
+    """
+    Returns the elements in the list that come before the specified cursor.
+    """
+    before: String
+
+    """
+    Returns the first _n_ elements from the list.
+    """
+    first: Int
+
+    """
+    Limit to flags added by a certain user
+    """
+    flaggingUserId: Int
+
+    """
+    Returns the last _n_ elements from the list.
+    """
+    last: Int
+
+    """
+    Limit to flags resolved by a certain user
+    """
+    resolvingUserId: Int
+
+    """
+    Sort order for the flags. Defaults to most recent.
+    """
+    sortBy: DateSort
+
+    """
+    Limit to flags in a particular state
+    """
+    state: FlagState
+  ): FlagConnection!
   id: Int!
   link: String!
   name: String!
@@ -2953,6 +3000,11 @@ interface FeatureInterface {
   ): VariantConnection!
 }
 
+"""
+The specific type of a feature instance
+"""
+union FeatureInstance = Gene
+
 input FeaturesSort {
   """
   Available columns for sorting
@@ -3272,6 +3324,7 @@ Enumeration of all entities in CIViC that can be flagged.
 enum FlaggableEntities {
   ASSERTION
   EVIDENCE_ITEM
+  FEATURE
   GENE
   MOLECULAR_PROFILE
   VARIANT
@@ -3293,7 +3346,10 @@ input FlaggableInput {
   id: Int!
 }
 
-type Gene implements Commentable & EventSubject & FeatureInterface & Flaggable & MolecularProfileComponent & WithRevisions {
+"""
+The Feature that a Variant can belong to
+"""
+type Gene implements Commentable & EventSubject & Flaggable & MolecularProfileComponent & WithRevisions {
   """
   List and filter comments.
   """
@@ -3379,6 +3435,7 @@ type Gene implements Commentable & EventSubject & FeatureInterface & Flaggable &
     sortBy: DateSort
   ): EventConnection!
   featureAliases: [String!]!
+  featureInstance: FeatureInstance!
   flagged: Boolean!
 
   """
@@ -6178,7 +6235,7 @@ type Query {
   """
   Find a single feature by CIViC ID
   """
-  feature(id: Int): Gene
+  feature(id: Int): Feature
 
   """
   Find a flag by CIViC ID
@@ -9035,7 +9092,7 @@ type Variant implements Commentable & EventOriginObject & EventSubject & Flaggab
     """
     sortBy: DateSort
   ): EventConnection!
-  feature: FeatureInterface!
+  feature: Feature!
   flagged: Boolean!
 
   """
diff --git a/client/src/app/generated/server.schema.json b/client/src/app/generated/server.schema.json
index 34ea43eae..84edde296 100644
--- a/client/src/app/generated/server.schema.json
+++ b/client/src/app/generated/server.schema.json
@@ -14572,8 +14572,8 @@
           "possibleTypes": null
         },
         {
-          "kind": "INTERFACE",
-          "name": "FeatureInterface",
+          "kind": "OBJECT",
+          "name": "Feature",
           "description": "The Feature that a Variant can belong to",
           "fields": [
             {
@@ -14616,6 +14616,151 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "featureInstance",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "UNION",
+                  "name": "FeatureInstance",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "flagged",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Boolean",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "flags",
+              "description": "List and filter flags.",
+              "args": [
+                {
+                  "name": "flaggingUserId",
+                  "description": "Limit to flags added by a certain user",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "resolvingUserId",
+                  "description": "Limit to flags resolved by a certain user",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "state",
+                  "description": "Limit to flags in a particular state",
+                  "type": {
+                    "kind": "ENUM",
+                    "name": "FlagState",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "sortBy",
+                  "description": "Sort order for the flags. Defaults to most recent.",
+                  "type": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "DateSort",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "after",
+                  "description": "Returns the elements in the list that come after the specified cursor.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "before",
+                  "description": "Returns the elements in the list that come before the specified cursor.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "first",
+                  "description": "Returns the first _n_ elements from the list.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "last",
+                  "description": "Returns the last _n_ elements from the list.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                }
+              ],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "FlagConnection",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "id",
               "description": null,
@@ -14767,6 +14912,22 @@
             }
           ],
           "inputFields": null,
+          "interfaces": [
+            {
+              "kind": "INTERFACE",
+              "name": "Flaggable",
+              "ofType": null
+            }
+          ],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "UNION",
+          "name": "FeatureInstance",
+          "description": "The specific type of a feature instance",
+          "fields": null,
+          "inputFields": null,
           "interfaces": null,
           "enumValues": null,
           "possibleTypes": [
@@ -16113,6 +16274,11 @@
               "name": "EvidenceItem",
               "ofType": null
             },
+            {
+              "kind": "OBJECT",
+              "name": "Feature",
+              "ofType": null
+            },
             {
               "kind": "OBJECT",
               "name": "Gene",
@@ -16149,6 +16315,12 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "FEATURE",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "VARIANT",
               "description": null,
@@ -16238,7 +16410,7 @@
         {
           "kind": "OBJECT",
           "name": "Gene",
-          "description": null,
+          "description": "The Feature that a Variant can belong to",
           "fields": [
             {
               "name": "comments",
@@ -16534,6 +16706,22 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "featureInstance",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "UNION",
+                  "name": "FeatureInstance",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "flagged",
               "description": null,
@@ -17004,11 +17192,6 @@
           ],
           "inputFields": null,
           "interfaces": [
-            {
-              "kind": "INTERFACE",
-              "name": "FeatureInterface",
-              "ofType": null
-            },
             {
               "kind": "INTERFACE",
               "name": "Commentable",
@@ -17016,22 +17199,22 @@
             },
             {
               "kind": "INTERFACE",
-              "name": "Flaggable",
+              "name": "WithRevisions",
               "ofType": null
             },
             {
               "kind": "INTERFACE",
-              "name": "WithRevisions",
+              "name": "EventSubject",
               "ofType": null
             },
             {
               "kind": "INTERFACE",
-              "name": "EventSubject",
+              "name": "MolecularProfileComponent",
               "ofType": null
             },
             {
               "kind": "INTERFACE",
-              "name": "MolecularProfileComponent",
+              "name": "Flaggable",
               "ofType": null
             }
           ],
@@ -29030,7 +29213,7 @@
               ],
               "type": {
                 "kind": "OBJECT",
-                "name": "Gene",
+                "name": "Feature",
                 "ofType": null
               },
               "isDeprecated": false,
@@ -41510,8 +41693,8 @@
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "INTERFACE",
-                  "name": "FeatureInterface",
+                  "kind": "OBJECT",
+                  "name": "Feature",
                   "ofType": null
                 }
               },
diff --git a/client/src/app/views/assertions/assertions-detail/assertions-detail.view.ts b/client/src/app/views/assertions/assertions-detail/assertions-detail.view.ts
index c384b160b..0d7f0dc0a 100644
--- a/client/src/app/views/assertions/assertions-detail/assertions-detail.view.ts
+++ b/client/src/app/views/assertions/assertions-detail/assertions-detail.view.ts
@@ -97,6 +97,11 @@ export class AssertionsDetailView implements OnDestroy {
                     badgeCount: assertionResp?.revisions.totalCount,
                     ...tab,
                   }
+                } else if (tab.tabLabel === 'Flags') {
+                  return {
+                    badgeCount: assertionResp?.flags.totalCount,
+                    ...tab,
+                  }
                 } else if (tab.tabLabel === 'Comments') {
                   return {
                     badgeCount: assertionResp?.comments.totalCount,
diff --git a/client/src/app/views/evidence/evidence-detail/evidence-detail.view.ts b/client/src/app/views/evidence/evidence-detail/evidence-detail.view.ts
index a34cebbdc..4e06ce138 100644
--- a/client/src/app/views/evidence/evidence-detail/evidence-detail.view.ts
+++ b/client/src/app/views/evidence/evidence-detail/evidence-detail.view.ts
@@ -97,6 +97,11 @@ export class EvidenceDetailView implements OnDestroy {
                     badgeCount: evidenceResponse?.revisions.totalCount,
                     ...tab,
                   }
+                } else if (tab.tabLabel === 'Flags') {
+                  return {
+                    badgeCount: evidenceResponse?.flags.totalCount,
+                    ...tab,
+                  }
                 } else if (tab.tabLabel === 'Comments') {
                   return {
                     badgeCount: evidenceResponse?.comments.totalCount,
diff --git a/client/src/app/views/features/features-detail/features-detail.query.gql b/client/src/app/views/features/features-detail/features-detail.query.gql
index 515a7b468..f4f15ebcb 100644
--- a/client/src/app/views/features/features-detail/features-detail.query.gql
+++ b/client/src/app/views/features/features-detail/features-detail.query.gql
@@ -4,15 +4,17 @@ query FeatureDetail($featureId: Int!) {
   }
 }
 
-fragment FeatureDetailFields on FeatureInterface {
+fragment FeatureDetailFields on Feature {
   id
   name
-  ... on Gene {
-    officialName
+  featureInstance {
+    ... on Gene {
+      officialName
+    }
+  }
+  flags(state: OPEN) {
+    totalCount
   }
-  # flags(state: OPEN) {
-  #   totalCount
-  # }
   # revisions(status: NEW) {
   #   totalCount
   # }
diff --git a/client/src/app/views/features/features-detail/features-detail.view.html b/client/src/app/views/features/features-detail/features-detail.view.html
index 9ae973ef7..79c517669 100644
--- a/client/src/app/views/features/features-detail/features-detail.view.html
+++ b/client/src/app/views/features/features-detail/features-detail.view.html
@@ -1,24 +1,26 @@
 <ng-container *ngIf="feature$ | async as feature">
   <cvc-section-navigation [displayName]="feature.name"> </cvc-section-navigation>
-  <div>
-<!--     cvcFlaggable
-    [flags]="flagsTotal$ | ngrxPush"> -->
+  <div
+    cvcFlaggable
+    [flags]="flagsTotal$ | ngrxPush">
     <nz-page-header class="site-page-header">
       <!-- title -->
-      <nz-page-header-title>
-        <!-- cvcFlaggableOptions
-        [ngClass]="{ 'flagged': feature.flags.totalCount > 0 }"> -->
+      <nz-page-header-title
+        cvcFlaggableOptions
+        [ngClass]="{ 'flagged': feature.flags.totalCount > 0 }">
         <i
           nz-icon
           nzTheme="twotone"
           [nzTwotoneColor]="'Gene' | entityColor"
           nzType="civic-gene"></i>
-        {{ feature.name }}
+        {{ feature.featureInstance.__typename }} - {{ feature.name }}
       </nz-page-header-title>
 
       <!-- subtitle -->
       <nz-page-header-subtitle>
-        {{ feature.officialName }}
+        <ng-container *ngIf="feature.featureInstance.__typename == 'Gene'">
+          {{ feature.featureInstance.officialName }}
+        </ng-container>
       </nz-page-header-subtitle>
 
       <!-- header action btns, actions menu -->
diff --git a/client/src/app/views/features/features-detail/features-detail.view.ts b/client/src/app/views/features/features-detail/features-detail.view.ts
index 295576e2a..ef2615c61 100644
--- a/client/src/app/views/features/features-detail/features-detail.view.ts
+++ b/client/src/app/views/features/features-detail/features-detail.view.ts
@@ -22,7 +22,7 @@ export class FeaturesDetailView implements OnDestroy {
   loading$?: Observable<boolean>
   feature$?: Observable<Maybe<FeatureDetailFieldsFragment>>
   viewer$: Observable<Viewer>
-  //flagsTotal$?: Observable<number>
+  flagsTotal$?: Observable<number>
   routeSub: Subscription
   subscribable?: SubscribableInput
 
@@ -71,7 +71,7 @@ export class FeaturesDetailView implements OnDestroy {
 
       this.feature$ = observable.pipe(pluck('data', 'feature'))
 
-      //this.flagsTotal$ = this.feature$.pipe(pluck('flags', 'totalCount'))
+      this.flagsTotal$ = this.feature$.pipe(pluck('flags', 'totalCount'))
 
       this.feature$
         .pipe(takeUntil(this.destroy$))
@@ -85,6 +85,11 @@ export class FeaturesDetailView implements OnDestroy {
                     badgeCount: 0,
                     ...tab,
                   }
+                } else if (tab.tabLabel === 'Flags') {
+                  return {
+                    badgeCount: featureResp?.flags.totalCount,
+                    ...tab,
+                  }
                 } else if (tab.tabLabel === 'Comments') {
                   return {
                     //badgeCount: featureResp?.comments.totalCount,
diff --git a/client/src/app/views/features/features-detail/features-flags/features-flags.page.ts b/client/src/app/views/features/features-detail/features-flags/features-flags.page.ts
index 4384f138c..302e91f97 100644
--- a/client/src/app/views/features/features-detail/features-flags/features-flags.page.ts
+++ b/client/src/app/views/features/features-detail/features-flags/features-flags.page.ts
@@ -14,7 +14,7 @@ export class FeaturesFlagsPage implements OnInit {
     const geneId: number = +this.route.snapshot.params['featureId']
 
     this.flaggable = {
-      entityType: FlaggableEntities.Gene,
+      entityType: FlaggableEntities.Feature,
       id: geneId,
     }
   }
diff --git a/client/src/app/views/features/features-detail/features-summary/features-summary.page.html b/client/src/app/views/features/features-detail/features-summary/features-summary.page.html
index d63faf877..d2b9edd2a 100644
--- a/client/src/app/views/features/features-detail/features-summary/features-summary.page.html
+++ b/client/src/app/views/features/features-detail/features-summary/features-summary.page.html
@@ -1,8 +1,8 @@
 <ng-container *ngIf=" (feature$ | ngrxPush) as feature">
   <nz-row [nzGutter]="[8,16]">
-    <ng-container [ngSwitch]="feature.__typename">
+    <ng-container [ngSwitch]="feature.featureInstance.__typename">
       <span *ngSwitchCase="'Gene'">
-        <cvc-genes-summary [gene]="feature"></cvc-genes-summary>
+        <cvc-genes-summary [gene]="feature.featureInstance"></cvc-genes-summary>
       </span>
     </ng-container>
 
diff --git a/client/src/app/views/features/features-detail/features-summary/features-summary.query.gql b/client/src/app/views/features/features-detail/features-summary/features-summary.query.gql
index 3d249cf75..375e9a002 100644
--- a/client/src/app/views/features/features-detail/features-summary/features-summary.query.gql
+++ b/client/src/app/views/features/features-detail/features-summary/features-summary.query.gql
@@ -4,33 +4,29 @@ query FeaturesSummary($featureId: Int!) {
   }
 }
 
-fragment FeatureSummaryFields on FeatureInterface {
-  __typename
-  description
-  featureAliases
+fragment FeatureSummaryFields on Feature{
   id
   name
-  sources {
-    id
-    citation
-    link
-    sourceUrl
-    displayType
-    sourceType
-  }
-  variants {
-    edges {
-      node {
+  featureInstance {
+    __typename
+    ... on Gene {
+      id
+      description
+      featureAliases
+      name
+      sources {
         id
-        name
+        citation
+        link
+        sourceUrl
+        displayType
+        sourceType
       }
+      entrezId
+      officialName
+      myGeneInfoDetails
     }
   }
-  ... on Gene {
-    entrezId
-    officialName
-    myGeneInfoDetails
-  }
   # lastSubmittedRevisionEvent {
   #   originatingUser {
   #     id
diff --git a/client/src/app/views/genes/genes-detail/genes-summary/genes-summary.query.gql b/client/src/app/views/genes/genes-detail/genes-summary/genes-summary.query.gql
index 811facf86..638c2441f 100644
--- a/client/src/app/views/genes/genes-detail/genes-summary/genes-summary.query.gql
+++ b/client/src/app/views/genes/genes-detail/genes-summary/genes-summary.query.gql
@@ -19,29 +19,5 @@ fragment GeneSummaryFields on Gene {
     displayType
     sourceType
   }
-  variants {
-    edges {
-      node {
-        id
-        name
-      }
-    }
-  }
   myGeneInfoDetails
-  lastSubmittedRevisionEvent {
-    originatingUser {
-      id
-      displayName
-      role
-      profileImagePath(size: 32)
-    }
-  }
-  lastAcceptedRevisionEvent {
-    originatingUser {
-      id
-      displayName
-      role
-      profileImagePath(size: 32)
-    }
-  }
 }
diff --git a/client/src/app/views/molecular-profiles/molecular-profiles-detail/molecular-profiles-detail.view.ts b/client/src/app/views/molecular-profiles/molecular-profiles-detail/molecular-profiles-detail.view.ts
index 4c272f1e9..41bcc7efd 100644
--- a/client/src/app/views/molecular-profiles/molecular-profiles-detail/molecular-profiles-detail.view.ts
+++ b/client/src/app/views/molecular-profiles/molecular-profiles-detail/molecular-profiles-detail.view.ts
@@ -99,6 +99,11 @@ export class MolecularProfilesDetailView implements OnDestroy {
                     badgeCount: mpResp?.revisions.totalCount,
                     ...tab,
                   }
+                } else if (tab.tabLabel === 'Flags') {
+                  return {
+                    badgeCount: mpResp?.flags.totalCount,
+                    ...tab,
+                  }
                 } else if (tab.tabLabel === 'Comments') {
                   return {
                     badgeCount: mpResp?.comments.totalCount,
diff --git a/client/src/app/views/variants/variants-detail/variants-detail.view.ts b/client/src/app/views/variants/variants-detail/variants-detail.view.ts
index a0158556d..b9364c0b6 100644
--- a/client/src/app/views/variants/variants-detail/variants-detail.view.ts
+++ b/client/src/app/views/variants/variants-detail/variants-detail.view.ts
@@ -92,6 +92,11 @@ export class VariantsDetailView implements OnDestroy {
                     badgeCount: variantResp?.revisions.totalCount,
                     ...tab,
                   }
+                } else if (tab.tabLabel === 'Flags') {
+                  return {
+                    badgeCount: variantResp?.flags.totalCount,
+                    ...tab,
+                  }
                 } else if (tab.tabLabel === 'Comments') {
                   return {
                     badgeCount: variantResp?.comments.totalCount,
diff --git a/server/app/graphql/types/entities/feature_type.rb b/server/app/graphql/types/entities/feature_type.rb
new file mode 100644
index 000000000..5cf168725
--- /dev/null
+++ b/server/app/graphql/types/entities/feature_type.rb
@@ -0,0 +1,67 @@
+module Types::Entities
+  class FeatureType < Types::BaseObject
+    implements Types::Interfaces::Flaggable
+
+    description 'The Feature that a Variant can belong to'
+
+    field :id, Int, null: false
+    field :name, String, null: false
+    field :description, String, null: false
+    field :feature_aliases, [String], null: false
+    field :sources, [Types::Entities::SourceType], null: false
+    field :variants, resolver: Resolvers::Variants
+    field :link, String, null: false
+    field :feature_instance, Types::FeatureInstanceType, null: false
+
+    #orphan_types(
+    #  Types::Entities::GeneType
+    #)
+
+    def id
+      object.id
+    end
+
+    def feature_aliases
+      if object.class.name == 'Feature'
+        to_load = object
+      else
+        to_load = object.feature
+      end
+      Loaders::AssociationLoader.for(Feature, :feature_aliases).load(to_load).then do |aliases|
+        aliases.map{|a| a.name}.sort
+      end
+    end
+
+    def sources
+      if object.class.name == 'Feature'
+        to_load = object
+      else
+        to_load = object.feature
+      end
+      Loaders::AssociationLoader.for(Feature, :sources).load(to_load)
+    end
+
+    def variants
+      Loaders::AssociationLoader.for(Feature, :variants).load(object)
+    end
+
+    def link
+      object.link
+    end
+
+    def feature_instance
+      object.feature_instance
+    end
+
+    #definition_methods do
+    #  def resolve_type(object, context)
+    #    case object
+    #    when Features::Gene
+    #      Types::Entities::GeneType
+    #    else
+    #      raise "Unexpected Feature type #{object.class}"
+    #    end
+    #  end
+    #end
+  end
+end
diff --git a/server/app/graphql/types/entities/gene_type.rb b/server/app/graphql/types/entities/gene_type.rb
index 273ab99f9..255369e73 100644
--- a/server/app/graphql/types/entities/gene_type.rb
+++ b/server/app/graphql/types/entities/gene_type.rb
@@ -1,9 +1,6 @@
 module Types::Entities
-  class GeneType < Types::BaseObject
-    implements Types::Interfaces::FeatureInterface
-
+  class GeneType < Types::Entities::FeatureType
     implements Types::Interfaces::Commentable
-    implements Types::Interfaces::Flaggable
     implements Types::Interfaces::WithRevisions
     implements Types::Interfaces::EventSubject
     implements Types::Interfaces::MolecularProfileComponent
diff --git a/server/app/graphql/types/entities/variant_type.rb b/server/app/graphql/types/entities/variant_type.rb
index 94c4da748..495382cbb 100644
--- a/server/app/graphql/types/entities/variant_type.rb
+++ b/server/app/graphql/types/entities/variant_type.rb
@@ -11,8 +11,8 @@ class VariantType < Types::BaseObject
 
     field :id, Int, null: false
     field :name, String, null: false
-    field :gene, Types::Entities::GeneType, null: false
-    field :feature, Types::Interfaces::FeatureInterface, null: false
+    field :gene, "Types::Entities::GeneType", null: false
+    field :feature, Types::Entities::FeatureType, null: false
     field :reference_build, Types::ReferenceBuildType, null: true
     field :ensembl_version, Int, null: true
     field :primary_coordinates, Types::Entities::CoordinateType, null: true
@@ -41,9 +41,7 @@ def gene
     end
 
     def feature
-      Loaders::AssociationLoader.for(Variant, :feature).load(object).then do |f|
-        Loaders::AssociationLoader.for(Feature, :feature_instance).load(f)
-      end
+      Loaders::AssociationLoader.for(Variant, :feature).load(object)
     end
 
     def variant_types
diff --git a/server/app/graphql/types/feature_instance_type.rb b/server/app/graphql/types/feature_instance_type.rb
new file mode 100644
index 000000000..987084730
--- /dev/null
+++ b/server/app/graphql/types/feature_instance_type.rb
@@ -0,0 +1,14 @@
+module Types
+  class FeatureInstanceType < Types::BaseUnion
+    description 'The specific type of a feature instance'
+    possible_types "Types::Entities::GeneType"
+
+    def self.resolve_type(object, context)
+      if object.is_a?(Features::Gene)
+        Types::Entities::GeneType
+      else
+        raise StandardError.new("Unknown feature instance type #{object.class}")
+      end
+    end
+  end
+end
diff --git a/server/app/graphql/types/flaggable/flaggable_entities_type.rb b/server/app/graphql/types/flaggable/flaggable_entities_type.rb
index 3e16517cf..e7ef7cb1b 100644
--- a/server/app/graphql/types/flaggable/flaggable_entities_type.rb
+++ b/server/app/graphql/types/flaggable/flaggable_entities_type.rb
@@ -2,6 +2,7 @@ module Types::Flaggable
   class FlaggableEntitiesType < Types::BaseEnum
     description 'Enumeration of all entities in CIViC that can be flagged.'
     value 'GENE'
+    value 'FEATURE'
     value 'VARIANT'
     value 'EVIDENCE_ITEM'
     value 'ASSERTION'
diff --git a/server/app/graphql/types/flaggable/flaggable_input.rb b/server/app/graphql/types/flaggable/flaggable_input.rb
index 8fd1425f4..f06ab6934 100644
--- a/server/app/graphql/types/flaggable/flaggable_input.rb
+++ b/server/app/graphql/types/flaggable/flaggable_input.rb
@@ -12,7 +12,9 @@ class FlaggableInput < Types::BaseInputObject
     def prepare
       const = case entity_type
       when 'GENE'
-        Gene
+        Features::Gene
+      when 'FEATURE'
+        Feature
       when 'VARIANT'
         Variant
       when 'EVIDENCE_ITEM'
diff --git a/server/app/graphql/types/interfaces/feature_interface.rb b/server/app/graphql/types/interfaces/feature_interface.rb
deleted file mode 100644
index 6c792730b..000000000
--- a/server/app/graphql/types/interfaces/feature_interface.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-module Types::Interfaces
-  module FeatureInterface
-    include Types::BaseInterface
-
-    description 'The Feature that a Variant can belong to'
-
-    field :id, Int, null: false
-    field :name, String, null: false
-    field :description, String, null: false
-    field :feature_aliases, [String], null: false
-    field :sources, [Types::Entities::SourceType], null: false
-    field :variants, resolver: Resolvers::Variants
-    field :link, String, null: false
-
-    orphan_types(
-      Types::Entities::GeneType
-    )
-
-    def id
-      object.feature.id
-    end
-
-    def feature_aliases
-      Loaders::AssociationLoader.for(Feature, :feature_aliases).load(object.feature).then do |aliases|
-        aliases.map{|a| a.name}.sort
-      end
-    end
-
-    def sources
-      Loaders::AssociationLoader.for(Feature, :sources).load(object.feature)
-    end
-
-    def variants
-      Loaders::AssociationLoader.for(Feature, :variants).load(object)
-    end
-
-    def link
-      object.feature.link
-    end
-
-    definition_methods do
-      def resolve_type(object, context)
-        case object
-        when Features::Gene
-          Types::Entities::GeneType
-        else
-          raise "Unexpected Feature type #{object.class}"
-        end
-      end
-    end
-  end
-end
diff --git a/server/app/graphql/types/interfaces/flaggable.rb b/server/app/graphql/types/interfaces/flaggable.rb
index e11d62190..41a918a8a 100644
--- a/server/app/graphql/types/interfaces/flaggable.rb
+++ b/server/app/graphql/types/interfaces/flaggable.rb
@@ -16,6 +16,8 @@ def resolve_type(object, context)
         case object
         when Features::Gene
           Types::Entities::GeneType
+        when Feature
+          Types::Entities::FeatureType
         when Variant
           Types::Entities::VariantType
         when EvidenceItem
diff --git a/server/app/graphql/types/molecular_profile/molecular_profile_segment_type.rb b/server/app/graphql/types/molecular_profile/molecular_profile_segment_type.rb
index 31f2cc9ea..2c9ae0c5c 100644
--- a/server/app/graphql/types/molecular_profile/molecular_profile_segment_type.rb
+++ b/server/app/graphql/types/molecular_profile/molecular_profile_segment_type.rb
@@ -10,7 +10,9 @@ def text
   class MolecularProfileSegmentType < Types::BaseUnion
 
     description "A segment of a molecular profile. Either a string representing a boolean operator or a tag component representing a gene or variant"
-    possible_types Types::MolecularProfile::MolecularProfileTextSegment, Types::Entities::GeneType, Types::Entities::VariantType
+    possible_types Types::MolecularProfile::MolecularProfileTextSegment,
+      "Types::Entities::GeneType",
+      Types::Entities::VariantType
 
 
 
@@ -18,7 +20,7 @@ def self.resolve_type(object, context)
       if object.is_a?(String)
         Types::MolecularProfile::MolecularProfileTextSegment
       elsif object.is_a?(Features::Gene)
-        Types::Entities::GeneType
+        ::Types::Entities::GeneType
       elsif object.is_a?(Variant)
         Types::Entities::VariantType
       else
diff --git a/server/app/graphql/types/query_type.rb b/server/app/graphql/types/query_type.rb
index e7026a687..0c4b22175 100644
--- a/server/app/graphql/types/query_type.rb
+++ b/server/app/graphql/types/query_type.rb
@@ -60,7 +60,7 @@ def authorized?(object, args, context)
       argument :entrez_symbol, String, required: false
     end
 
-    field :feature, Types::Entities::GeneType, null: true do
+    field :feature, Types::Entities::FeatureType, null: true do
       description "Find a single feature by CIViC ID"
       argument :id, Int, required: false
     end
@@ -219,7 +219,7 @@ def gene(id: :unspecified, entrez_symbol: :unspecified)
     end
 
     def feature(id: )
-      Feature.find_by(id: id).feature_instance
+      Feature.find_by(id: id)
     end
 
     def variant(id: )
diff --git a/server/app/models/concerns/is_feature_instance.rb b/server/app/models/concerns/is_feature_instance.rb
index 260be271c..666c2a1d5 100644
--- a/server/app/models/concerns/is_feature_instance.rb
+++ b/server/app/models/concerns/is_feature_instance.rb
@@ -9,5 +9,9 @@ module IsFeatureInstance
     delegate :feature_aliases, to: :feature
     delegate :sources, to: :feature
     delegate :variants, to: :feature
+
+    delegate :flagged, to: :feature
+    delegate :flags, to: :feature
+    delegate :most_recent_flag, to: :feature
   end
 end
diff --git a/server/app/models/feature.rb b/server/app/models/feature.rb
index ccd7412fc..f239ee706 100644
--- a/server/app/models/feature.rb
+++ b/server/app/models/feature.rb
@@ -1,4 +1,7 @@
 class Feature < ApplicationRecord
+  include Flaggable
+  include Subscribable
+
   delegated_type :feature_instance, types: %w[ Features::Gene ]
   has_and_belongs_to_many :feature_aliases, class_name: 'Features::FeatureAlias'
   has_and_belongs_to_many :sources
diff --git a/server/app/models/features/gene.rb b/server/app/models/features/gene.rb
index 0536c9d01..bf2cd8250 100644
--- a/server/app/models/features/gene.rb
+++ b/server/app/models/features/gene.rb
@@ -2,7 +2,6 @@ module Features
   class Gene < ActiveRecord::Base
     include Moderated
     include Subscribable
-    include Flaggable
     include Commentable
     include WithTimepointCounts
     include IsFeatureInstance
diff --git a/server/db/migrate/20231212195608_add_flagged_column_to_features.rb b/server/db/migrate/20231212195608_add_flagged_column_to_features.rb
new file mode 100644
index 000000000..ad89ff548
--- /dev/null
+++ b/server/db/migrate/20231212195608_add_flagged_column_to_features.rb
@@ -0,0 +1,5 @@
+class AddFlaggedColumnToFeatures < ActiveRecord::Migration[6.1]
+  def change
+    add_column :features, :flagged, :boolean, null: false, index: true, default: false
+  end
+end
diff --git a/server/db/migrate/20231213150951_update_feature_browse_table_rows_to_version_2.rb b/server/db/migrate/20231213150951_update_feature_browse_table_rows_to_version_2.rb
new file mode 100644
index 000000000..82b9c5e21
--- /dev/null
+++ b/server/db/migrate/20231213150951_update_feature_browse_table_rows_to_version_2.rb
@@ -0,0 +1,10 @@
+class UpdateFeatureBrowseTableRowsToVersion2 < ActiveRecord::Migration[6.1]
+  def change
+    update_view :feature_browse_table_rows,
+      version: 2,
+      revert_to_version: 1,
+      materialized: true
+
+    add_index :feature_browse_table_rows, :id, unique: true
+  end
+end
diff --git a/server/db/schema.rb b/server/db/schema.rb
index 8dfbc79cc..814935683 100644
--- a/server/db/schema.rb
+++ b/server/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2023_12_12_145853) do
+ActiveRecord::Schema.define(version: 2023_12_13_150951) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -464,6 +464,7 @@
     t.datetime "updated_at", precision: 6, null: false
     t.string "feature_instance_type", null: false
     t.bigint "feature_instance_id", null: false
+    t.boolean "flagged", default: false, null: false
     t.index ["feature_instance_type", "feature_instance_id"], name: "index_features_on_feature_instance"
   end
 
@@ -1263,6 +1264,7 @@
   create_view "feature_browse_table_rows", materialized: true, sql_definition: <<-SQL
       SELECT outer_features.id,
       outer_features.name,
+      outer_features.flagged,
       array_agg(DISTINCT feature_aliases.name ORDER BY feature_aliases.name) AS alias_names,
       json_agg(DISTINCT jsonb_build_object('name', diseases.name, 'id', diseases.id, 'total', disease_count.total)) FILTER (WHERE (diseases.name IS NOT NULL)) AS diseases,
       json_agg(DISTINCT jsonb_build_object('name', therapies.name, 'id', therapies.id, 'total', therapy_count.total)) FILTER (WHERE (therapies.name IS NOT NULL)) AS therapies,
@@ -1303,4 +1305,6 @@
     WHERE (((evidence_items.status)::text <> 'rejected'::text) AND (molecular_profiles.deprecated = false) AND (variants.deprecated = false))
     GROUP BY outer_features.id, outer_features.name;
   SQL
+  add_index "feature_browse_table_rows", ["id"], name: "index_feature_browse_table_rows_on_id", unique: true
+
 end
diff --git a/server/db/views/feature_browse_table_rows_v02.sql b/server/db/views/feature_browse_table_rows_v02.sql
new file mode 100644
index 000000000..3c5cd5e0f
--- /dev/null
+++ b/server/db/views/feature_browse_table_rows_v02.sql
@@ -0,0 +1,45 @@
+SELECT outer_features.id,
+  outer_features.name,
+  outer_features.flagged,
+  array_agg(distinct(feature_aliases.name) order by feature_aliases.name) as alias_names,
+  json_agg(distinct jsonb_build_object('name', diseases.name, 'id', diseases.id, 'total', disease_count.total))  FILTER (WHERE diseases.name IS NOT NULL) as diseases,
+  json_agg(distinct jsonb_build_object('name', therapies.name, 'id', therapies.id, 'total', therapy_count.total))  FILTER (WHERE therapies.name IS NOT NULL) as therapies,
+  count(distinct(variants.id)) as variant_count,
+  count(distinct(evidence_items.id)) as evidence_item_count,
+  count(distinct(assertions.id)) as assertion_count,
+  count(distinct(molecular_profiles.id)) as molecular_profile_count
+FROM features outer_features
+LEFT OUTER JOIN feature_aliases_features ON feature_aliases_features.feature_id = outer_features.id
+LEFT OUTER JOIN feature_aliases ON feature_aliases.id = feature_aliases_features.feature_alias_id
+INNER JOIN variants ON variants.feature_id = outer_features.id
+INNER JOIN molecular_profiles_variants ON molecular_profiles_variants.variant_id = variants.id
+INNER JOIN molecular_profiles ON molecular_profiles.id = molecular_profiles_variants.molecular_profile_id
+INNER JOIN evidence_items ON evidence_items.molecular_profile_id = molecular_profiles.id
+LEFT OUTER JOIN diseases ON diseases.id = evidence_items.disease_id
+LEFT OUTER JOIN evidence_items_therapies ON evidence_items_therapies.evidence_item_id = evidence_items.id
+LEFT OUTER JOIN therapies ON therapies.id = evidence_items_therapies.therapy_id
+LEFT OUTER JOIN assertions on assertions.molecular_profile_id = molecular_profiles.id
+LEFT JOIN LATERAL (SELECT therapies.id as therapy_id, COUNT(DISTINCT(evidence_items.id)) as total
+  FROM evidence_items
+  INNER JOIN molecular_profiles ON molecular_profiles.id = evidence_items.molecular_profile_id
+  INNER JOIN molecular_profiles_variants ON molecular_profiles_variants.molecular_profile_id = molecular_profiles.id
+  INNER JOIN variants ON variants.id = molecular_profiles_variants.variant_id
+  INNER JOIN evidence_items_therapies ON evidence_items_therapies.evidence_item_id = evidence_items.id
+  INNER JOIN therapies ON therapies.id = evidence_items_therapies.therapy_id
+  WHERE variants.feature_id = outer_features.id
+  GROUP BY therapies.id
+) therapy_count on therapies.id = therapy_count.therapy_id
+
+LEFT JOIN LATERAL (SELECT diseases.id as disease_id, COUNT(DISTINCT(evidence_items.id)) as total
+  FROM evidence_items
+  INNER JOIN molecular_profiles ON molecular_profiles.id = evidence_items.molecular_profile_id
+  INNER JOIN molecular_profiles_variants ON molecular_profiles_variants.molecular_profile_id = molecular_profiles.id
+  INNER JOIN variants ON variants.id = molecular_profiles_variants.variant_id
+  INNER JOIN diseases ON diseases.id = evidence_items.disease_id
+  WHERE variants.feature_id = outer_features.id
+  GROUP BY diseases.id
+) disease_count on diseases.id = disease_count.disease_id
+WHERE evidence_items.status != 'rejected'
+  AND molecular_profiles.deprecated = 'f'
+  AND variants.deprecated = 'f'
+GROUP BY outer_features.id, outer_features.name;
diff --git a/server/misc_scripts/features/backfill_feature_flags.rb b/server/misc_scripts/features/backfill_feature_flags.rb
new file mode 100644
index 000000000..dda1d7f03
--- /dev/null
+++ b/server/misc_scripts/features/backfill_feature_flags.rb
@@ -0,0 +1,11 @@
+Features::Gene.find_each do |gene|
+  feature = Feature.find_by(feature_instance: gene)
+  feature.flagged = gene.flagged
+  feature.save!
+
+  flags = Flag.where(flaggable: gene)
+  flags.each do |flag|
+    flag.flaggable = feature
+    flag.save!
+  end
+end

From d8ed95b083379c2442776cfc23c0ecafd545941a Mon Sep 17 00:00:00 2001
From: Susanna Kiwala <susanna.kiwala@wustl.edu>
Date: Fri, 15 Dec 2023 10:09:04 -0600
Subject: [PATCH 009/125] Update MP parsedName to use feature instead of gene

---
 .../molecular-profile-popover.query.gql       |  2 +-
 .../molecular-profile-tag-name.component.html | 12 ++--
 .../molecular-profile-tag-name.component.ts   |  6 +-
 .../molecular-profile-tag-name.module.ts      |  4 +-
 ...ecular-profile-variant-card.component.html |  4 +-
 .../molecular-profile-variant-card.module.ts  |  4 +-
 .../mp-expression-editor.query.gql            |  2 +-
 client/src/app/generated/civic.apollo.ts      | 62 +++++++++----------
 .../src/app/generated/civic.possible-types.ts |  2 +-
 client/src/app/generated/server.model.graphql |  2 +-
 client/src/app/generated/server.schema.json   |  4 +-
 .../molecular-profiles-summary.query.gql      |  4 +-
 .../molecular_profile_segments_loader.rb      | 24 +++----
 .../interfaces/molecular_profile_component.rb |  4 +-
 .../molecular_profile_segment_type.rb         |  6 +-
 server/app/models/molecular_profile.rb        |  8 ++-
 16 files changed, 75 insertions(+), 75 deletions(-)

diff --git a/client/src/app/components/molecular-profiles/molecular-profile-popover/molecular-profile-popover.query.gql b/client/src/app/components/molecular-profiles/molecular-profile-popover/molecular-profile-popover.query.gql
index f6ce0a741..d18f2d89a 100644
--- a/client/src/app/components/molecular-profiles/molecular-profile-popover/molecular-profile-popover.query.gql
+++ b/client/src/app/components/molecular-profiles/molecular-profile-popover/molecular-profile-popover.query.gql
@@ -12,7 +12,7 @@ fragment molecularProfilePopoverFields on MolecularProfile {
     ... on MolecularProfileTextSegment {
       text
     }
-    ... on Gene {
+    ... on Feature {
       id
       name
       link
diff --git a/client/src/app/components/molecular-profiles/molecular-profile-tag-name/molecular-profile-tag-name.component.html b/client/src/app/components/molecular-profiles/molecular-profile-tag-name/molecular-profile-tag-name.component.html
index 9edca4421..35dff027c 100644
--- a/client/src/app/components/molecular-profiles/molecular-profile-tag-name/molecular-profile-tag-name.component.html
+++ b/client/src/app/components/molecular-profiles/molecular-profile-tag-name/molecular-profile-tag-name.component.html
@@ -6,13 +6,13 @@
   </span>
   <ng-container *ngIf="s.__typename == 'Variant'">
     <cvc-tag-group>
-      <!-- ugly kludge to get gene-tag to accept nameSegments[i-1] as LinkableGene -->
-      <ng-container *ngFor="let g of [nameSegments[i - 1]]">
-        <cvc-gene-tag
-          *ngIf="g.__typename == 'Gene'"
-          [gene]="g"
+      <!-- ugly kludge to get feature-tag to accept nameSegments[i-1] as LinkableFeature -->
+      <ng-container *ngFor="let f of [nameSegments[i - 1]]">
+        <cvc-feature-tag
+          *ngIf="f.__typename == 'Feature'"
+          [feature]="f"
           [enablePopover]="this.enablePopover">
-        </cvc-gene-tag>
+        </cvc-feature-tag>
       </ng-container>
 
       <cvc-variant-tag
diff --git a/client/src/app/components/molecular-profiles/molecular-profile-tag-name/molecular-profile-tag-name.component.ts b/client/src/app/components/molecular-profiles/molecular-profile-tag-name/molecular-profile-tag-name.component.ts
index 76bff5a27..9ef4e7543 100644
--- a/client/src/app/components/molecular-profiles/molecular-profile-tag-name/molecular-profile-tag-name.component.ts
+++ b/client/src/app/components/molecular-profiles/molecular-profile-tag-name/molecular-profile-tag-name.component.ts
@@ -1,11 +1,11 @@
 import { Component, Input, OnInit } from '@angular/core'
 import { MolecularProfileTextSegment } from '@app/generated/civic.apollo'
 
-type MpGene = {
+type MpFeature = {
   id: number
   link: string
   name: string
-  __typename: "Gene"
+  __typename: "Feature"
 }
 type MpVariant = {
   id: number
@@ -13,7 +13,7 @@ type MpVariant = {
   name: string
   __typename: "Variant"
 }
-type MpSegment = MpGene  | MolecularProfileTextSegment | MpVariant
+type MpSegment = MpFeature  | MolecularProfileTextSegment | MpVariant
 
 @Component({
   selector: 'cvc-mp-tag-name',
diff --git a/client/src/app/components/molecular-profiles/molecular-profile-tag-name/molecular-profile-tag-name.module.ts b/client/src/app/components/molecular-profiles/molecular-profile-tag-name/molecular-profile-tag-name.module.ts
index 239d32815..dcab849a7 100644
--- a/client/src/app/components/molecular-profiles/molecular-profile-tag-name/molecular-profile-tag-name.module.ts
+++ b/client/src/app/components/molecular-profiles/molecular-profile-tag-name/molecular-profile-tag-name.module.ts
@@ -1,11 +1,11 @@
 import { NgModule } from '@angular/core'
 import { CommonModule } from '@angular/common'
 import { CvcVariantTagModule } from '@app/components/variants/variant-tag/variant-tag.module'
-import { CvcGeneTagModule } from '@app/components/genes/gene-tag/gene-tag.module'
 import { NzTagModule } from 'ng-zorro-antd/tag'
 import { NzIconModule } from 'ng-zorro-antd/icon'
 import { CvcMolecularProfileTagNameComponent } from './molecular-profile-tag-name.component'
 import { CvcTagGroupModule } from '@app/components/shared/tag-group/tag-group.module'
+import { CvcFeatureTagModule } from '@app/components/features/feature-tag/feature-tag.module'
 
 @NgModule({
   declarations: [CvcMolecularProfileTagNameComponent],
@@ -14,7 +14,7 @@ import { CvcTagGroupModule } from '@app/components/shared/tag-group/tag-group.mo
     NzTagModule,
     NzIconModule,
     CvcVariantTagModule,
-    CvcGeneTagModule,
+    CvcFeatureTagModule,
     CvcTagGroupModule,
   ],
   exports: [CvcMolecularProfileTagNameComponent],
diff --git a/client/src/app/components/molecular-profiles/molecular-profile-variant-card/molecular-profile-variant-card.component.html b/client/src/app/components/molecular-profiles/molecular-profile-variant-card/molecular-profile-variant-card.component.html
index d0063f7d2..d5be2c3b3 100644
--- a/client/src/app/components/molecular-profiles/molecular-profile-variant-card/molecular-profile-variant-card.component.html
+++ b/client/src/app/components/molecular-profiles/molecular-profile-variant-card/molecular-profile-variant-card.component.html
@@ -12,8 +12,8 @@
                       <nz-descriptions-item [nzSpan]="2" nzTitle="Variant">
                           <cvc-variant-tag [variant]="variant"></cvc-variant-tag>
                       </nz-descriptions-item>
-                      <nz-descriptions-item [nzSpan]="2" nzTitle="Gene">
-                          <cvc-gene-tag [gene]="variant.gene"></cvc-gene-tag>
+                      <nz-descriptions-item [nzSpan]="2" nzTitle="Feature">
+                          <cvc-feature-tag [feature]="variant.feature"></cvc-feature-tag>
                       </nz-descriptions-item>
                       <!-- aliases -->
                       <nz-descriptions-item [nzSpan]="2" nzTitle="Aliases">
diff --git a/client/src/app/components/molecular-profiles/molecular-profile-variant-card/molecular-profile-variant-card.module.ts b/client/src/app/components/molecular-profiles/molecular-profile-variant-card/molecular-profile-variant-card.module.ts
index 2f6bd260b..385e130f8 100644
--- a/client/src/app/components/molecular-profiles/molecular-profile-variant-card/molecular-profile-variant-card.module.ts
+++ b/client/src/app/components/molecular-profiles/molecular-profile-variant-card/molecular-profile-variant-card.module.ts
@@ -1,7 +1,6 @@
 import { NgModule } from '@angular/core'
 import { CommonModule } from '@angular/common'
 import { CvcVariantTagModule } from '@app/components/variants/variant-tag/variant-tag.module'
-import { CvcGeneTagModule } from '@app/components/genes/gene-tag/gene-tag.module'
 import { NzTagModule } from 'ng-zorro-antd/tag'
 import { NzIconModule } from 'ng-zorro-antd/icon'
 import { CvcMolecularProfileVariantCardComponent } from './molecular-profile-variant-card.component'
@@ -19,6 +18,7 @@ import { RouterModule } from '@angular/router'
 import { NzCollapseModule } from 'ng-zorro-antd/collapse'
 import { CvcCoordinatesCardModule } from '@app/components/variants/coordinates-card/coordinates-card.module'
 import { NzSpaceModule } from 'ng-zorro-antd/space'
+import { CvcFeatureTagModule } from '@app/components/features/feature-tag/feature-tag.module'
 
 @NgModule({
   declarations: [CvcMolecularProfileVariantCardComponent],
@@ -35,7 +35,7 @@ import { NzSpaceModule } from 'ng-zorro-antd/space'
     NzSpaceModule,
     CvcPipesModule,
     CvcVariantTagModule,
-    CvcGeneTagModule,
+    CvcFeatureTagModule,
     CvcEmptyRevisableModule,
     CvcTagListModule,
     CvcVariantTypeTagModule,
diff --git a/client/src/app/forms/types/molecular-profile-select/mp-expression-editor/mp-expression-editor.query.gql b/client/src/app/forms/types/molecular-profile-select/mp-expression-editor/mp-expression-editor.query.gql
index 35677f2a5..459555d46 100644
--- a/client/src/app/forms/types/molecular-profile-select/mp-expression-editor/mp-expression-editor.query.gql
+++ b/client/src/app/forms/types/molecular-profile-select/mp-expression-editor/mp-expression-editor.query.gql
@@ -49,7 +49,7 @@ fragment PreviewMpName2 on MolecularProfileSegment {
   ... on MolecularProfileTextSegment {
     text
   }
-  ... on Gene {
+  ... on Feature {
     id
     name
     link
diff --git a/client/src/app/generated/civic.apollo.ts b/client/src/app/generated/civic.apollo.ts
index 04c727015..ef6b08b2a 100644
--- a/client/src/app/generated/civic.apollo.ts
+++ b/client/src/app/generated/civic.apollo.ts
@@ -2756,7 +2756,7 @@ export type MolecularProfileNamePreview = {
  * A segment of a molecular profile. Either a string representing a boolean
  * operator or a tag component representing a gene or variant
  */
-export type MolecularProfileSegment = Gene | MolecularProfileTextSegment | Variant;
+export type MolecularProfileSegment = Feature | MolecularProfileTextSegment | Variant;
 
 export type MolecularProfileTextSegment = {
   __typename: 'MolecularProfileTextSegment';
@@ -3674,8 +3674,8 @@ export type QueryBrowseDiseasesArgs = {
   after?: InputMaybe<Scalars['String']>;
   before?: InputMaybe<Scalars['String']>;
   doid?: InputMaybe<Scalars['String']>;
+  featureName?: InputMaybe<Scalars['String']>;
   first?: InputMaybe<Scalars['Int']>;
-  geneNames?: InputMaybe<Scalars['String']>;
   id?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   name?: InputMaybe<Scalars['String']>;
@@ -6056,9 +6056,9 @@ export type AssertionPopoverQueryVariables = Exact<{
 }>;
 
 
-export type AssertionPopoverQuery = { __typename: 'Query', assertion?: { __typename: 'Assertion', id: number, name: string, status: EvidenceStatus, summary: string, assertionType: AssertionType, assertionDirection: AssertionDirection, significance: AssertionSignificance, variantOrigin: VariantOrigin, ampLevel?: AmpLevel | undefined, regulatoryApproval?: boolean | undefined, regulatoryApprovalLastUpdated?: any | undefined, fdaCompanionTest?: boolean | undefined, fdaCompanionTestLastUpdated?: any | undefined, therapyInteractionType?: TherapyInteraction | undefined, acmgCodes: Array<{ __typename: 'AcmgCode', code: string, description: string }>, clingenCodes: Array<{ __typename: 'ClingenCode', code: string, description: string }>, nccnGuideline?: { __typename: 'NccnGuideline', id: number, name: string } | undefined, therapies: Array<{ __typename: 'Therapy', id: number, name: string, link: string }>, disease?: { __typename: 'Disease', id: number, name: string, link: string } | undefined, phenotypes: Array<{ __typename: 'Phenotype', id: number, name: string, link: string }>, molecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, parsedName: Array<{ __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfileTextSegment', text: string } | { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean }> }, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number } } | undefined };
+export type AssertionPopoverQuery = { __typename: 'Query', assertion?: { __typename: 'Assertion', id: number, name: string, status: EvidenceStatus, summary: string, assertionType: AssertionType, assertionDirection: AssertionDirection, significance: AssertionSignificance, variantOrigin: VariantOrigin, ampLevel?: AmpLevel | undefined, regulatoryApproval?: boolean | undefined, regulatoryApprovalLastUpdated?: any | undefined, fdaCompanionTest?: boolean | undefined, fdaCompanionTestLastUpdated?: any | undefined, therapyInteractionType?: TherapyInteraction | undefined, acmgCodes: Array<{ __typename: 'AcmgCode', code: string, description: string }>, clingenCodes: Array<{ __typename: 'ClingenCode', code: string, description: string }>, nccnGuideline?: { __typename: 'NccnGuideline', id: number, name: string } | undefined, therapies: Array<{ __typename: 'Therapy', id: number, name: string, link: string }>, disease?: { __typename: 'Disease', id: number, name: string, link: string } | undefined, phenotypes: Array<{ __typename: 'Phenotype', id: number, name: string, link: string }>, molecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, parsedName: Array<{ __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'MolecularProfileTextSegment', text: string } | { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean }> }, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number } } | undefined };
 
-export type AssertionPopoverFragment = { __typename: 'Assertion', id: number, name: string, status: EvidenceStatus, summary: string, assertionType: AssertionType, assertionDirection: AssertionDirection, significance: AssertionSignificance, variantOrigin: VariantOrigin, ampLevel?: AmpLevel | undefined, regulatoryApproval?: boolean | undefined, regulatoryApprovalLastUpdated?: any | undefined, fdaCompanionTest?: boolean | undefined, fdaCompanionTestLastUpdated?: any | undefined, therapyInteractionType?: TherapyInteraction | undefined, acmgCodes: Array<{ __typename: 'AcmgCode', code: string, description: string }>, clingenCodes: Array<{ __typename: 'ClingenCode', code: string, description: string }>, nccnGuideline?: { __typename: 'NccnGuideline', id: number, name: string } | undefined, therapies: Array<{ __typename: 'Therapy', id: number, name: string, link: string }>, disease?: { __typename: 'Disease', id: number, name: string, link: string } | undefined, phenotypes: Array<{ __typename: 'Phenotype', id: number, name: string, link: string }>, molecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, parsedName: Array<{ __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfileTextSegment', text: string } | { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean }> }, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number } };
+export type AssertionPopoverFragment = { __typename: 'Assertion', id: number, name: string, status: EvidenceStatus, summary: string, assertionType: AssertionType, assertionDirection: AssertionDirection, significance: AssertionSignificance, variantOrigin: VariantOrigin, ampLevel?: AmpLevel | undefined, regulatoryApproval?: boolean | undefined, regulatoryApprovalLastUpdated?: any | undefined, fdaCompanionTest?: boolean | undefined, fdaCompanionTestLastUpdated?: any | undefined, therapyInteractionType?: TherapyInteraction | undefined, acmgCodes: Array<{ __typename: 'AcmgCode', code: string, description: string }>, clingenCodes: Array<{ __typename: 'ClingenCode', code: string, description: string }>, nccnGuideline?: { __typename: 'NccnGuideline', id: number, name: string } | undefined, therapies: Array<{ __typename: 'Therapy', id: number, name: string, link: string }>, disease?: { __typename: 'Disease', id: number, name: string, link: string } | undefined, phenotypes: Array<{ __typename: 'Phenotype', id: number, name: string, link: string }>, molecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, parsedName: Array<{ __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'MolecularProfileTextSegment', text: string } | { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean }> }, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number } };
 
 export type AssertionsBrowseQueryVariables = Exact<{
   first?: InputMaybe<Scalars['Int']>;
@@ -6087,9 +6087,9 @@ export type AssertionsBrowseQueryVariables = Exact<{
 }>;
 
 
-export type AssertionsBrowseQuery = { __typename: 'Query', assertions: { __typename: 'AssertionConnection', totalCount: number, pageInfo: { __typename: 'PageInfo', hasNextPage: boolean, hasPreviousPage: boolean, startCursor?: string | undefined, endCursor?: string | undefined }, edges: Array<{ __typename: 'AssertionEdge', cursor: string, node?: { __typename: 'Assertion', id: number, name: string, link: string, therapyInteractionType?: TherapyInteraction | undefined, summary: string, assertionType: AssertionType, assertionDirection: AssertionDirection, significance: AssertionSignificance, ampLevel?: AmpLevel | undefined, evidenceItemsCount: number, status: EvidenceStatus, flagged: boolean, molecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, parsedName: Array<{ __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfileTextSegment', text: string } | { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean }> }, disease?: { __typename: 'Disease', id: number, name: string, link: string } | undefined, therapies: Array<{ __typename: 'Therapy', id: number, name: string, link: string }> } | undefined }> } };
+export type AssertionsBrowseQuery = { __typename: 'Query', assertions: { __typename: 'AssertionConnection', totalCount: number, pageInfo: { __typename: 'PageInfo', hasNextPage: boolean, hasPreviousPage: boolean, startCursor?: string | undefined, endCursor?: string | undefined }, edges: Array<{ __typename: 'AssertionEdge', cursor: string, node?: { __typename: 'Assertion', id: number, name: string, link: string, therapyInteractionType?: TherapyInteraction | undefined, summary: string, assertionType: AssertionType, assertionDirection: AssertionDirection, significance: AssertionSignificance, ampLevel?: AmpLevel | undefined, evidenceItemsCount: number, status: EvidenceStatus, flagged: boolean, molecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, parsedName: Array<{ __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'MolecularProfileTextSegment', text: string } | { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean }> }, disease?: { __typename: 'Disease', id: number, name: string, link: string } | undefined, therapies: Array<{ __typename: 'Therapy', id: number, name: string, link: string }> } | undefined }> } };
 
-export type AssertionBrowseFieldsFragment = { __typename: 'Assertion', id: number, name: string, link: string, therapyInteractionType?: TherapyInteraction | undefined, summary: string, assertionType: AssertionType, assertionDirection: AssertionDirection, significance: AssertionSignificance, ampLevel?: AmpLevel | undefined, evidenceItemsCount: number, status: EvidenceStatus, flagged: boolean, molecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, parsedName: Array<{ __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfileTextSegment', text: string } | { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean }> }, disease?: { __typename: 'Disease', id: number, name: string, link: string } | undefined, therapies: Array<{ __typename: 'Therapy', id: number, name: string, link: string }> };
+export type AssertionBrowseFieldsFragment = { __typename: 'Assertion', id: number, name: string, link: string, therapyInteractionType?: TherapyInteraction | undefined, summary: string, assertionType: AssertionType, assertionDirection: AssertionDirection, significance: AssertionSignificance, ampLevel?: AmpLevel | undefined, evidenceItemsCount: number, status: EvidenceStatus, flagged: boolean, molecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, parsedName: Array<{ __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'MolecularProfileTextSegment', text: string } | { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean }> }, disease?: { __typename: 'Disease', id: number, name: string, link: string } | undefined, therapies: Array<{ __typename: 'Therapy', id: number, name: string, link: string }> };
 
 export type ClinicalTrialPopoverQueryVariables = Exact<{
   clinicalTrialId: Scalars['Int'];
@@ -6215,9 +6215,9 @@ export type EvidencePopoverQueryVariables = Exact<{
 }>;
 
 
-export type EvidencePopoverQuery = { __typename: 'Query', evidenceItem?: { __typename: 'EvidenceItem', id: number, name: string, status: EvidenceStatus, description: string, evidenceLevel: EvidenceLevel, evidenceType: EvidenceType, evidenceDirection: EvidenceDirection, significance: EvidenceSignificance, variantOrigin: VariantOrigin, therapyInteractionType?: TherapyInteraction | undefined, evidenceRating?: number | undefined, therapies: Array<{ __typename: 'Therapy', id: number, name: string, link: string }>, disease?: { __typename: 'Disease', id: number, name: string, link: string } | undefined, phenotypes: Array<{ __typename: 'Phenotype', id: number, name: string, link: string }>, molecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, deprecated: boolean, parsedName: Array<{ __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfileTextSegment', text: string } | { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean }> }, source: { __typename: 'Source', id: number, citation?: string | undefined, sourceType: SourceSource, displayType: string, link: string }, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number } } | undefined };
+export type EvidencePopoverQuery = { __typename: 'Query', evidenceItem?: { __typename: 'EvidenceItem', id: number, name: string, status: EvidenceStatus, description: string, evidenceLevel: EvidenceLevel, evidenceType: EvidenceType, evidenceDirection: EvidenceDirection, significance: EvidenceSignificance, variantOrigin: VariantOrigin, therapyInteractionType?: TherapyInteraction | undefined, evidenceRating?: number | undefined, therapies: Array<{ __typename: 'Therapy', id: number, name: string, link: string }>, disease?: { __typename: 'Disease', id: number, name: string, link: string } | undefined, phenotypes: Array<{ __typename: 'Phenotype', id: number, name: string, link: string }>, molecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, deprecated: boolean, parsedName: Array<{ __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'MolecularProfileTextSegment', text: string } | { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean }> }, source: { __typename: 'Source', id: number, citation?: string | undefined, sourceType: SourceSource, displayType: string, link: string }, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number } } | undefined };
 
-export type EvidencePopoverFragment = { __typename: 'EvidenceItem', id: number, name: string, status: EvidenceStatus, description: string, evidenceLevel: EvidenceLevel, evidenceType: EvidenceType, evidenceDirection: EvidenceDirection, significance: EvidenceSignificance, variantOrigin: VariantOrigin, therapyInteractionType?: TherapyInteraction | undefined, evidenceRating?: number | undefined, therapies: Array<{ __typename: 'Therapy', id: number, name: string, link: string }>, disease?: { __typename: 'Disease', id: number, name: string, link: string } | undefined, phenotypes: Array<{ __typename: 'Phenotype', id: number, name: string, link: string }>, molecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, deprecated: boolean, parsedName: Array<{ __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfileTextSegment', text: string } | { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean }> }, source: { __typename: 'Source', id: number, citation?: string | undefined, sourceType: SourceSource, displayType: string, link: string }, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number } };
+export type EvidencePopoverFragment = { __typename: 'EvidenceItem', id: number, name: string, status: EvidenceStatus, description: string, evidenceLevel: EvidenceLevel, evidenceType: EvidenceType, evidenceDirection: EvidenceDirection, significance: EvidenceSignificance, variantOrigin: VariantOrigin, therapyInteractionType?: TherapyInteraction | undefined, evidenceRating?: number | undefined, therapies: Array<{ __typename: 'Therapy', id: number, name: string, link: string }>, disease?: { __typename: 'Disease', id: number, name: string, link: string } | undefined, phenotypes: Array<{ __typename: 'Phenotype', id: number, name: string, link: string }>, molecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, deprecated: boolean, parsedName: Array<{ __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'MolecularProfileTextSegment', text: string } | { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean }> }, source: { __typename: 'Source', id: number, citation?: string | undefined, sourceType: SourceSource, displayType: string, link: string }, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number } };
 
 export type EvidenceBrowseQueryVariables = Exact<{
   first?: InputMaybe<Scalars['Int']>;
@@ -6250,9 +6250,9 @@ export type EvidenceBrowseQueryVariables = Exact<{
 }>;
 
 
-export type EvidenceBrowseQuery = { __typename: 'Query', evidenceItems: { __typename: 'EvidenceItemConnection', totalCount: number, pageInfo: { __typename: 'PageInfo', hasNextPage: boolean, hasPreviousPage: boolean, startCursor?: string | undefined, endCursor?: string | undefined }, edges: Array<{ __typename: 'EvidenceItemEdge', cursor: string, node?: { __typename: 'EvidenceItem', id: number, name: string, link: string, status: EvidenceStatus, flagged: boolean, therapyInteractionType?: TherapyInteraction | undefined, description: string, evidenceType: EvidenceType, evidenceDirection: EvidenceDirection, evidenceLevel: EvidenceLevel, evidenceRating?: number | undefined, significance: EvidenceSignificance, variantOrigin: VariantOrigin, disease?: { __typename: 'Disease', id: number, name: string, link: string } | undefined, therapies: Array<{ __typename: 'Therapy', id: number, name: string, link: string }>, molecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, parsedName: Array<{ __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfileTextSegment', text: string } | { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean }> } } | undefined }> } };
+export type EvidenceBrowseQuery = { __typename: 'Query', evidenceItems: { __typename: 'EvidenceItemConnection', totalCount: number, pageInfo: { __typename: 'PageInfo', hasNextPage: boolean, hasPreviousPage: boolean, startCursor?: string | undefined, endCursor?: string | undefined }, edges: Array<{ __typename: 'EvidenceItemEdge', cursor: string, node?: { __typename: 'EvidenceItem', id: number, name: string, link: string, status: EvidenceStatus, flagged: boolean, therapyInteractionType?: TherapyInteraction | undefined, description: string, evidenceType: EvidenceType, evidenceDirection: EvidenceDirection, evidenceLevel: EvidenceLevel, evidenceRating?: number | undefined, significance: EvidenceSignificance, variantOrigin: VariantOrigin, disease?: { __typename: 'Disease', id: number, name: string, link: string } | undefined, therapies: Array<{ __typename: 'Therapy', id: number, name: string, link: string }>, molecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, parsedName: Array<{ __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'MolecularProfileTextSegment', text: string } | { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean }> } } | undefined }> } };
 
-export type EvidenceGridFieldsFragment = { __typename: 'EvidenceItem', id: number, name: string, link: string, status: EvidenceStatus, flagged: boolean, therapyInteractionType?: TherapyInteraction | undefined, description: string, evidenceType: EvidenceType, evidenceDirection: EvidenceDirection, evidenceLevel: EvidenceLevel, evidenceRating?: number | undefined, significance: EvidenceSignificance, variantOrigin: VariantOrigin, disease?: { __typename: 'Disease', id: number, name: string, link: string } | undefined, therapies: Array<{ __typename: 'Therapy', id: number, name: string, link: string }>, molecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, parsedName: Array<{ __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfileTextSegment', text: string } | { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean }> } };
+export type EvidenceGridFieldsFragment = { __typename: 'EvidenceItem', id: number, name: string, link: string, status: EvidenceStatus, flagged: boolean, therapyInteractionType?: TherapyInteraction | undefined, description: string, evidenceType: EvidenceType, evidenceDirection: EvidenceDirection, evidenceLevel: EvidenceLevel, evidenceRating?: number | undefined, significance: EvidenceSignificance, variantOrigin: VariantOrigin, disease?: { __typename: 'Disease', id: number, name: string, link: string } | undefined, therapies: Array<{ __typename: 'Therapy', id: number, name: string, link: string }>, molecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, parsedName: Array<{ __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'MolecularProfileTextSegment', text: string } | { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean }> } };
 
 export type FeaturePopoverQueryVariables = Exact<{
   featureId: Scalars['Int'];
@@ -6350,9 +6350,9 @@ export type MolecularProfilePopoverQueryVariables = Exact<{
 }>;
 
 
-export type MolecularProfilePopoverQuery = { __typename: 'Query', molecularProfile?: { __typename: 'MolecularProfile', id: number, name: string, molecularProfileAliases: Array<string>, parsedName: Array<{ __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfileTextSegment', text: string } | { __typename: 'Variant', id: number, name: string, deprecated: boolean, link: string }>, evidenceItems: { __typename: 'EvidenceItemConnection', totalCount: number }, assertions: { __typename: 'AssertionConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, flags: { __typename: 'FlagConnection', totalCount: number } } | undefined };
+export type MolecularProfilePopoverQuery = { __typename: 'Query', molecularProfile?: { __typename: 'MolecularProfile', id: number, name: string, molecularProfileAliases: Array<string>, parsedName: Array<{ __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'MolecularProfileTextSegment', text: string } | { __typename: 'Variant', id: number, name: string, deprecated: boolean, link: string }>, evidenceItems: { __typename: 'EvidenceItemConnection', totalCount: number }, assertions: { __typename: 'AssertionConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, flags: { __typename: 'FlagConnection', totalCount: number } } | undefined };
 
-export type MolecularProfilePopoverFieldsFragment = { __typename: 'MolecularProfile', id: number, name: string, molecularProfileAliases: Array<string>, parsedName: Array<{ __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfileTextSegment', text: string } | { __typename: 'Variant', id: number, name: string, deprecated: boolean, link: string }>, evidenceItems: { __typename: 'EvidenceItemConnection', totalCount: number }, assertions: { __typename: 'AssertionConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, flags: { __typename: 'FlagConnection', totalCount: number } };
+export type MolecularProfilePopoverFieldsFragment = { __typename: 'MolecularProfile', id: number, name: string, molecularProfileAliases: Array<string>, parsedName: Array<{ __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'MolecularProfileTextSegment', text: string } | { __typename: 'Variant', id: number, name: string, deprecated: boolean, link: string }>, evidenceItems: { __typename: 'EvidenceItemConnection', totalCount: number }, assertions: { __typename: 'AssertionConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, flags: { __typename: 'FlagConnection', totalCount: number } };
 
 export type BrowseMolecularProfilesQueryVariables = Exact<{
   molecularProfileName?: InputMaybe<Scalars['String']>;
@@ -7257,9 +7257,9 @@ export type EvidenceManagerQueryVariables = Exact<{
 }>;
 
 
-export type EvidenceManagerQuery = { __typename: 'Query', evidenceItems: { __typename: 'EvidenceItemConnection', totalCount: number, pageCount: number, pageInfo: { __typename: 'PageInfo', hasNextPage: boolean, hasPreviousPage: boolean, startCursor?: string | undefined, endCursor?: string | undefined }, edges: Array<{ __typename: 'EvidenceItemEdge', cursor: string, node?: { __typename: 'EvidenceItem', id: number, name: string, link: string, status: EvidenceStatus, flagged: boolean, therapyInteractionType?: TherapyInteraction | undefined, description: string, evidenceType: EvidenceType, evidenceDirection: EvidenceDirection, evidenceLevel: EvidenceLevel, evidenceRating?: number | undefined, significance: EvidenceSignificance, variantOrigin: VariantOrigin, disease?: { __typename: 'Disease', id: number, name: string, link: string } | undefined, therapies: Array<{ __typename: 'Therapy', id: number, name: string, link: string }>, molecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, parsedName: Array<{ __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfileTextSegment', text: string } | { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean }> } } | undefined }>, nodes: Array<{ __typename: 'EvidenceItem', id: number, name: string, link: string, status: EvidenceStatus, flagged: boolean, therapyInteractionType?: TherapyInteraction | undefined, description: string, evidenceType: EvidenceType, evidenceDirection: EvidenceDirection, evidenceLevel: EvidenceLevel, evidenceRating?: number | undefined, significance: EvidenceSignificance, variantOrigin: VariantOrigin, disease?: { __typename: 'Disease', id: number, name: string, link: string } | undefined, therapies: Array<{ __typename: 'Therapy', id: number, name: string, link: string }>, molecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, parsedName: Array<{ __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfileTextSegment', text: string } | { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean }> } }> } };
+export type EvidenceManagerQuery = { __typename: 'Query', evidenceItems: { __typename: 'EvidenceItemConnection', totalCount: number, pageCount: number, pageInfo: { __typename: 'PageInfo', hasNextPage: boolean, hasPreviousPage: boolean, startCursor?: string | undefined, endCursor?: string | undefined }, edges: Array<{ __typename: 'EvidenceItemEdge', cursor: string, node?: { __typename: 'EvidenceItem', id: number, name: string, link: string, status: EvidenceStatus, flagged: boolean, therapyInteractionType?: TherapyInteraction | undefined, description: string, evidenceType: EvidenceType, evidenceDirection: EvidenceDirection, evidenceLevel: EvidenceLevel, evidenceRating?: number | undefined, significance: EvidenceSignificance, variantOrigin: VariantOrigin, disease?: { __typename: 'Disease', id: number, name: string, link: string } | undefined, therapies: Array<{ __typename: 'Therapy', id: number, name: string, link: string }>, molecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, parsedName: Array<{ __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'MolecularProfileTextSegment', text: string } | { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean }> } } | undefined }>, nodes: Array<{ __typename: 'EvidenceItem', id: number, name: string, link: string, status: EvidenceStatus, flagged: boolean, therapyInteractionType?: TherapyInteraction | undefined, description: string, evidenceType: EvidenceType, evidenceDirection: EvidenceDirection, evidenceLevel: EvidenceLevel, evidenceRating?: number | undefined, significance: EvidenceSignificance, variantOrigin: VariantOrigin, disease?: { __typename: 'Disease', id: number, name: string, link: string } | undefined, therapies: Array<{ __typename: 'Therapy', id: number, name: string, link: string }>, molecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, parsedName: Array<{ __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'MolecularProfileTextSegment', text: string } | { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean }> } }> } };
 
-export type EvidenceManagerFieldsFragment = { __typename: 'EvidenceItem', id: number, name: string, link: string, status: EvidenceStatus, flagged: boolean, therapyInteractionType?: TherapyInteraction | undefined, description: string, evidenceType: EvidenceType, evidenceDirection: EvidenceDirection, evidenceLevel: EvidenceLevel, evidenceRating?: number | undefined, significance: EvidenceSignificance, variantOrigin: VariantOrigin, disease?: { __typename: 'Disease', id: number, name: string, link: string } | undefined, therapies: Array<{ __typename: 'Therapy', id: number, name: string, link: string }>, molecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, parsedName: Array<{ __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfileTextSegment', text: string } | { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean }> } };
+export type EvidenceManagerFieldsFragment = { __typename: 'EvidenceItem', id: number, name: string, link: string, status: EvidenceStatus, flagged: boolean, therapyInteractionType?: TherapyInteraction | undefined, description: string, evidenceType: EvidenceType, evidenceDirection: EvidenceDirection, evidenceLevel: EvidenceLevel, evidenceRating?: number | undefined, significance: EvidenceSignificance, variantOrigin: VariantOrigin, disease?: { __typename: 'Disease', id: number, name: string, link: string } | undefined, therapies: Array<{ __typename: 'Therapy', id: number, name: string, link: string }>, molecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, parsedName: Array<{ __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'MolecularProfileTextSegment', text: string } | { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean }> } };
 
 export type EvidenceSelectTypeaheadQueryVariables = Exact<{
   eid: Scalars['Int'];
@@ -7315,14 +7315,14 @@ export type PreviewMolecularProfileName2QueryVariables = Exact<{
 }>;
 
 
-export type PreviewMolecularProfileName2Query = { __typename: 'Query', previewMolecularProfileName: { __typename: 'MolecularProfileNamePreview', existingMolecularProfile?: { __typename: 'MolecularProfile', id: number, name: string, link: string } | undefined, segments: Array<{ __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfileTextSegment', text: string } | { __typename: 'Variant', id: number, name: string, link: string }>, deprecatedVariants: Array<{ __typename: 'Variant', id: number, name: string, link: string }> } };
+export type PreviewMolecularProfileName2Query = { __typename: 'Query', previewMolecularProfileName: { __typename: 'MolecularProfileNamePreview', existingMolecularProfile?: { __typename: 'MolecularProfile', id: number, name: string, link: string } | undefined, segments: Array<{ __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'MolecularProfileTextSegment', text: string } | { __typename: 'Variant', id: number, name: string, link: string }>, deprecatedVariants: Array<{ __typename: 'Variant', id: number, name: string, link: string }> } };
 
 export type MpExpressionEditorPrepopulateQueryVariables = Exact<{
   mpId: Scalars['Int'];
 }>;
 
 
-export type MpExpressionEditorPrepopulateQuery = { __typename: 'Query', molecularProfile?: { __typename: 'MolecularProfile', id: number, rawName: string, parsedName: Array<{ __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfileTextSegment', text: string } | { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean }> } | undefined };
+export type MpExpressionEditorPrepopulateQuery = { __typename: 'Query', molecularProfile?: { __typename: 'MolecularProfile', id: number, rawName: string, parsedName: Array<{ __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'MolecularProfileTextSegment', text: string } | { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean }> } | undefined };
 
 export type CreateMolecularProfile2MutationVariables = Exact<{
   mpStructure: MolecularProfileComponentInput;
@@ -7332,13 +7332,13 @@ export type CreateMolecularProfile2MutationVariables = Exact<{
 
 export type CreateMolecularProfile2Mutation = { __typename: 'Mutation', createMolecularProfile?: { __typename: 'CreateMolecularProfilePayload', molecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string } } | undefined };
 
-type PreviewMpName2_Gene_Fragment = { __typename: 'Gene', id: number, name: string, link: string };
+type PreviewMpName2_Feature_Fragment = { __typename: 'Feature', id: number, name: string, link: string };
 
 type PreviewMpName2_MolecularProfileTextSegment_Fragment = { __typename: 'MolecularProfileTextSegment', text: string };
 
 type PreviewMpName2_Variant_Fragment = { __typename: 'Variant', id: number, name: string, link: string };
 
-export type PreviewMpName2Fragment = PreviewMpName2_Gene_Fragment | PreviewMpName2_MolecularProfileTextSegment_Fragment | PreviewMpName2_Variant_Fragment;
+export type PreviewMpName2Fragment = PreviewMpName2_Feature_Fragment | PreviewMpName2_MolecularProfileTextSegment_Fragment | PreviewMpName2_Variant_Fragment;
 
 export type NccnGuidelineSelectTypeaheadQueryVariables = Exact<{
   name: Scalars['String'];
@@ -7510,9 +7510,9 @@ export type AssertionSummaryQueryVariables = Exact<{
 }>;
 
 
-export type AssertionSummaryQuery = { __typename: 'Query', assertion?: { __typename: 'Assertion', id: number, name: string, summary: string, description: string, status: EvidenceStatus, variantOrigin: VariantOrigin, assertionType: AssertionType, assertionDirection: AssertionDirection, significance: AssertionSignificance, therapyInteractionType?: TherapyInteraction | undefined, ampLevel?: AmpLevel | undefined, nccnGuidelineVersion?: string | undefined, regulatoryApproval?: boolean | undefined, regulatoryApprovalLastUpdated?: any | undefined, fdaCompanionTest?: boolean | undefined, fdaCompanionTestLastUpdated?: any | undefined, disease?: { __typename: 'Disease', id: number, name: string, link: string } | undefined, molecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, parsedName: Array<{ __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfileTextSegment', text: string } | { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean }> }, therapies: Array<{ __typename: 'Therapy', ncitId?: string | undefined, name: string, link: string, id: number }>, phenotypes: Array<{ __typename: 'Phenotype', id: number, name: string, link: string }>, acmgCodes: Array<{ __typename: 'AcmgCode', code: string, description: string }>, clingenCodes: Array<{ __typename: 'ClingenCode', id: number, code: string, description: string }>, nccnGuideline?: { __typename: 'NccnGuideline', id: number, name: string } | undefined, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, acceptanceEvent?: { __typename: 'Event', createdAt: any, originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, submissionEvent: { __typename: 'Event', createdAt: any, originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } }, rejectionEvent?: { __typename: 'Event', createdAt: any, originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, submissionActivity: { __typename: 'SubmitAssertionActivity', createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, profileImagePath?: string | undefined } } } | undefined };
+export type AssertionSummaryQuery = { __typename: 'Query', assertion?: { __typename: 'Assertion', id: number, name: string, summary: string, description: string, status: EvidenceStatus, variantOrigin: VariantOrigin, assertionType: AssertionType, assertionDirection: AssertionDirection, significance: AssertionSignificance, therapyInteractionType?: TherapyInteraction | undefined, ampLevel?: AmpLevel | undefined, nccnGuidelineVersion?: string | undefined, regulatoryApproval?: boolean | undefined, regulatoryApprovalLastUpdated?: any | undefined, fdaCompanionTest?: boolean | undefined, fdaCompanionTestLastUpdated?: any | undefined, disease?: { __typename: 'Disease', id: number, name: string, link: string } | undefined, molecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, parsedName: Array<{ __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'MolecularProfileTextSegment', text: string } | { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean }> }, therapies: Array<{ __typename: 'Therapy', ncitId?: string | undefined, name: string, link: string, id: number }>, phenotypes: Array<{ __typename: 'Phenotype', id: number, name: string, link: string }>, acmgCodes: Array<{ __typename: 'AcmgCode', code: string, description: string }>, clingenCodes: Array<{ __typename: 'ClingenCode', id: number, code: string, description: string }>, nccnGuideline?: { __typename: 'NccnGuideline', id: number, name: string } | undefined, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, acceptanceEvent?: { __typename: 'Event', createdAt: any, originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, submissionEvent: { __typename: 'Event', createdAt: any, originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } }, rejectionEvent?: { __typename: 'Event', createdAt: any, originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, submissionActivity: { __typename: 'SubmitAssertionActivity', createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, profileImagePath?: string | undefined } } } | undefined };
 
-export type AssertionSummaryFieldsFragment = { __typename: 'Assertion', id: number, name: string, summary: string, description: string, status: EvidenceStatus, variantOrigin: VariantOrigin, assertionType: AssertionType, assertionDirection: AssertionDirection, significance: AssertionSignificance, therapyInteractionType?: TherapyInteraction | undefined, ampLevel?: AmpLevel | undefined, nccnGuidelineVersion?: string | undefined, regulatoryApproval?: boolean | undefined, regulatoryApprovalLastUpdated?: any | undefined, fdaCompanionTest?: boolean | undefined, fdaCompanionTestLastUpdated?: any | undefined, disease?: { __typename: 'Disease', id: number, name: string, link: string } | undefined, molecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, parsedName: Array<{ __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfileTextSegment', text: string } | { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean }> }, therapies: Array<{ __typename: 'Therapy', ncitId?: string | undefined, name: string, link: string, id: number }>, phenotypes: Array<{ __typename: 'Phenotype', id: number, name: string, link: string }>, acmgCodes: Array<{ __typename: 'AcmgCode', code: string, description: string }>, clingenCodes: Array<{ __typename: 'ClingenCode', id: number, code: string, description: string }>, nccnGuideline?: { __typename: 'NccnGuideline', id: number, name: string } | undefined, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, acceptanceEvent?: { __typename: 'Event', createdAt: any, originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, submissionEvent: { __typename: 'Event', createdAt: any, originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } }, rejectionEvent?: { __typename: 'Event', createdAt: any, originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, submissionActivity: { __typename: 'SubmitAssertionActivity', createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, profileImagePath?: string | undefined } } };
+export type AssertionSummaryFieldsFragment = { __typename: 'Assertion', id: number, name: string, summary: string, description: string, status: EvidenceStatus, variantOrigin: VariantOrigin, assertionType: AssertionType, assertionDirection: AssertionDirection, significance: AssertionSignificance, therapyInteractionType?: TherapyInteraction | undefined, ampLevel?: AmpLevel | undefined, nccnGuidelineVersion?: string | undefined, regulatoryApproval?: boolean | undefined, regulatoryApprovalLastUpdated?: any | undefined, fdaCompanionTest?: boolean | undefined, fdaCompanionTestLastUpdated?: any | undefined, disease?: { __typename: 'Disease', id: number, name: string, link: string } | undefined, molecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, parsedName: Array<{ __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'MolecularProfileTextSegment', text: string } | { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean }> }, therapies: Array<{ __typename: 'Therapy', ncitId?: string | undefined, name: string, link: string, id: number }>, phenotypes: Array<{ __typename: 'Phenotype', id: number, name: string, link: string }>, acmgCodes: Array<{ __typename: 'AcmgCode', code: string, description: string }>, clingenCodes: Array<{ __typename: 'ClingenCode', id: number, code: string, description: string }>, nccnGuideline?: { __typename: 'NccnGuideline', id: number, name: string } | undefined, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, acceptanceEvent?: { __typename: 'Event', createdAt: any, originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, submissionEvent: { __typename: 'Event', createdAt: any, originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } }, rejectionEvent?: { __typename: 'Event', createdAt: any, originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, submissionActivity: { __typename: 'SubmitAssertionActivity', createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, profileImagePath?: string | undefined } } };
 
 export type ClinicalTrialDetailQueryVariables = Exact<{
   clinicalTrialId: Scalars['Int'];
@@ -7562,9 +7562,9 @@ export type EvidenceSummaryQueryVariables = Exact<{
 }>;
 
 
-export type EvidenceSummaryQuery = { __typename: 'Query', evidenceItem?: { __typename: 'EvidenceItem', id: number, name: string, description: string, status: EvidenceStatus, evidenceLevel: EvidenceLevel, evidenceType: EvidenceType, evidenceDirection: EvidenceDirection, significance: EvidenceSignificance, variantOrigin: VariantOrigin, therapyInteractionType?: TherapyInteraction | undefined, evidenceRating?: number | undefined, therapies: Array<{ __typename: 'Therapy', id: number, name: string, link: string }>, disease?: { __typename: 'Disease', id: number, name: string, link: string } | undefined, phenotypes: Array<{ __typename: 'Phenotype', id: number, name: string, link: string }>, source: { __typename: 'Source', id: number, citation?: string | undefined, citationId: string, sourceType: SourceSource, displayType: string, sourceUrl?: string | undefined, ascoAbstractId?: number | undefined, link: string, clinicalTrials?: Array<{ __typename: 'ClinicalTrial', nctId: string, id: number, link: string }> | undefined }, molecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, parsedName: Array<{ __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfileTextSegment', text: string } | { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean }> }, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, submissionActivity: { __typename: 'SubmitEvidenceItemActivity', createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', displayName: string, profileImagePath?: string | undefined, id: number, role: UserRole } }, acceptanceEvent?: { __typename: 'Event', createdAt: any, originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, submissionEvent: { __typename: 'Event', createdAt: any, originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } }, rejectionEvent?: { __typename: 'Event', createdAt: any, originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined } | undefined };
+export type EvidenceSummaryQuery = { __typename: 'Query', evidenceItem?: { __typename: 'EvidenceItem', id: number, name: string, description: string, status: EvidenceStatus, evidenceLevel: EvidenceLevel, evidenceType: EvidenceType, evidenceDirection: EvidenceDirection, significance: EvidenceSignificance, variantOrigin: VariantOrigin, therapyInteractionType?: TherapyInteraction | undefined, evidenceRating?: number | undefined, therapies: Array<{ __typename: 'Therapy', id: number, name: string, link: string }>, disease?: { __typename: 'Disease', id: number, name: string, link: string } | undefined, phenotypes: Array<{ __typename: 'Phenotype', id: number, name: string, link: string }>, source: { __typename: 'Source', id: number, citation?: string | undefined, citationId: string, sourceType: SourceSource, displayType: string, sourceUrl?: string | undefined, ascoAbstractId?: number | undefined, link: string, clinicalTrials?: Array<{ __typename: 'ClinicalTrial', nctId: string, id: number, link: string }> | undefined }, molecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, parsedName: Array<{ __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'MolecularProfileTextSegment', text: string } | { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean }> }, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, submissionActivity: { __typename: 'SubmitEvidenceItemActivity', createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', displayName: string, profileImagePath?: string | undefined, id: number, role: UserRole } }, acceptanceEvent?: { __typename: 'Event', createdAt: any, originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, submissionEvent: { __typename: 'Event', createdAt: any, originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } }, rejectionEvent?: { __typename: 'Event', createdAt: any, originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined } | undefined };
 
-export type EvidenceSummaryFieldsFragment = { __typename: 'EvidenceItem', id: number, name: string, description: string, status: EvidenceStatus, evidenceLevel: EvidenceLevel, evidenceType: EvidenceType, evidenceDirection: EvidenceDirection, significance: EvidenceSignificance, variantOrigin: VariantOrigin, therapyInteractionType?: TherapyInteraction | undefined, evidenceRating?: number | undefined, therapies: Array<{ __typename: 'Therapy', id: number, name: string, link: string }>, disease?: { __typename: 'Disease', id: number, name: string, link: string } | undefined, phenotypes: Array<{ __typename: 'Phenotype', id: number, name: string, link: string }>, source: { __typename: 'Source', id: number, citation?: string | undefined, citationId: string, sourceType: SourceSource, displayType: string, sourceUrl?: string | undefined, ascoAbstractId?: number | undefined, link: string, clinicalTrials?: Array<{ __typename: 'ClinicalTrial', nctId: string, id: number, link: string }> | undefined }, molecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, parsedName: Array<{ __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfileTextSegment', text: string } | { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean }> }, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, submissionActivity: { __typename: 'SubmitEvidenceItemActivity', createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', displayName: string, profileImagePath?: string | undefined, id: number, role: UserRole } }, acceptanceEvent?: { __typename: 'Event', createdAt: any, originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, submissionEvent: { __typename: 'Event', createdAt: any, originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } }, rejectionEvent?: { __typename: 'Event', createdAt: any, originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined };
+export type EvidenceSummaryFieldsFragment = { __typename: 'EvidenceItem', id: number, name: string, description: string, status: EvidenceStatus, evidenceLevel: EvidenceLevel, evidenceType: EvidenceType, evidenceDirection: EvidenceDirection, significance: EvidenceSignificance, variantOrigin: VariantOrigin, therapyInteractionType?: TherapyInteraction | undefined, evidenceRating?: number | undefined, therapies: Array<{ __typename: 'Therapy', id: number, name: string, link: string }>, disease?: { __typename: 'Disease', id: number, name: string, link: string } | undefined, phenotypes: Array<{ __typename: 'Phenotype', id: number, name: string, link: string }>, source: { __typename: 'Source', id: number, citation?: string | undefined, citationId: string, sourceType: SourceSource, displayType: string, sourceUrl?: string | undefined, ascoAbstractId?: number | undefined, link: string, clinicalTrials?: Array<{ __typename: 'ClinicalTrial', nctId: string, id: number, link: string }> | undefined }, molecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, parsedName: Array<{ __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'MolecularProfileTextSegment', text: string } | { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean }> }, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, submissionActivity: { __typename: 'SubmitEvidenceItemActivity', createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', displayName: string, profileImagePath?: string | undefined, id: number, role: UserRole } }, acceptanceEvent?: { __typename: 'Event', createdAt: any, originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, submissionEvent: { __typename: 'Event', createdAt: any, originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } }, rejectionEvent?: { __typename: 'Event', createdAt: any, originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined };
 
 export type FeatureDetailQueryVariables = Exact<{
   featureId: Scalars['Int'];
@@ -7616,19 +7616,19 @@ export type MolecularProfileSummaryQueryVariables = Exact<{
 }>;
 
 
-export type MolecularProfileSummaryQuery = { __typename: 'Query', molecularProfile?: { __typename: 'MolecularProfile', id: number, name: string, description?: string | undefined, molecularProfileAliases: Array<string>, molecularProfileScore: number, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceType: SourceSource }>, variants: Array<{ __typename: 'Variant', id: number, name: string, link: string, variantAliases: Array<string>, clinvarIds: Array<string>, alleleRegistryId?: string | undefined, openCravatUrl?: string | undefined, referenceBuild?: ReferenceBuild | undefined, ensemblVersion?: number | undefined, referenceBases?: string | undefined, variantBases?: string | undefined, hgvsDescriptions: Array<string>, gene: { __typename: 'Gene', id: number, name: string, link: string }, molecularProfiles: { __typename: 'MolecularProfileConnection', totalCount: number, nodes: Array<{ __typename: 'MolecularProfile', id: number, link: string, name: string, deprecated: boolean }> }, variantTypes: Array<{ __typename: 'VariantType', id: number, link: string, soid: string, name: string }>, primaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, secondaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined }>, parsedName: Array<{ __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfileTextSegment', text: string } | { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean }>, complexMolecularProfileCreationActivity?: { __typename: 'CreateComplexMolecularProfileActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, variantDeprecationActivity?: { __typename: 'DeprecateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, complexMolecularProfileDeprecationActivity?: { __typename: 'DeprecateComplexMolecularProfileActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined } | undefined };
+export type MolecularProfileSummaryQuery = { __typename: 'Query', molecularProfile?: { __typename: 'MolecularProfile', id: number, name: string, description?: string | undefined, molecularProfileAliases: Array<string>, molecularProfileScore: number, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceType: SourceSource }>, variants: Array<{ __typename: 'Variant', id: number, name: string, link: string, variantAliases: Array<string>, clinvarIds: Array<string>, alleleRegistryId?: string | undefined, openCravatUrl?: string | undefined, referenceBuild?: ReferenceBuild | undefined, ensemblVersion?: number | undefined, referenceBases?: string | undefined, variantBases?: string | undefined, hgvsDescriptions: Array<string>, feature: { __typename: 'Feature', id: number, name: string, link: string }, molecularProfiles: { __typename: 'MolecularProfileConnection', totalCount: number, nodes: Array<{ __typename: 'MolecularProfile', id: number, link: string, name: string, deprecated: boolean }> }, variantTypes: Array<{ __typename: 'VariantType', id: number, link: string, soid: string, name: string }>, primaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, secondaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined }>, parsedName: Array<{ __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'MolecularProfileTextSegment', text: string } | { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean }>, complexMolecularProfileCreationActivity?: { __typename: 'CreateComplexMolecularProfileActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, variantDeprecationActivity?: { __typename: 'DeprecateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, complexMolecularProfileDeprecationActivity?: { __typename: 'DeprecateComplexMolecularProfileActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined } | undefined };
 
-export type MolecularProfileSummaryFieldsFragment = { __typename: 'MolecularProfile', id: number, name: string, description?: string | undefined, molecularProfileAliases: Array<string>, molecularProfileScore: number, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceType: SourceSource }>, variants: Array<{ __typename: 'Variant', id: number, name: string, link: string, variantAliases: Array<string>, clinvarIds: Array<string>, alleleRegistryId?: string | undefined, openCravatUrl?: string | undefined, referenceBuild?: ReferenceBuild | undefined, ensemblVersion?: number | undefined, referenceBases?: string | undefined, variantBases?: string | undefined, hgvsDescriptions: Array<string>, gene: { __typename: 'Gene', id: number, name: string, link: string }, molecularProfiles: { __typename: 'MolecularProfileConnection', totalCount: number, nodes: Array<{ __typename: 'MolecularProfile', id: number, link: string, name: string, deprecated: boolean }> }, variantTypes: Array<{ __typename: 'VariantType', id: number, link: string, soid: string, name: string }>, primaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, secondaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined }>, parsedName: Array<{ __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfileTextSegment', text: string } | { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean }>, complexMolecularProfileCreationActivity?: { __typename: 'CreateComplexMolecularProfileActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, variantDeprecationActivity?: { __typename: 'DeprecateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, complexMolecularProfileDeprecationActivity?: { __typename: 'DeprecateComplexMolecularProfileActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined };
+export type MolecularProfileSummaryFieldsFragment = { __typename: 'MolecularProfile', id: number, name: string, description?: string | undefined, molecularProfileAliases: Array<string>, molecularProfileScore: number, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceType: SourceSource }>, variants: Array<{ __typename: 'Variant', id: number, name: string, link: string, variantAliases: Array<string>, clinvarIds: Array<string>, alleleRegistryId?: string | undefined, openCravatUrl?: string | undefined, referenceBuild?: ReferenceBuild | undefined, ensemblVersion?: number | undefined, referenceBases?: string | undefined, variantBases?: string | undefined, hgvsDescriptions: Array<string>, feature: { __typename: 'Feature', id: number, name: string, link: string }, molecularProfiles: { __typename: 'MolecularProfileConnection', totalCount: number, nodes: Array<{ __typename: 'MolecularProfile', id: number, link: string, name: string, deprecated: boolean }> }, variantTypes: Array<{ __typename: 'VariantType', id: number, link: string, soid: string, name: string }>, primaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, secondaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined }>, parsedName: Array<{ __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'MolecularProfileTextSegment', text: string } | { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean }>, complexMolecularProfileCreationActivity?: { __typename: 'CreateComplexMolecularProfileActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, variantDeprecationActivity?: { __typename: 'DeprecateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, complexMolecularProfileDeprecationActivity?: { __typename: 'DeprecateComplexMolecularProfileActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined };
 
-type MolecularProfileParsedName_Gene_Fragment = { __typename: 'Gene', id: number, name: string, link: string };
+type MolecularProfileParsedName_Feature_Fragment = { __typename: 'Feature', id: number, name: string, link: string };
 
 type MolecularProfileParsedName_MolecularProfileTextSegment_Fragment = { __typename: 'MolecularProfileTextSegment', text: string };
 
 type MolecularProfileParsedName_Variant_Fragment = { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean };
 
-export type MolecularProfileParsedNameFragment = MolecularProfileParsedName_Gene_Fragment | MolecularProfileParsedName_MolecularProfileTextSegment_Fragment | MolecularProfileParsedName_Variant_Fragment;
+export type MolecularProfileParsedNameFragment = MolecularProfileParsedName_Feature_Fragment | MolecularProfileParsedName_MolecularProfileTextSegment_Fragment | MolecularProfileParsedName_Variant_Fragment;
 
-export type VariantMolecularProfileCardFieldsFragment = { __typename: 'Variant', id: number, name: string, link: string, variantAliases: Array<string>, clinvarIds: Array<string>, alleleRegistryId?: string | undefined, openCravatUrl?: string | undefined, referenceBuild?: ReferenceBuild | undefined, ensemblVersion?: number | undefined, referenceBases?: string | undefined, variantBases?: string | undefined, hgvsDescriptions: Array<string>, gene: { __typename: 'Gene', id: number, name: string, link: string }, molecularProfiles: { __typename: 'MolecularProfileConnection', totalCount: number, nodes: Array<{ __typename: 'MolecularProfile', id: number, link: string, name: string, deprecated: boolean }> }, variantTypes: Array<{ __typename: 'VariantType', id: number, link: string, soid: string, name: string }>, primaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, secondaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined };
+export type VariantMolecularProfileCardFieldsFragment = { __typename: 'Variant', id: number, name: string, link: string, variantAliases: Array<string>, clinvarIds: Array<string>, alleleRegistryId?: string | undefined, openCravatUrl?: string | undefined, referenceBuild?: ReferenceBuild | undefined, ensemblVersion?: number | undefined, referenceBases?: string | undefined, variantBases?: string | undefined, hgvsDescriptions: Array<string>, feature: { __typename: 'Feature', id: number, name: string, link: string }, molecularProfiles: { __typename: 'MolecularProfileConnection', totalCount: number, nodes: Array<{ __typename: 'MolecularProfile', id: number, link: string, name: string, deprecated: boolean }> }, variantTypes: Array<{ __typename: 'VariantType', id: number, link: string, soid: string, name: string }>, primaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, secondaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined };
 
 export type OrganizationDetailQueryVariables = Exact<{
   organizationId: Scalars['Int'];
@@ -7892,7 +7892,7 @@ export const MolecularProfileParsedNameFragmentDoc = gql`
   ... on MolecularProfileTextSegment {
     text
   }
-  ... on Gene {
+  ... on Feature {
     id
     name
     link
@@ -8470,7 +8470,7 @@ export const MolecularProfilePopoverFieldsFragmentDoc = gql`
     ... on MolecularProfileTextSegment {
       text
     }
-    ... on Gene {
+    ... on Feature {
       id
       name
       link
@@ -9407,7 +9407,7 @@ export const PreviewMpName2FragmentDoc = gql`
   ... on MolecularProfileTextSegment {
     text
   }
-  ... on Gene {
+  ... on Feature {
     id
     name
     link
@@ -9921,7 +9921,7 @@ export const VariantMolecularProfileCardFieldsFragmentDoc = gql`
   id
   name
   link
-  gene {
+  feature {
     id
     name
     link
diff --git a/client/src/app/generated/civic.possible-types.ts b/client/src/app/generated/civic.possible-types.ts
index 13c50559a..5b1a08385 100644
--- a/client/src/app/generated/civic.possible-types.ts
+++ b/client/src/app/generated/civic.possible-types.ts
@@ -92,7 +92,7 @@
       "Variant"
     ],
     "MolecularProfileSegment": [
-      "Gene",
+      "Feature",
       "MolecularProfileTextSegment",
       "Variant"
     ],
diff --git a/client/src/app/generated/server.model.graphql b/client/src/app/generated/server.model.graphql
index 3a102a52b..11d96b40b 100644
--- a/client/src/app/generated/server.model.graphql
+++ b/client/src/app/generated/server.model.graphql
@@ -4550,7 +4550,7 @@ type MolecularProfileNamePreview {
 A segment of a molecular profile. Either a string representing a boolean
 operator or a tag component representing a gene or variant
 """
-union MolecularProfileSegment = Gene | MolecularProfileTextSegment | Variant
+union MolecularProfileSegment = Feature | MolecularProfileTextSegment | Variant
 
 type MolecularProfileTextSegment {
   text: String!
diff --git a/client/src/app/generated/server.schema.json b/client/src/app/generated/server.schema.json
index 84edde296..c490aff71 100644
--- a/client/src/app/generated/server.schema.json
+++ b/client/src/app/generated/server.schema.json
@@ -3696,7 +3696,7 @@
               "deprecationReason": null
             },
             {
-              "name": "geneNames",
+              "name": "features",
               "description": null,
               "args": [],
               "type": {
@@ -21776,7 +21776,7 @@
           "possibleTypes": [
             {
               "kind": "OBJECT",
-              "name": "Gene",
+              "name": "Feature",
               "ofType": null
             },
             {
diff --git a/client/src/app/views/molecular-profiles/molecular-profiles-detail/molecular-profiles-summary/molecular-profiles-summary.query.gql b/client/src/app/views/molecular-profiles/molecular-profiles-detail/molecular-profiles-summary/molecular-profiles-summary.query.gql
index 20749ec38..cd59f2f04 100644
--- a/client/src/app/views/molecular-profiles/molecular-profiles-detail/molecular-profiles-summary/molecular-profiles-summary.query.gql
+++ b/client/src/app/views/molecular-profiles/molecular-profiles-detail/molecular-profiles-summary/molecular-profiles-summary.query.gql
@@ -56,7 +56,7 @@ fragment MolecularProfileParsedName on MolecularProfileSegment {
   ... on MolecularProfileTextSegment {
     text
   }
-  ... on Gene {
+  ... on Feature {
     id
     name
     link
@@ -73,7 +73,7 @@ fragment VariantMolecularProfileCardFields on Variant {
   id
   name
   link
-  gene {
+  feature {
     id
     name
     link
diff --git a/server/app/graphql/loaders/molecular_profile_segments_loader.rb b/server/app/graphql/loaders/molecular_profile_segments_loader.rb
index 15b5a2722..a3f5506af 100644
--- a/server/app/graphql/loaders/molecular_profile_segments_loader.rb
+++ b/server/app/graphql/loaders/molecular_profile_segments_loader.rb
@@ -1,42 +1,38 @@
 module Loaders
   class MolecularProfileSegmentsLoader < GraphQL::Batch::Loader
-    GENE_REGEX = /#GID(?<id>\d+)/i
-    VARIANT_REGEX = /#VID(?<id>\d+)/i
-
     def initialize(model)
       @model = model
     end
 
     def perform(ids)
       mps = {}
-      resolved_genes = {}
+      resolved_features = {}
       resolved_variants = {}
 
       MolecularProfile.where(id: ids).each do |mp|
         mps[mp.id] = mp.name.split(' ').map do |segment|
-          if gene_match = segment.match(GENE_REGEX)
-            gene_id = gene_match[:id].to_i
-            resolved_genes[gene_id] = nil
-            ->(genes, vars) { genes[gene_id] }
-          elsif variant_match = segment.match(VARIANT_REGEX)
+          if gene_match = segment.match(MolecularProfile::GENE_REGEX)
+            nil
+          elsif variant_match = segment.match(MolecularProfile::VARIANT_REGEX)
             variant_id = variant_match[:id].to_i
             resolved_variants[variant_id] = nil
-            ->(genes, vars) { vars[variant_id] }
+            ->(features, vars) { [ features[vars[variant_id].feature_id], vars[variant_id] ] }
           else
-            ->(genes, vars) { segment }
+            ->(features, vars) { segment }
           end
         end
+          .compact
       end
 
       Variant.where(id: resolved_variants.keys)
         .each { |v| resolved_variants[v.id] = v }
 
-      Features::Gene.where(id: resolved_genes.keys)
-        .each { |g| resolved_genes[g.id] = g }
+      Feature.where(id: resolved_variants.map{|id, v| v.feature_id})
+        .each { |f| resolved_features[f.id] = f }
 
       ids.each do |id|
         if mp = mps[id]
-          segments = mp.map { |s| s.call(resolved_genes, resolved_variants) }
+          segments = mp.flat_map { |s| s.call(resolved_features, resolved_variants) }
           fulfill(id, segments)
         else
           fulfill(id, nil)
diff --git a/server/app/graphql/types/interfaces/molecular_profile_component.rb b/server/app/graphql/types/interfaces/molecular_profile_component.rb
index ed6dc3f76..a93a02fe0 100644
--- a/server/app/graphql/types/interfaces/molecular_profile_component.rb
+++ b/server/app/graphql/types/interfaces/molecular_profile_component.rb
@@ -21,8 +21,8 @@ def name
     definition_methods do
       def resolve_type(object, context)
         case object
-        when Features::Gene
-          Types::Entities::GeneType
+        when Feature
+          Types::Entities::FeatureType
         when Variant
           Types::Entities::VariantType
         else
diff --git a/server/app/graphql/types/molecular_profile/molecular_profile_segment_type.rb b/server/app/graphql/types/molecular_profile/molecular_profile_segment_type.rb
index 2c9ae0c5c..b554626ff 100644
--- a/server/app/graphql/types/molecular_profile/molecular_profile_segment_type.rb
+++ b/server/app/graphql/types/molecular_profile/molecular_profile_segment_type.rb
@@ -11,7 +11,7 @@ class MolecularProfileSegmentType < Types::BaseUnion
 
     description "A segment of a molecular profile. Either a string representing a boolean operator or a tag component representing a gene or variant"
     possible_types Types::MolecularProfile::MolecularProfileTextSegment,
-      "Types::Entities::GeneType",
+      Types::Entities::FeatureType,
       Types::Entities::VariantType
 
 
@@ -19,8 +19,8 @@ class MolecularProfileSegmentType < Types::BaseUnion
     def self.resolve_type(object, context)
       if object.is_a?(String)
         Types::MolecularProfile::MolecularProfileTextSegment
-      elsif object.is_a?(Features::Gene)
-        ::Types::Entities::GeneType
+      elsif object.is_a?(Feature)
+        ::Types::Entities::FeatureType
       elsif object.is_a?(Variant)
         Types::Entities::VariantType
       else
diff --git a/server/app/models/molecular_profile.rb b/server/app/models/molecular_profile.rb
index 32feb8f79..4af3c1556 100644
--- a/server/app/models/molecular_profile.rb
+++ b/server/app/models/molecular_profile.rb
@@ -82,13 +82,17 @@ def segments
     #TODO - we could batch these queries if it becomes an issue
     @segments ||= name.split(' ').map do |segment|
       if gene_match = segment.match(GENE_REGEX)
-        Features::Gene.find(gene_match[:id])
+        nil
       elsif variant_match = segment.match(VARIANT_REGEX)
-        Variant.find(variant_match[:id])
+        v = Variant.find(variant_match[:id])
+        g = Feature.find(v.feature_id)
+        [v, g]
       else
         segment
       end
+        .flatten
     end
+    @segements ||= s.flatten
   end
 
   def self.timepoint_query

From 013167c06fd6f45a97ab82366268f767a46a433a Mon Sep 17 00:00:00 2001
From: Susanna Kiwala <susanna.kiwala@wustl.edu>
Date: Fri, 15 Dec 2023 10:10:27 -0600
Subject: [PATCH 010/125] Update DiseaseBrowseTable to use Feature tag pileups
 instead of Gene name list

---
 .../diseases-table.component.html             | 26 +++----
 .../diseases-table.component.ts               |  6 +-
 .../diseases-table/diseases-table.module.ts   |  2 +
 .../diseases-table/diseases-table.query.gql   | 12 ++--
 .../tag-overflow/tag-overflow.component.html  |  5 ++
 .../tag-overflow/tag-overflow.component.ts    |  2 +-
 .../tag-overflow/tag-overflow.module.ts       |  2 +
 .../src/app/generated/civic.apollo-helpers.ts | 16 ++++-
 client/src/app/generated/civic.apollo.ts      | 31 ++++++---
 client/src/app/generated/server.model.graphql | 14 ++--
 client/src/app/generated/server.schema.json   | 69 +++++++++++++++++--
 .../app/graphql/resolvers/browse_diseases.rb  | 14 ++--
 .../browse_tables/browse_disease_type.rb      | 16 ++++-
 .../browse_tables/diseases_sort_columns.rb    |  2 +-
 ..._disease_browse_table_rows_to_version_6.rb |  8 +++
 server/db/schema.rb                           | 48 ++++++-------
 .../views/disease_browse_table_rows_v06.sql   | 20 ++++++
 17 files changed, 215 insertions(+), 78 deletions(-)
 create mode 100644 server/db/migrate/20231214182017_update_disease_browse_table_rows_to_version_6.rb
 create mode 100644 server/db/views/disease_browse_table_rows_v06.sql

diff --git a/client/src/app/components/diseases/diseases-table/diseases-table.component.html b/client/src/app/components/diseases/diseases-table/diseases-table.component.html
index 634df1d8a..3aaee05f5 100644
--- a/client/src/app/components/diseases/diseases-table/diseases-table.component.html
+++ b/client/src/app/components/diseases/diseases-table/diseases-table.component.html
@@ -59,16 +59,16 @@
           [nzSortFn]="true">
           DOID
         </th>
-        <th nzWidth="400px">Genes</th>
+        <th nzWidth="400px">Features</th>
         <th
           nzWidth="75px"
           nzRight
           nzAlign="right"
-          [nzColumnKey]="sortColumns.GeneCount"
+          [nzColumnKey]="sortColumns.FeatureCount"
           [nzSortFn]="true"
           [nzSortDirections]="['descend', 'ascend', null]"
           nz-tooltip
-          nzTooltipTitle="Gene Count">
+          nzTooltipTitle="Feature Count">
           <i
             nz-icon
             nzType="civic-gene"></i>
@@ -133,7 +133,7 @@
         </th>
         <th>
           <cvc-clearable-input-filter
-            [(inputModel)]="geneNameInput"
+            [(inputModel)]="featureNameInput"
             (inputModelChange)="
               filterChange$.next()
             "></cvc-clearable-input-filter>
@@ -164,21 +164,17 @@
             <ng-template #noDoid> -- </ng-template>
           </td>
           <td
-            class="overflow-ellipsis"
-            nz-tooltip
-            [nzTooltipTitle]="!isScrolling ? geneNames : ''">
-            <ng-template #geneNames>
-              <ng-container
-                *ngFor="let gene of disease.geneNames; last as isLast">
-                {{ gene }}{{ isLast ? '' : ', ' }}
-              </ng-container>
-            </ng-template>
-            <ng-container [ngTemplateOutlet]="geneNames"></ng-container>
+            class="overflow-ellipsis">
+            <cvc-tag-overflow tagType="feature"
+              [tags]="disease.features"
+              [maxDisplayCount]="5"
+              [matchingText]="featureNameInput">
+            </cvc-tag-overflow>
           </td>
           <td
             nzRight
             nzAlign="right">
-            {{ disease.geneCount }}
+            {{ disease.featureCount }}
           </td>
           <td
             nzRight
diff --git a/client/src/app/components/diseases/diseases-table/diseases-table.component.ts b/client/src/app/components/diseases/diseases-table/diseases-table.component.ts
index d5e2c8faa..d876b94d8 100644
--- a/client/src/app/components/diseases/diseases-table/diseases-table.component.ts
+++ b/client/src/app/components/diseases/diseases-table/diseases-table.component.ts
@@ -39,7 +39,7 @@ import { pluck } from 'rxjs-etc/operators'
 
 export interface DiseasesTableUserFilters {
   nameInput?: Maybe<string>
-  geneNameInput?: Maybe<string>
+  featureNameInput?: Maybe<string>
   doidInput?: Maybe<string>
 }
 
@@ -83,7 +83,7 @@ export class CvcDiseasesTableComponent implements OnInit {
   isScrolling = false
   //filters
   nameInput: Maybe<string>
-  geneNameInput: Maybe<string>
+  featureNameInput: Maybe<string>
   doidInput: Maybe<string>
 
   sortColumns: typeof DiseasesSortColumns = DiseasesSortColumns
@@ -183,7 +183,7 @@ export class CvcDiseasesTableComponent implements OnInit {
     this.queryRef
       .refetch({
         name: this.nameInput,
-        geneNames: this.geneNameInput,
+        featureName: this.featureNameInput,
         doid: this.doidInput,
       })
       .then(() => this.scrollIndex$.next(0))
diff --git a/client/src/app/components/diseases/diseases-table/diseases-table.module.ts b/client/src/app/components/diseases/diseases-table/diseases-table.module.ts
index 029f87480..795e86c46 100644
--- a/client/src/app/components/diseases/diseases-table/diseases-table.module.ts
+++ b/client/src/app/components/diseases/diseases-table/diseases-table.module.ts
@@ -4,6 +4,7 @@ import { CvcClearableInputFilterModule } from '@app/components/shared/clearable-
 import { CvcLinkTagModule } from '@app/components/shared/link-tag/link-tag.module'
 import { CvcNoMoreRowsModule } from '@app/components/shared/no-more-rows/no-more-rows.module'
 import { CvcTableCountsModule } from '@app/components/shared/table-counts/table-counts.module'
+import { CvcTagOverflowModule } from '@app/components/shared/tag-overflow/tag-overflow.module'
 import { CvcPipesModule } from '@app/core/pipes/pipes.module'
 import { CvcAutoHeightCardModule } from '@app/directives/auto-height-card/auto-height-card.module'
 import { CvcAutoHeightTableModule } from '@app/directives/auto-height-table/auto-height-table.module'
@@ -44,6 +45,7 @@ import { CvcDiseasesTableComponent } from './diseases-table.component'
     CvcNoMoreRowsModule,
     CvcTableCountsModule,
     CvcTableScrollModule,
+    CvcTagOverflowModule,
   ],
   exports: [CvcDiseasesTableComponent],
 })
diff --git a/client/src/app/components/diseases/diseases-table/diseases-table.query.gql b/client/src/app/components/diseases/diseases-table/diseases-table.query.gql
index cffc58d6e..611e55fb7 100644
--- a/client/src/app/components/diseases/diseases-table/diseases-table.query.gql
+++ b/client/src/app/components/diseases/diseases-table/diseases-table.query.gql
@@ -6,7 +6,7 @@ query BrowseDiseases(
   $sortBy: DiseasesSort
   $name: String
   $doid: String
-  $geneNames: String
+  $featureName: String
 ) {
   browseDiseases(
     first: $first
@@ -16,7 +16,7 @@ query BrowseDiseases(
     sortBy: $sortBy
     name: $name
     doid: $doid
-    geneNames: $geneNames
+    featureName: $featureName
   ) {
     pageInfo {
       endCursor
@@ -42,10 +42,14 @@ fragment BrowseDiseaseRowFields on BrowseDisease {
   name
   doid
   diseaseUrl
-  geneNames
+  features {
+    id
+    name
+    link
+  }
   assertionCount
   evidenceItemCount
   variantCount
-  geneCount
+  featureCount
   link
 }
diff --git a/client/src/app/components/shared/tag-overflow/tag-overflow.component.html b/client/src/app/components/shared/tag-overflow/tag-overflow.component.html
index 10d238e45..016e895b1 100644
--- a/client/src/app/components/shared/tag-overflow/tag-overflow.component.html
+++ b/client/src/app/components/shared/tag-overflow/tag-overflow.component.html
@@ -65,6 +65,11 @@
         [gene]="tag"
         [truncateLongName]="true"></cvc-gene-tag>
     </ng-container>
+    <ng-container *ngSwitchCase="'feature'">
+      <cvc-feature-tag
+        [feature]="tag"
+        [truncateLongName]="true"></cvc-feature-tag>
+    </ng-container>
     <ng-container *ngSwitchCase="'organization'">
       <cvc-organization-tag [org]="tag"></cvc-organization-tag>
     </ng-container>
diff --git a/client/src/app/components/shared/tag-overflow/tag-overflow.component.ts b/client/src/app/components/shared/tag-overflow/tag-overflow.component.ts
index ab3bd310f..56a125bfb 100644
--- a/client/src/app/components/shared/tag-overflow/tag-overflow.component.ts
+++ b/client/src/app/components/shared/tag-overflow/tag-overflow.component.ts
@@ -8,7 +8,7 @@ import {
 } from '@angular/core'
 import { Maybe } from '@app/generated/civic.apollo'
 
-export type SupportedPileupTags = 'therapy' | 'disease' | 'gene' | 'organization' | 'variant' | 'variant-type'
+export type SupportedPileupTags = 'therapy' | 'disease' | 'gene' | 'feature' | 'organization' | 'variant' | 'variant-type'
 
 export type TagInfo = {
   id: number
diff --git a/client/src/app/components/shared/tag-overflow/tag-overflow.module.ts b/client/src/app/components/shared/tag-overflow/tag-overflow.module.ts
index 2a5c7677c..aead22e79 100644
--- a/client/src/app/components/shared/tag-overflow/tag-overflow.module.ts
+++ b/client/src/app/components/shared/tag-overflow/tag-overflow.module.ts
@@ -10,6 +10,7 @@ import { CvcGeneTagModule } from '@app/components/genes/gene-tag/gene-tag.module
 import { CvcVariantTagModule } from '@app/components/variants/variant-tag/variant-tag.module'
 import { CvcTherapyTagModule } from '@app/components/therapies/cvc-therapy-tag/cvc-therapy-tag.module'
 import { CvcVariantTypeTagModule } from '@app/components/variant-types/variant-type-tag/variant-type-tag.module'
+import { CvcFeatureTagModule } from '@app/components/features/feature-tag/feature-tag.module'
 
 @NgModule({
   declarations: [CvcTagOverflowComponent],
@@ -22,6 +23,7 @@ import { CvcVariantTypeTagModule } from '@app/components/variant-types/variant-t
     CvcDiseaseTagModule,
     CvcOrganizationTagModule,
     CvcGeneTagModule,
+    CvcFeatureTagModule,
     CvcVariantTagModule,
     CvcVariantTypeTagModule,
   ],
diff --git a/client/src/app/generated/civic.apollo-helpers.ts b/client/src/app/generated/civic.apollo-helpers.ts
index b5ffc699c..87fe37b75 100644
--- a/client/src/app/generated/civic.apollo-helpers.ts
+++ b/client/src/app/generated/civic.apollo-helpers.ts
@@ -159,15 +159,15 @@ export type BrowseClinicalTrialEdgeFieldPolicy = {
 	cursor?: FieldPolicy<any> | FieldReadFunction<any>,
 	node?: FieldPolicy<any> | FieldReadFunction<any>
 };
-export type BrowseDiseaseKeySpecifier = ('assertionCount' | 'diseaseUrl' | 'displayName' | 'doid' | 'evidenceItemCount' | 'geneCount' | 'geneNames' | 'id' | 'link' | 'name' | 'variantCount' | BrowseDiseaseKeySpecifier)[];
+export type BrowseDiseaseKeySpecifier = ('assertionCount' | 'diseaseUrl' | 'displayName' | 'doid' | 'evidenceItemCount' | 'featureCount' | 'features' | 'id' | 'link' | 'name' | 'variantCount' | BrowseDiseaseKeySpecifier)[];
 export type BrowseDiseaseFieldPolicy = {
 	assertionCount?: FieldPolicy<any> | FieldReadFunction<any>,
 	diseaseUrl?: FieldPolicy<any> | FieldReadFunction<any>,
 	displayName?: FieldPolicy<any> | FieldReadFunction<any>,
 	doid?: FieldPolicy<any> | FieldReadFunction<any>,
 	evidenceItemCount?: FieldPolicy<any> | FieldReadFunction<any>,
-	geneCount?: FieldPolicy<any> | FieldReadFunction<any>,
-	geneNames?: FieldPolicy<any> | FieldReadFunction<any>,
+	featureCount?: FieldPolicy<any> | FieldReadFunction<any>,
+	features?: FieldPolicy<any> | FieldReadFunction<any>,
 	id?: FieldPolicy<any> | FieldReadFunction<any>,
 	link?: FieldPolicy<any> | FieldReadFunction<any>,
 	name?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -1013,6 +1013,12 @@ export type LinkableDiseaseFieldPolicy = {
 	link?: FieldPolicy<any> | FieldReadFunction<any>,
 	name?: FieldPolicy<any> | FieldReadFunction<any>
 };
+export type LinkableFeatureKeySpecifier = ('id' | 'link' | 'name' | LinkableFeatureKeySpecifier)[];
+export type LinkableFeatureFieldPolicy = {
+	id?: FieldPolicy<any> | FieldReadFunction<any>,
+	link?: FieldPolicy<any> | FieldReadFunction<any>,
+	name?: FieldPolicy<any> | FieldReadFunction<any>
+};
 export type LinkableGeneKeySpecifier = ('id' | 'link' | 'name' | LinkableGeneKeySpecifier)[];
 export type LinkableGeneFieldPolicy = {
 	id?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -2486,6 +2492,10 @@ export type StrictTypedTypePolicies = {
 		keyFields?: false | LinkableDiseaseKeySpecifier | (() => undefined | LinkableDiseaseKeySpecifier),
 		fields?: LinkableDiseaseFieldPolicy,
 	},
+	LinkableFeature?: Omit<TypePolicy, "fields" | "keyFields"> & {
+		keyFields?: false | LinkableFeatureKeySpecifier | (() => undefined | LinkableFeatureKeySpecifier),
+		fields?: LinkableFeatureFieldPolicy,
+	},
 	LinkableGene?: Omit<TypePolicy, "fields" | "keyFields"> & {
 		keyFields?: false | LinkableGeneKeySpecifier | (() => undefined | LinkableGeneKeySpecifier),
 		fields?: LinkableGeneFieldPolicy,
diff --git a/client/src/app/generated/civic.apollo.ts b/client/src/app/generated/civic.apollo.ts
index ef6b08b2a..7bf1c5610 100644
--- a/client/src/app/generated/civic.apollo.ts
+++ b/client/src/app/generated/civic.apollo.ts
@@ -492,8 +492,8 @@ export type BrowseDisease = {
   displayName: Scalars['String'];
   doid?: Maybe<Scalars['String']>;
   evidenceItemCount: Scalars['Int'];
-  geneCount: Scalars['Int'];
-  geneNames: Array<Scalars['String']>;
+  featureCount: Scalars['Int'];
+  features: Array<LinkableFeature>;
   id: Scalars['Int'];
   link: Scalars['String'];
   name: Scalars['String'];
@@ -1412,7 +1412,7 @@ export enum DiseasesSortColumns {
   AssertionCount = 'ASSERTION_COUNT',
   Doid = 'DOID',
   EvidenceItemCount = 'EVIDENCE_ITEM_COUNT',
-  GeneCount = 'GENE_COUNT',
+  FeatureCount = 'FEATURE_COUNT',
   Name = 'NAME',
   VariantCount = 'VARIANT_COUNT'
 }
@@ -2406,6 +2406,13 @@ export type LinkableDisease = {
   name: Scalars['String'];
 };
 
+export type LinkableFeature = {
+  __typename: 'LinkableFeature';
+  id: Scalars['Int'];
+  link: Scalars['String'];
+  name: Scalars['String'];
+};
+
 export type LinkableGene = {
   __typename: 'LinkableGene';
   id: Scalars['Int'];
@@ -6165,13 +6172,13 @@ export type BrowseDiseasesQueryVariables = Exact<{
   sortBy?: InputMaybe<DiseasesSort>;
   name?: InputMaybe<Scalars['String']>;
   doid?: InputMaybe<Scalars['String']>;
-  geneNames?: InputMaybe<Scalars['String']>;
+  featureName?: InputMaybe<Scalars['String']>;
 }>;
 
 
-export type BrowseDiseasesQuery = { __typename: 'Query', browseDiseases: { __typename: 'BrowseDiseaseConnection', lastUpdated: any, totalCount: number, filteredCount: number, pageCount: number, pageInfo: { __typename: 'PageInfo', endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean, startCursor?: string | undefined }, edges: Array<{ __typename: 'BrowseDiseaseEdge', cursor: string, node?: { __typename: 'BrowseDisease', id: number, name: string, doid?: string | undefined, diseaseUrl?: string | undefined, geneNames: Array<string>, assertionCount: number, evidenceItemCount: number, variantCount: number, geneCount: number, link: string } | undefined }> } };
+export type BrowseDiseasesQuery = { __typename: 'Query', browseDiseases: { __typename: 'BrowseDiseaseConnection', lastUpdated: any, totalCount: number, filteredCount: number, pageCount: number, pageInfo: { __typename: 'PageInfo', endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean, startCursor?: string | undefined }, edges: Array<{ __typename: 'BrowseDiseaseEdge', cursor: string, node?: { __typename: 'BrowseDisease', id: number, name: string, doid?: string | undefined, diseaseUrl?: string | undefined, assertionCount: number, evidenceItemCount: number, variantCount: number, featureCount: number, link: string, features: Array<{ __typename: 'LinkableFeature', id: number, name: string, link: string }> } | undefined }> } };
 
-export type BrowseDiseaseRowFieldsFragment = { __typename: 'BrowseDisease', id: number, name: string, doid?: string | undefined, diseaseUrl?: string | undefined, geneNames: Array<string>, assertionCount: number, evidenceItemCount: number, variantCount: number, geneCount: number, link: string };
+export type BrowseDiseaseRowFieldsFragment = { __typename: 'BrowseDisease', id: number, name: string, doid?: string | undefined, diseaseUrl?: string | undefined, assertionCount: number, evidenceItemCount: number, variantCount: number, featureCount: number, link: string, features: Array<{ __typename: 'LinkableFeature', id: number, name: string, link: string }> };
 
 export type EventFeedCountQueryVariables = Exact<{
   subject?: InputMaybe<SubscribableQueryInput>;
@@ -8094,11 +8101,15 @@ export const BrowseDiseaseRowFieldsFragmentDoc = gql`
   name
   doid
   diseaseUrl
-  geneNames
+  features {
+    id
+    name
+    link
+  }
   assertionCount
   evidenceItemCount
   variantCount
-  geneCount
+  featureCount
   link
 }
     `;
@@ -10835,7 +10846,7 @@ export const DiseasePopoverDocument = gql`
     }
   }
 export const BrowseDiseasesDocument = gql`
-    query BrowseDiseases($first: Int, $last: Int, $before: String, $after: String, $sortBy: DiseasesSort, $name: String, $doid: String, $geneNames: String) {
+    query BrowseDiseases($first: Int, $last: Int, $before: String, $after: String, $sortBy: DiseasesSort, $name: String, $doid: String, $featureName: String) {
   browseDiseases(
     first: $first
     last: $last
@@ -10844,7 +10855,7 @@ export const BrowseDiseasesDocument = gql`
     sortBy: $sortBy
     name: $name
     doid: $doid
-    geneNames: $geneNames
+    featureName: $featureName
   ) {
     pageInfo {
       endCursor
diff --git a/client/src/app/generated/server.model.graphql b/client/src/app/generated/server.model.graphql
index 11d96b40b..57b100748 100644
--- a/client/src/app/generated/server.model.graphql
+++ b/client/src/app/generated/server.model.graphql
@@ -815,8 +815,8 @@ type BrowseDisease {
   displayName: String!
   doid: String
   evidenceItemCount: Int!
-  geneCount: Int!
-  geneNames: [String!]!
+  featureCount: Int!
+  features: [LinkableFeature!]!
   id: Int!
   link: String!
   name: String!
@@ -2215,7 +2215,7 @@ enum DiseasesSortColumns {
   ASSERTION_COUNT
   DOID
   EVIDENCE_ITEM_COUNT
-  GENE_COUNT
+  FEATURE_COUNT
   NAME
   VARIANT_COUNT
 }
@@ -3948,6 +3948,12 @@ type LinkableDisease {
   name: String!
 }
 
+type LinkableFeature {
+  id: Int!
+  link: String!
+  name: String!
+}
+
 type LinkableGene {
   id: Int!
   link: String!
@@ -5715,12 +5721,12 @@ type Query {
     """
     before: String
     doid: String
+    featureName: String
 
     """
     Returns the first _n_ elements from the list.
     """
     first: Int
-    geneNames: String
     id: Int
 
     """
diff --git a/client/src/app/generated/server.schema.json b/client/src/app/generated/server.schema.json
index c490aff71..72c15927b 100644
--- a/client/src/app/generated/server.schema.json
+++ b/client/src/app/generated/server.schema.json
@@ -3680,7 +3680,7 @@
               "deprecationReason": null
             },
             {
-              "name": "geneCount",
+              "name": "featureCount",
               "description": null,
               "args": [],
               "type": {
@@ -3709,8 +3709,8 @@
                     "kind": "NON_NULL",
                     "name": null,
                     "ofType": {
-                      "kind": "SCALAR",
-                      "name": "String",
+                      "kind": "OBJECT",
+                      "name": "LinkableFeature",
                       "ofType": null
                     }
                   }
@@ -11372,7 +11372,7 @@
               "deprecationReason": null
             },
             {
-              "name": "GENE_COUNT",
+              "name": "FEATURE_COUNT",
               "description": null,
               "isDeprecated": false,
               "deprecationReason": null
@@ -19079,6 +19079,65 @@
           "enumValues": null,
           "possibleTypes": null
         },
+        {
+          "kind": "OBJECT",
+          "name": "LinkableFeature",
+          "description": null,
+          "fields": [
+            {
+              "name": "id",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "link",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "name",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
         {
           "kind": "OBJECT",
           "name": "LinkableGene",
@@ -27098,7 +27157,7 @@
                   "deprecationReason": null
                 },
                 {
-                  "name": "geneNames",
+                  "name": "featureName",
                   "description": null,
                   "type": {
                     "kind": "SCALAR",
diff --git a/server/app/graphql/resolvers/browse_diseases.rb b/server/app/graphql/resolvers/browse_diseases.rb
index 3adeb5a42..3456b757f 100644
--- a/server/app/graphql/resolvers/browse_diseases.rb
+++ b/server/app/graphql/resolvers/browse_diseases.rb
@@ -25,10 +25,7 @@ class Resolvers::BrowseDiseases < GraphQL::Schema::Resolver
     end
   end
 
-  option(:gene_names, type: String) do |scope, value|
-    scope.where("array_to_string(gene_names, '|') ILIKE ?", "%#{value}%")
-  end
-
+  option(:feature_name, type: String) { |scope, value| scope.where(json_name_query_for_column('features'), "%#{value}%") }
 
   option(:sort_by, type: Types::BrowseTables::DiseasesSortType) do |scope, value|
     case value.column
@@ -42,9 +39,14 @@ class Resolvers::BrowseDiseases < GraphQL::Schema::Resolver
       scope.order("evidence_item_count #{value.direction}")
     when "ASSERTION_COUNT"
       scope.order("assertion_count #{value.direction}")
-    when "GENE_COUNT"
-      scope.order("gene_count #{value.direction}")
+    when "FEATURE_COUNT"
+      scope.order("feature_count #{value.direction}")
     end
   end
+
+  def json_name_query_for_column(col)
+    raise 'Must supply a column name' if col.nil?
+    "disease_browse_table_rows.id IN (select d.id FROM disease_browse_table_rows d, json_array_elements(d.#{col}) dr where dr->>'name' ILIKE ?)"
+  end
 end
 
diff --git a/server/app/graphql/types/browse_tables/browse_disease_type.rb b/server/app/graphql/types/browse_tables/browse_disease_type.rb
index 3fe25aad8..5fd5bd2a4 100644
--- a/server/app/graphql/types/browse_tables/browse_disease_type.rb
+++ b/server/app/graphql/types/browse_tables/browse_disease_type.rb
@@ -1,4 +1,10 @@
 module Types::BrowseTables
+  class LinkableFeatureType < Types::BaseObject
+    field :id, Int, null: false
+    field :name, String, null: false
+    field :link, String, null: false
+  end
+
   class BrowseDiseaseType < Types::BaseObject
     connection_type_class(Types::Connections::BrowseTableConnection)
 
@@ -7,13 +13,19 @@ class BrowseDiseaseType < Types::BaseObject
     field :name, String, null: false
     field :doid, String, null: true
     field :disease_url, String, null: true
-    field :gene_names, [String], null: false
+    field :features, [Types::BrowseTables::LinkableFeatureType], null: false
     field :variant_count, Int, null: false
     field :evidence_item_count, Int, null: false
     field :assertion_count, Int, null: false
-    field :gene_count, Int, null: false
+    field :feature_count, Int, null: false
     field :link, String, null: false
 
+    def features
+      Array(object.features)
+        .sort_by { |f| f['name'] }
+        .map { |f| { name: f['name'], id: f['id'], link: "/features/#{f['id']}" } }
+    end
+
     def link
       Rails.application.routes.url_helpers.url_for("/diseases/#{object.id}")
     end
diff --git a/server/app/graphql/types/browse_tables/diseases_sort_columns.rb b/server/app/graphql/types/browse_tables/diseases_sort_columns.rb
index 51bf809b1..e8c1a02c1 100644
--- a/server/app/graphql/types/browse_tables/diseases_sort_columns.rb
+++ b/server/app/graphql/types/browse_tables/diseases_sort_columns.rb
@@ -5,6 +5,6 @@ class DiseasesSortColumns < Types::BaseEnum
     value "VARIANT_COUNT"
     value "EVIDENCE_ITEM_COUNT"
     value "ASSERTION_COUNT"
-    value "GENE_COUNT"
+    value "FEATURE_COUNT"
   end
 end
diff --git a/server/db/migrate/20231214182017_update_disease_browse_table_rows_to_version_6.rb b/server/db/migrate/20231214182017_update_disease_browse_table_rows_to_version_6.rb
new file mode 100644
index 000000000..80097a184
--- /dev/null
+++ b/server/db/migrate/20231214182017_update_disease_browse_table_rows_to_version_6.rb
@@ -0,0 +1,8 @@
+class UpdateDiseaseBrowseTableRowsToVersion6 < ActiveRecord::Migration[6.1]
+  def change
+    update_view :disease_browse_table_rows,
+      version: 6,
+      revert_to_version: 5,
+      materialized: true
+  end
+end
diff --git a/server/db/schema.rb b/server/db/schema.rb
index 814935683..be8cebecb 100644
--- a/server/db/schema.rb
+++ b/server/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2023_12_13_150951) do
+ActiveRecord::Schema.define(version: 2023_12_14_182017) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -1154,29 +1154,6 @@
   SQL
   add_index "source_browse_table_rows", ["id"], name: "index_source_browse_table_rows_on_id", unique: true
 
-  create_view "disease_browse_table_rows", materialized: true, sql_definition: <<-SQL
-      SELECT diseases.id,
-      diseases.name,
-      diseases.display_name,
-      diseases.doid,
-      array_agg(DISTINCT genes.name) AS gene_names,
-      count(DISTINCT evidence_items.id) AS evidence_item_count,
-      count(DISTINCT variants.id) AS variant_count,
-      count(DISTINCT assertions.id) AS assertion_count,
-      count(DISTINCT genes.id) AS gene_count
-     FROM (((((((diseases
-       JOIN evidence_items ON ((diseases.id = evidence_items.disease_id)))
-       LEFT JOIN assertions_evidence_items ON ((assertions_evidence_items.evidence_item_id = evidence_items.id)))
-       LEFT JOIN assertions ON ((assertions_evidence_items.assertion_id = assertions.id)))
-       JOIN molecular_profiles ON ((molecular_profiles.id = evidence_items.molecular_profile_id)))
-       JOIN molecular_profiles_variants ON ((molecular_profiles_variants.molecular_profile_id = molecular_profiles.id)))
-       JOIN variants ON ((variants.id = molecular_profiles_variants.variant_id)))
-       JOIN genes ON ((genes.id = variants.gene_id)))
-    WHERE (((evidence_items.status)::text <> 'rejected'::text) AND (diseases.deprecated = false))
-    GROUP BY diseases.id, diseases.name, diseases.doid;
-  SQL
-  add_index "disease_browse_table_rows", ["id"], name: "index_disease_browse_table_rows_on_id", unique: true
-
   create_view "variant_browse_table_rows", materialized: true, sql_definition: <<-SQL
       SELECT outer_variants.id,
       outer_variants.name,
@@ -1307,4 +1284,27 @@
   SQL
   add_index "feature_browse_table_rows", ["id"], name: "index_feature_browse_table_rows_on_id", unique: true
 
+  create_view "disease_browse_table_rows", materialized: true, sql_definition: <<-SQL
+      SELECT diseases.id,
+      diseases.name,
+      diseases.display_name,
+      diseases.doid,
+      json_agg(DISTINCT jsonb_build_object('name', features.name, 'id', features.id)) FILTER (WHERE (features.name IS NOT NULL)) AS features,
+      count(DISTINCT evidence_items.id) AS evidence_item_count,
+      count(DISTINCT variants.id) AS variant_count,
+      count(DISTINCT assertions.id) AS assertion_count,
+      count(DISTINCT features.id) AS feature_count
+     FROM (((((((diseases
+       JOIN evidence_items ON ((diseases.id = evidence_items.disease_id)))
+       LEFT JOIN assertions_evidence_items ON ((assertions_evidence_items.evidence_item_id = evidence_items.id)))
+       LEFT JOIN assertions ON ((assertions_evidence_items.assertion_id = assertions.id)))
+       JOIN molecular_profiles ON ((molecular_profiles.id = evidence_items.molecular_profile_id)))
+       JOIN molecular_profiles_variants ON ((molecular_profiles_variants.molecular_profile_id = molecular_profiles.id)))
+       JOIN variants ON ((variants.id = molecular_profiles_variants.variant_id)))
+       JOIN features ON ((features.id = variants.feature_id)))
+    WHERE (((evidence_items.status)::text <> 'rejected'::text) AND (diseases.deprecated = false))
+    GROUP BY diseases.id, diseases.name, diseases.doid;
+  SQL
+  add_index "disease_browse_table_rows", ["id"], name: "index_disease_browse_table_rows_on_id", unique: true
+
 end
diff --git a/server/db/views/disease_browse_table_rows_v06.sql b/server/db/views/disease_browse_table_rows_v06.sql
new file mode 100644
index 000000000..bf2fe89ce
--- /dev/null
+++ b/server/db/views/disease_browse_table_rows_v06.sql
@@ -0,0 +1,20 @@
+SELECT diseases.id,
+  diseases.name,
+  diseases.display_name,
+  diseases.doid,
+  json_agg(distinct jsonb_build_object('name', features.name, 'id', features.id))  FILTER (WHERE features.name IS NOT NULL) as features,
+  COUNT(DISTINCT(evidence_items.id)) as evidence_item_count,
+  COUNT(DISTINCT(variants.id)) as variant_count,
+  COUNT(DISTINCT(assertions.id)) as assertion_count,
+  COUNT(DISTINCT(features.id)) as feature_count
+FROM diseases
+INNER JOIN evidence_items on diseases.id = evidence_items.disease_id
+LEFT OUTER JOIN assertions_evidence_items on assertions_evidence_items.evidence_item_id = evidence_items.id
+LEFT OUTER JOIN assertions on assertions_evidence_items.assertion_id = assertions.id
+INNER JOIN molecular_profiles on molecular_profiles.id = evidence_items.molecular_profile_id
+INNER JOIN molecular_profiles_variants on molecular_profiles_variants.molecular_profile_id = molecular_profiles.id
+INNER JOIN variants on variants.id = molecular_profiles_variants.variant_id
+INNER JOIN features on features.id = variants.feature_id
+WHERE evidence_items.status != 'rejected'
+AND diseases.deprecated = false
+GROUP BY diseases.id, diseases.name, diseases.doid

From 35b1aa8cf3373a6136bbd407e4ac5142d08cc700 Mon Sep 17 00:00:00 2001
From: Susanna Kiwala <susanna.kiwala@wustl.edu>
Date: Fri, 15 Dec 2023 10:39:34 -0600
Subject: [PATCH 011/125] Update MolecularProfileBrowseTable to use Feature
 instead of Gene tags

---
 .../molecular-profile-table.component.html    | 10 +--
 .../molecular-profile-table.component.ts      |  6 +-
 .../molecular-profile-table.query.gql         |  6 +-
 .../src/app/generated/civic.apollo-helpers.ts | 14 +---
 client/src/app/generated/civic.apollo.ts      | 23 ++---
 client/src/app/generated/server.model.graphql | 10 +--
 client/src/app/generated/server.schema.json   | 65 +-------------
 .../resolvers/browse_molecular_profiles.rb    |  2 +-
 .../browse_molecular_profile_type.rb          | 12 ++-
 ...profile_browse_table_rows_to_version_11.rb |  8 ++
 server/db/schema.rb                           | 84 +++++++++----------
 ...olecular_profile_browse_table_rows_v11.sql | 40 +++++++++
 12 files changed, 122 insertions(+), 158 deletions(-)
 create mode 100644 server/db/migrate/20231215162427_update_molecular_profile_browse_table_rows_to_version_11.rb
 create mode 100644 server/db/views/molecular_profile_browse_table_rows_v11.sql

diff --git a/client/src/app/components/molecular-profiles/molecular-profile-table/molecular-profile-table.component.html b/client/src/app/components/molecular-profiles/molecular-profile-table/molecular-profile-table.component.html
index 755fbe52b..9a40965df 100644
--- a/client/src/app/components/molecular-profiles/molecular-profile-table/molecular-profile-table.component.html
+++ b/client/src/app/components/molecular-profiles/molecular-profile-table/molecular-profile-table.component.html
@@ -55,7 +55,7 @@
           Aliases
         </th>
         <th nzWidth="150px">
-          Genes
+          Features
         </th>
         <th nzWidth="200px">
           Variants
@@ -138,7 +138,7 @@
         </th>
         <th nzWidth="150px">
           <cvc-clearable-input-filter
-            [(inputModel)]="geneSymbolInput"
+            [(inputModel)]="featureNameInput"
             (inputModelChange)="
               filterChange$.next()
             "></cvc-clearable-input-filter>
@@ -198,10 +198,10 @@
           </td>
           <td>
             <cvc-tag-overflow
-              tagType="gene"
-              [tags]="mp.genes"
+              tagType="feature"
+              [tags]="mp.features"
               [maxDisplayCount]="1"
-              [matchingText]="geneSymbolInput"></cvc-tag-overflow>
+              [matchingText]="featureNameInput"></cvc-tag-overflow>
           </td>
           <td>
             <cvc-tag-overflow
diff --git a/client/src/app/components/molecular-profiles/molecular-profile-table/molecular-profile-table.component.ts b/client/src/app/components/molecular-profiles/molecular-profile-table/molecular-profile-table.component.ts
index 1263b3c47..d4bf208da 100644
--- a/client/src/app/components/molecular-profiles/molecular-profile-table/molecular-profile-table.component.ts
+++ b/client/src/app/components/molecular-profiles/molecular-profile-table/molecular-profile-table.component.ts
@@ -40,7 +40,7 @@ import { pluck } from 'rxjs-etc/operators'
 
 export interface MolecularProfileTableUserFilters {
   variantNameInput?: Maybe<string>
-  geneSymbolInput?: Maybe<string>
+  featureNameInput?: Maybe<string>
   diseaseNameInput?: Maybe<string>
   therapyNameInput?: Maybe<string>
 }
@@ -92,7 +92,7 @@ export class CvcMolecularProfilesTableComponent implements OnInit {
   // filters
   mpNameInput: Maybe<string>
   variantNameInput: Maybe<string>
-  geneSymbolInput: Maybe<string>
+  featureNameInput: Maybe<string>
   diseaseNameInput: Maybe<string>
   therapyNameInput: Maybe<string>
   aliasInput: Maybe<string>
@@ -209,7 +209,7 @@ export class CvcMolecularProfilesTableComponent implements OnInit {
         therapyName: this.therapyNameInput,
         variantName: this.variantNameInput ? this.variantNameInput : undefined,
         molecularProfileAlias: this.aliasInput ? this.aliasInput : undefined,
-        entrezSymbol: this.geneSymbolInput,
+        featureName: this.featureNameInput,
       })
       .then(() => this.scrollIndex$.next(0))
 
diff --git a/client/src/app/components/molecular-profiles/molecular-profile-table/molecular-profile-table.query.gql b/client/src/app/components/molecular-profiles/molecular-profile-table/molecular-profile-table.query.gql
index 88f48b138..0da12d961 100644
--- a/client/src/app/components/molecular-profiles/molecular-profile-table/molecular-profile-table.query.gql
+++ b/client/src/app/components/molecular-profiles/molecular-profile-table/molecular-profile-table.query.gql
@@ -2,7 +2,7 @@ query BrowseMolecularProfiles(
   $molecularProfileName: String
   $variantName: String
   $variantId: Int
-  $entrezSymbol: String
+  $featureName: String
   $diseaseName: String
   $therapyName: String
   $molecularProfileAlias: String
@@ -16,7 +16,7 @@ query BrowseMolecularProfiles(
     molecularProfileName: $molecularProfileName
     variantName: $variantName
     variantId: $variantId
-    entrezSymbol: $entrezSymbol
+    featureName: $featureName
     diseaseName: $diseaseName
     therapyName: $therapyName
     molecularProfileAlias: $molecularProfileAlias
@@ -54,7 +54,7 @@ fragment BrowseMolecularProfilesFields on BrowseMolecularProfile {
   aliases {
     name
   }
-  genes {
+  features {
     id
     name
     link
diff --git a/client/src/app/generated/civic.apollo-helpers.ts b/client/src/app/generated/civic.apollo-helpers.ts
index 87fe37b75..d430ac5d1 100644
--- a/client/src/app/generated/civic.apollo-helpers.ts
+++ b/client/src/app/generated/civic.apollo-helpers.ts
@@ -251,13 +251,13 @@ export type BrowseGeneEdgeFieldPolicy = {
 	cursor?: FieldPolicy<any> | FieldReadFunction<any>,
 	node?: FieldPolicy<any> | FieldReadFunction<any>
 };
-export type BrowseMolecularProfileKeySpecifier = ('aliases' | 'assertionCount' | 'diseases' | 'evidenceItemCount' | 'genes' | 'id' | 'link' | 'molecularProfileScore' | 'name' | 'therapies' | 'variantCount' | 'variants' | BrowseMolecularProfileKeySpecifier)[];
+export type BrowseMolecularProfileKeySpecifier = ('aliases' | 'assertionCount' | 'diseases' | 'evidenceItemCount' | 'features' | 'id' | 'link' | 'molecularProfileScore' | 'name' | 'therapies' | 'variantCount' | 'variants' | BrowseMolecularProfileKeySpecifier)[];
 export type BrowseMolecularProfileFieldPolicy = {
 	aliases?: FieldPolicy<any> | FieldReadFunction<any>,
 	assertionCount?: FieldPolicy<any> | FieldReadFunction<any>,
 	diseases?: FieldPolicy<any> | FieldReadFunction<any>,
 	evidenceItemCount?: FieldPolicy<any> | FieldReadFunction<any>,
-	genes?: FieldPolicy<any> | FieldReadFunction<any>,
+	features?: FieldPolicy<any> | FieldReadFunction<any>,
 	id?: FieldPolicy<any> | FieldReadFunction<any>,
 	link?: FieldPolicy<any> | FieldReadFunction<any>,
 	molecularProfileScore?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -1019,12 +1019,6 @@ export type LinkableFeatureFieldPolicy = {
 	link?: FieldPolicy<any> | FieldReadFunction<any>,
 	name?: FieldPolicy<any> | FieldReadFunction<any>
 };
-export type LinkableGeneKeySpecifier = ('id' | 'link' | 'name' | LinkableGeneKeySpecifier)[];
-export type LinkableGeneFieldPolicy = {
-	id?: FieldPolicy<any> | FieldReadFunction<any>,
-	link?: FieldPolicy<any> | FieldReadFunction<any>,
-	name?: FieldPolicy<any> | FieldReadFunction<any>
-};
 export type LinkableTherapyKeySpecifier = ('id' | 'link' | 'name' | LinkableTherapyKeySpecifier)[];
 export type LinkableTherapyFieldPolicy = {
 	id?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -2496,10 +2490,6 @@ export type StrictTypedTypePolicies = {
 		keyFields?: false | LinkableFeatureKeySpecifier | (() => undefined | LinkableFeatureKeySpecifier),
 		fields?: LinkableFeatureFieldPolicy,
 	},
-	LinkableGene?: Omit<TypePolicy, "fields" | "keyFields"> & {
-		keyFields?: false | LinkableGeneKeySpecifier | (() => undefined | LinkableGeneKeySpecifier),
-		fields?: LinkableGeneFieldPolicy,
-	},
 	LinkableTherapy?: Omit<TypePolicy, "fields" | "keyFields"> & {
 		keyFields?: false | LinkableTherapyKeySpecifier | (() => undefined | LinkableTherapyKeySpecifier),
 		fields?: LinkableTherapyFieldPolicy,
diff --git a/client/src/app/generated/civic.apollo.ts b/client/src/app/generated/civic.apollo.ts
index 7bf1c5610..20512a581 100644
--- a/client/src/app/generated/civic.apollo.ts
+++ b/client/src/app/generated/civic.apollo.ts
@@ -651,7 +651,7 @@ export type BrowseMolecularProfile = {
   assertionCount: Scalars['Int'];
   diseases: Array<LinkableDisease>;
   evidenceItemCount: Scalars['Int'];
-  genes: Array<LinkableGene>;
+  features: Array<LinkableFeature>;
   id: Scalars['Int'];
   link: Scalars['String'];
   molecularProfileScore: Scalars['Float'];
@@ -2413,13 +2413,6 @@ export type LinkableFeature = {
   name: Scalars['String'];
 };
 
-export type LinkableGene = {
-  __typename: 'LinkableGene';
-  id: Scalars['Int'];
-  link: Scalars['String'];
-  name: Scalars['String'];
-};
-
 export type LinkableTherapy = {
   __typename: 'LinkableTherapy';
   id: Scalars['Int'];
@@ -3720,7 +3713,7 @@ export type QueryBrowseMolecularProfilesArgs = {
   after?: InputMaybe<Scalars['String']>;
   before?: InputMaybe<Scalars['String']>;
   diseaseName?: InputMaybe<Scalars['String']>;
-  entrezSymbol?: InputMaybe<Scalars['String']>;
+  featureName?: InputMaybe<Scalars['String']>;
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   molecularProfileAlias?: InputMaybe<Scalars['String']>;
@@ -6365,7 +6358,7 @@ export type BrowseMolecularProfilesQueryVariables = Exact<{
   molecularProfileName?: InputMaybe<Scalars['String']>;
   variantName?: InputMaybe<Scalars['String']>;
   variantId?: InputMaybe<Scalars['Int']>;
-  entrezSymbol?: InputMaybe<Scalars['String']>;
+  featureName?: InputMaybe<Scalars['String']>;
   diseaseName?: InputMaybe<Scalars['String']>;
   therapyName?: InputMaybe<Scalars['String']>;
   molecularProfileAlias?: InputMaybe<Scalars['String']>;
@@ -6377,9 +6370,9 @@ export type BrowseMolecularProfilesQueryVariables = Exact<{
 }>;
 
 
-export type BrowseMolecularProfilesQuery = { __typename: 'Query', browseMolecularProfiles: { __typename: 'BrowseMolecularProfileConnection', lastUpdated: any, filteredCount: number, pageCount: number, pageInfo: { __typename: 'PageInfo', endCursor?: string | undefined, hasNextPage: boolean, startCursor?: string | undefined, hasPreviousPage: boolean }, edges: Array<{ __typename: 'BrowseMolecularProfileEdge', cursor: string, node?: { __typename: 'BrowseMolecularProfile', id: number, name: string, evidenceItemCount: number, molecularProfileScore: number, assertionCount: number, variantCount: number, link: string, aliases: Array<{ __typename: 'MolecularProfileAlias', name: string }>, genes: Array<{ __typename: 'LinkableGene', id: number, name: string, link: string }>, variants: Array<{ __typename: 'LinkableVariant', id: number, name: string, link: string }>, therapies: Array<{ __typename: 'LinkableTherapy', id: number, name: string, link: string }>, diseases: Array<{ __typename: 'LinkableDisease', id: number, name: string, link: string }> } | undefined }> } };
+export type BrowseMolecularProfilesQuery = { __typename: 'Query', browseMolecularProfiles: { __typename: 'BrowseMolecularProfileConnection', lastUpdated: any, filteredCount: number, pageCount: number, pageInfo: { __typename: 'PageInfo', endCursor?: string | undefined, hasNextPage: boolean, startCursor?: string | undefined, hasPreviousPage: boolean }, edges: Array<{ __typename: 'BrowseMolecularProfileEdge', cursor: string, node?: { __typename: 'BrowseMolecularProfile', id: number, name: string, evidenceItemCount: number, molecularProfileScore: number, assertionCount: number, variantCount: number, link: string, aliases: Array<{ __typename: 'MolecularProfileAlias', name: string }>, features: Array<{ __typename: 'LinkableFeature', id: number, name: string, link: string }>, variants: Array<{ __typename: 'LinkableVariant', id: number, name: string, link: string }>, therapies: Array<{ __typename: 'LinkableTherapy', id: number, name: string, link: string }>, diseases: Array<{ __typename: 'LinkableDisease', id: number, name: string, link: string }> } | undefined }> } };
 
-export type BrowseMolecularProfilesFieldsFragment = { __typename: 'BrowseMolecularProfile', id: number, name: string, evidenceItemCount: number, molecularProfileScore: number, assertionCount: number, variantCount: number, link: string, aliases: Array<{ __typename: 'MolecularProfileAlias', name: string }>, genes: Array<{ __typename: 'LinkableGene', id: number, name: string, link: string }>, variants: Array<{ __typename: 'LinkableVariant', id: number, name: string, link: string }>, therapies: Array<{ __typename: 'LinkableTherapy', id: number, name: string, link: string }>, diseases: Array<{ __typename: 'LinkableDisease', id: number, name: string, link: string }> };
+export type BrowseMolecularProfilesFieldsFragment = { __typename: 'BrowseMolecularProfile', id: number, name: string, evidenceItemCount: number, molecularProfileScore: number, assertionCount: number, variantCount: number, link: string, aliases: Array<{ __typename: 'MolecularProfileAlias', name: string }>, features: Array<{ __typename: 'LinkableFeature', id: number, name: string, link: string }>, variants: Array<{ __typename: 'LinkableVariant', id: number, name: string, link: string }>, therapies: Array<{ __typename: 'LinkableTherapy', id: number, name: string, link: string }>, diseases: Array<{ __typename: 'LinkableDisease', id: number, name: string, link: string }> };
 
 export type MolecularProfileMenuQueryVariables = Exact<{
   geneId?: InputMaybe<Scalars['Int']>;
@@ -8522,7 +8515,7 @@ export const BrowseMolecularProfilesFieldsFragmentDoc = gql`
   aliases {
     name
   }
-  genes {
+  features {
     id
     name
     link
@@ -11226,12 +11219,12 @@ export const MolecularProfilePopoverDocument = gql`
     }
   }
 export const BrowseMolecularProfilesDocument = gql`
-    query BrowseMolecularProfiles($molecularProfileName: String, $variantName: String, $variantId: Int, $entrezSymbol: String, $diseaseName: String, $therapyName: String, $molecularProfileAlias: String, $sortBy: MolecularProfilesSort, $first: Int, $last: Int, $before: String, $after: String) {
+    query BrowseMolecularProfiles($molecularProfileName: String, $variantName: String, $variantId: Int, $featureName: String, $diseaseName: String, $therapyName: String, $molecularProfileAlias: String, $sortBy: MolecularProfilesSort, $first: Int, $last: Int, $before: String, $after: String) {
   browseMolecularProfiles(
     molecularProfileName: $molecularProfileName
     variantName: $variantName
     variantId: $variantId
-    entrezSymbol: $entrezSymbol
+    featureName: $featureName
     diseaseName: $diseaseName
     therapyName: $therapyName
     molecularProfileAlias: $molecularProfileAlias
diff --git a/client/src/app/generated/server.model.graphql b/client/src/app/generated/server.model.graphql
index 57b100748..dabe47477 100644
--- a/client/src/app/generated/server.model.graphql
+++ b/client/src/app/generated/server.model.graphql
@@ -1114,7 +1114,7 @@ type BrowseMolecularProfile {
   assertionCount: Int!
   diseases: [LinkableDisease!]!
   evidenceItemCount: Int!
-  genes: [LinkableGene!]!
+  features: [LinkableFeature!]!
   id: Int!
   link: String!
   molecularProfileScore: Float!
@@ -3954,12 +3954,6 @@ type LinkableFeature {
   name: String!
 }
 
-type LinkableGene {
-  id: Int!
-  link: String!
-  name: String!
-}
-
 type LinkableTherapy {
   id: Int!
   link: String!
@@ -5799,7 +5793,7 @@ type Query {
     """
     before: String
     diseaseName: String
-    entrezSymbol: String
+    featureName: String
 
     """
     Returns the first _n_ elements from the list.
diff --git a/client/src/app/generated/server.schema.json b/client/src/app/generated/server.schema.json
index 72c15927b..df723e7af 100644
--- a/client/src/app/generated/server.schema.json
+++ b/client/src/app/generated/server.schema.json
@@ -5093,7 +5093,7 @@
               "deprecationReason": null
             },
             {
-              "name": "genes",
+              "name": "features",
               "description": null,
               "args": [],
               "type": {
@@ -5107,7 +5107,7 @@
                     "name": null,
                     "ofType": {
                       "kind": "OBJECT",
-                      "name": "LinkableGene",
+                      "name": "LinkableFeature",
                       "ofType": null
                     }
                   }
@@ -19138,65 +19138,6 @@
           "enumValues": null,
           "possibleTypes": null
         },
-        {
-          "kind": "OBJECT",
-          "name": "LinkableGene",
-          "description": null,
-          "fields": [
-            {
-              "name": "id",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Int",
-                  "ofType": null
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "link",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "name",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            }
-          ],
-          "inputFields": null,
-          "interfaces": [],
-          "enumValues": null,
-          "possibleTypes": null
-        },
         {
           "kind": "OBJECT",
           "name": "LinkableTherapy",
@@ -27520,7 +27461,7 @@
                   "deprecationReason": null
                 },
                 {
-                  "name": "entrezSymbol",
+                  "name": "featureName",
                   "description": null,
                   "type": {
                     "kind": "SCALAR",
diff --git a/server/app/graphql/resolvers/browse_molecular_profiles.rb b/server/app/graphql/resolvers/browse_molecular_profiles.rb
index 3ee008733..2a1141b76 100644
--- a/server/app/graphql/resolvers/browse_molecular_profiles.rb
+++ b/server/app/graphql/resolvers/browse_molecular_profiles.rb
@@ -28,7 +28,7 @@ class Resolvers::BrowseMolecularProfiles < GraphQL::Schema::Resolver
   end
 
   option(:variant_name, type: String)  { |scope, value| scope.where(json_name_query_for_column('variants'), "#{value}%") }
-  option(:entrez_symbol, type: String)  { |scope, value| scope.where(json_name_query_for_column('genes'), "#{value}%") }
+  option(:feature_name, type: String)  { |scope, value| scope.where(json_name_query_for_column('features'), "#{value}%") }
   option(:disease_name, type: String)  { |scope, value| scope.where(json_name_query_for_column('diseases'), "%#{value}%") }
   option(:therapy_name, type: String)     { |scope, value| scope.where(json_name_query_for_column('therapies'), "%#{value}%") }
   option(:molecular_profile_alias, type: String) { |scope, value| scope.where(array_query_for_column('alias_names'), "%#{value}%") }
diff --git a/server/app/graphql/types/browse_tables/browse_molecular_profile_type.rb b/server/app/graphql/types/browse_tables/browse_molecular_profile_type.rb
index ddca8c7c7..6e27cbf48 100644
--- a/server/app/graphql/types/browse_tables/browse_molecular_profile_type.rb
+++ b/server/app/graphql/types/browse_tables/browse_molecular_profile_type.rb
@@ -8,8 +8,6 @@ class LinkableTag < Types::BaseObject
       field :name, String, null: false
     end
 
-    class LinkableGene < LinkableTag
-    end
     class LinkableVariant < LinkableTag
     end
     class LinkableDisease < LinkableTag
@@ -21,7 +19,7 @@ class LinkableTherapy < LinkableTag
     field :name, String, null: false
     field :diseases, [LinkableDisease], null: false
     field :therapies, [LinkableTherapy], null: false
-    field :genes, [LinkableGene], null: false
+    field :features, [LinkableFeatureType], null: false
     field :variants,[LinkableVariant], null: false
     field :link, String, null: false
     field :evidence_item_count, Int, null: false
@@ -44,10 +42,10 @@ def link
       Rails.application.routes.url_helpers.url_for("/molecular-profiles/#{object.id}")
     end
 
-    def genes
-      Array(object.genes)
-        .sort_by { |g| g['name'] }
-        .map { |g| { name: g['name'], id: g['id'], link: "/genes/#{g['id']}"} }
+    def features
+      Array(object.features)
+        .sort_by { |f| f['name'] }
+        .map { |f| { name: f['name'], id: f['id'], link: "/features/#{f['id']}"} }
     end
 
     def variants
diff --git a/server/db/migrate/20231215162427_update_molecular_profile_browse_table_rows_to_version_11.rb b/server/db/migrate/20231215162427_update_molecular_profile_browse_table_rows_to_version_11.rb
new file mode 100644
index 000000000..a8575b6a2
--- /dev/null
+++ b/server/db/migrate/20231215162427_update_molecular_profile_browse_table_rows_to_version_11.rb
@@ -0,0 +1,8 @@
+class UpdateMolecularProfileBrowseTableRowsToVersion11 < ActiveRecord::Migration[6.1]
+  def change
+    update_view :molecular_profile_browse_table_rows,
+      version: 11,
+      revert_to_version: 10,
+      materialized: true
+  end
+end
diff --git a/server/db/schema.rb b/server/db/schema.rb
index be8cebecb..763bed676 100644
--- a/server/db/schema.rb
+++ b/server/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2023_12_14_182017) do
+ActiveRecord::Schema.define(version: 2023_12_15_162427) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -1025,47 +1025,6 @@
        JOIN evidence_items ei ON (((mp.id = ei.molecular_profile_id) AND (ei.deleted = false))))
     GROUP BY mp.id;
   SQL
-  create_view "molecular_profile_browse_table_rows", materialized: true, sql_definition: <<-SQL
-      SELECT outer_mps.id,
-      outer_mps.name,
-      count(DISTINCT evidence_items.id) AS evidence_item_count,
-      array_agg(DISTINCT molecular_profile_aliases.name ORDER BY molecular_profile_aliases.name) AS alias_names,
-      json_agg(DISTINCT jsonb_build_object('name', genes.name, 'id', genes.id)) FILTER (WHERE (genes.name IS NOT NULL)) AS genes,
-      json_agg(DISTINCT jsonb_build_object('name', variants.name, 'id', variants.id)) FILTER (WHERE (variants.name IS NOT NULL)) AS variants,
-      json_agg(DISTINCT jsonb_build_object('name', diseases.name, 'id', diseases.id, 'total', disease_count.total)) FILTER (WHERE (diseases.name IS NOT NULL)) AS diseases,
-      json_agg(DISTINCT jsonb_build_object('name', therapies.name, 'id', therapies.id, 'total', therapy_count.total)) FILTER (WHERE (therapies.name IS NOT NULL)) AS therapies,
-      count(DISTINCT assertions.id) AS assertion_count,
-      count(DISTINCT variants.id) AS variant_count,
-      outer_mps.evidence_score
-     FROM ((((((((((((molecular_profiles outer_mps
-       LEFT JOIN evidence_items ON ((evidence_items.molecular_profile_id = outer_mps.id)))
-       JOIN molecular_profiles_variants ON ((outer_mps.id = molecular_profiles_variants.molecular_profile_id)))
-       JOIN variants ON ((molecular_profiles_variants.variant_id = variants.id)))
-       JOIN genes ON ((genes.id = variants.gene_id)))
-       LEFT JOIN diseases ON ((diseases.id = evidence_items.disease_id)))
-       LEFT JOIN evidence_items_therapies ON ((evidence_items_therapies.evidence_item_id = evidence_items.id)))
-       LEFT JOIN therapies ON ((therapies.id = evidence_items_therapies.therapy_id)))
-       LEFT JOIN assertions ON ((assertions.molecular_profile_id = outer_mps.id)))
-       LEFT JOIN molecular_profile_aliases_molecular_profiles ON ((molecular_profile_aliases_molecular_profiles.molecular_profile_id = outer_mps.id)))
-       LEFT JOIN molecular_profile_aliases ON ((molecular_profile_aliases.id = molecular_profile_aliases_molecular_profiles.molecular_profile_alias_id)))
-       LEFT JOIN LATERAL ( SELECT therapies_1.id AS therapy_id,
-              count(DISTINCT evidence_items_1.id) AS total
-             FROM ((evidence_items evidence_items_1
-               JOIN evidence_items_therapies evidence_items_therapies_1 ON ((evidence_items_therapies_1.evidence_item_id = evidence_items_1.id)))
-               JOIN therapies therapies_1 ON ((therapies_1.id = evidence_items_therapies_1.therapy_id)))
-            WHERE (evidence_items_1.molecular_profile_id = outer_mps.id)
-            GROUP BY therapies_1.id) therapy_count ON ((therapies.id = therapy_count.therapy_id)))
-       LEFT JOIN LATERAL ( SELECT diseases_1.id AS disease_id,
-              count(DISTINCT evidence_items_1.id) AS total
-             FROM (evidence_items evidence_items_1
-               JOIN diseases diseases_1 ON ((diseases_1.id = evidence_items_1.disease_id)))
-            WHERE (evidence_items_1.molecular_profile_id = outer_mps.id)
-            GROUP BY diseases_1.id) disease_count ON ((diseases.id = disease_count.disease_id)))
-    WHERE (outer_mps.deprecated = false)
-    GROUP BY outer_mps.id, outer_mps.name, outer_mps.evidence_score;
-  SQL
-  add_index "molecular_profile_browse_table_rows", ["id"], name: "index_molecular_profile_browse_table_rows_on_id", unique: true
-
   create_view "variant_group_browse_table_rows", materialized: true, sql_definition: <<-SQL
       SELECT variant_groups.id,
       variant_groups.name,
@@ -1307,4 +1266,45 @@
   SQL
   add_index "disease_browse_table_rows", ["id"], name: "index_disease_browse_table_rows_on_id", unique: true
 
+  create_view "molecular_profile_browse_table_rows", materialized: true, sql_definition: <<-SQL
+      SELECT outer_mps.id,
+      outer_mps.name,
+      count(DISTINCT evidence_items.id) AS evidence_item_count,
+      array_agg(DISTINCT molecular_profile_aliases.name ORDER BY molecular_profile_aliases.name) AS alias_names,
+      json_agg(DISTINCT jsonb_build_object('name', features.name, 'id', features.id)) FILTER (WHERE (features.name IS NOT NULL)) AS features,
+      json_agg(DISTINCT jsonb_build_object('name', variants.name, 'id', variants.id)) FILTER (WHERE (variants.name IS NOT NULL)) AS variants,
+      json_agg(DISTINCT jsonb_build_object('name', diseases.name, 'id', diseases.id, 'total', disease_count.total)) FILTER (WHERE (diseases.name IS NOT NULL)) AS diseases,
+      json_agg(DISTINCT jsonb_build_object('name', therapies.name, 'id', therapies.id, 'total', therapy_count.total)) FILTER (WHERE (therapies.name IS NOT NULL)) AS therapies,
+      count(DISTINCT assertions.id) AS assertion_count,
+      count(DISTINCT variants.id) AS variant_count,
+      outer_mps.evidence_score
+     FROM ((((((((((((molecular_profiles outer_mps
+       LEFT JOIN evidence_items ON ((evidence_items.molecular_profile_id = outer_mps.id)))
+       JOIN molecular_profiles_variants ON ((outer_mps.id = molecular_profiles_variants.molecular_profile_id)))
+       JOIN variants ON ((molecular_profiles_variants.variant_id = variants.id)))
+       JOIN features ON ((features.id = variants.feature_id)))
+       LEFT JOIN diseases ON ((diseases.id = evidence_items.disease_id)))
+       LEFT JOIN evidence_items_therapies ON ((evidence_items_therapies.evidence_item_id = evidence_items.id)))
+       LEFT JOIN therapies ON ((therapies.id = evidence_items_therapies.therapy_id)))
+       LEFT JOIN assertions ON ((assertions.molecular_profile_id = outer_mps.id)))
+       LEFT JOIN molecular_profile_aliases_molecular_profiles ON ((molecular_profile_aliases_molecular_profiles.molecular_profile_id = outer_mps.id)))
+       LEFT JOIN molecular_profile_aliases ON ((molecular_profile_aliases.id = molecular_profile_aliases_molecular_profiles.molecular_profile_alias_id)))
+       LEFT JOIN LATERAL ( SELECT therapies_1.id AS therapy_id,
+              count(DISTINCT evidence_items_1.id) AS total
+             FROM ((evidence_items evidence_items_1
+               JOIN evidence_items_therapies evidence_items_therapies_1 ON ((evidence_items_therapies_1.evidence_item_id = evidence_items_1.id)))
+               JOIN therapies therapies_1 ON ((therapies_1.id = evidence_items_therapies_1.therapy_id)))
+            WHERE (evidence_items_1.molecular_profile_id = outer_mps.id)
+            GROUP BY therapies_1.id) therapy_count ON ((therapies.id = therapy_count.therapy_id)))
+       LEFT JOIN LATERAL ( SELECT diseases_1.id AS disease_id,
+              count(DISTINCT evidence_items_1.id) AS total
+             FROM (evidence_items evidence_items_1
+               JOIN diseases diseases_1 ON ((diseases_1.id = evidence_items_1.disease_id)))
+            WHERE (evidence_items_1.molecular_profile_id = outer_mps.id)
+            GROUP BY diseases_1.id) disease_count ON ((diseases.id = disease_count.disease_id)))
+    WHERE (outer_mps.deprecated = false)
+    GROUP BY outer_mps.id, outer_mps.name, outer_mps.evidence_score;
+  SQL
+  add_index "molecular_profile_browse_table_rows", ["id"], name: "index_molecular_profile_browse_table_rows_on_id", unique: true
+
 end
diff --git a/server/db/views/molecular_profile_browse_table_rows_v11.sql b/server/db/views/molecular_profile_browse_table_rows_v11.sql
new file mode 100644
index 000000000..ee3324669
--- /dev/null
+++ b/server/db/views/molecular_profile_browse_table_rows_v11.sql
@@ -0,0 +1,40 @@
+SELECT outer_mps.id,
+  outer_mps.name,
+  COUNT(DISTINCT(evidence_items.id)) as evidence_item_count,
+  array_agg(distinct(molecular_profile_aliases.name) order by molecular_profile_aliases.name) as alias_names,
+  json_agg(distinct jsonb_build_object('name', features.name, 'id', features.id))  FILTER (WHERE features.name IS NOT NULL) as features,
+  json_agg(distinct jsonb_build_object('name', variants.name, 'id', variants.id))  FILTER (WHERE variants.name IS NOT NULL) as variants,
+  json_agg(distinct jsonb_build_object('name', diseases.name, 'id', diseases.id, 'total', disease_count.total))  FILTER (WHERE diseases.name IS NOT NULL) as diseases,
+  json_agg(distinct jsonb_build_object('name', therapies.name, 'id', therapies.id, 'total', therapy_count.total))  FILTER (WHERE therapies.name IS NOT NULL) as therapies,
+  COUNT(DISTINCT(assertions.id)) as assertion_count,
+  COUNT(DISTINCT(variants.id)) as variant_count,
+  outer_mps.evidence_score
+FROM molecular_profiles outer_mps
+LEFT OUTER JOIN evidence_items ON evidence_items.molecular_profile_id = outer_mps.id
+INNER JOIN molecular_profiles_variants ON outer_mps.id = molecular_profiles_variants.molecular_profile_id
+INNER JOIN variants ON molecular_profiles_variants.variant_id = variants.id
+INNER JOIN features ON features.id = variants.feature_id
+LEFT OUTER JOIN diseases ON diseases.id = evidence_items.disease_id
+LEFT OUTER JOIN evidence_items_therapies ON evidence_items_therapies.evidence_item_id = evidence_items.id
+LEFT OUTER JOIN therapies ON therapies.id = evidence_items_therapies.therapy_id
+LEFT OUTER JOIN assertions ON assertions.molecular_profile_id = outer_mps.id
+LEFT OUTER JOIN molecular_profile_aliases_molecular_profiles ON molecular_profile_aliases_molecular_profiles.molecular_profile_id = outer_mps.id
+LEFT OUTER JOIN molecular_profile_aliases ON molecular_profile_aliases.id = molecular_profile_aliases_molecular_profiles.molecular_profile_alias_id
+-- this count is used for sorting therapies by the number of eids they appear with
+LEFT JOIN LATERAL (SELECT therapies.id as therapy_id, COUNT(DISTINCT(evidence_items.id)) as total
+  FROM evidence_items
+  INNER JOIN evidence_items_therapies ON evidence_items_therapies.evidence_item_id = evidence_items.id
+  INNER JOIN therapies ON therapies.id = evidence_items_therapies.therapy_id
+  WHERE evidence_items.molecular_profile_id = outer_mps.id
+  GROUP BY therapies.id
+) therapy_count on therapies.id = therapy_count.therapy_id
+
+LEFT JOIN LATERAL (SELECT diseases.id as disease_id, COUNT(DISTINCT(evidence_items.id)) as total
+  FROM evidence_items
+  INNER JOIN diseases ON diseases.id = evidence_items.disease_id
+  WHERE evidence_items.molecular_profile_id = outer_mps.id
+  GROUP BY diseases.id
+) disease_count on diseases.id = disease_count.disease_id
+WHERE outer_mps.deprecated = False
+GROUP BY outer_mps.id, outer_mps.name, outer_mps.evidence_score
+

From 1c9c3f7f6c99ba27ec6ae2591670acef406c7276 Mon Sep 17 00:00:00 2001
From: Susanna Kiwala <susanna.kiwala@wustl.edu>
Date: Fri, 15 Dec 2023 12:39:16 -0600
Subject: [PATCH 012/125] Update VariantBrowseTable to use Feature instead of
 Gene tags

---
 .../variants-table.component.html             | 10 +-
 .../variants-table.component.ts               |  6 +-
 .../variants-table/variants-table.module.ts   |  4 +-
 .../variants-table/variants-table.query.gql   | 10 +-
 .../variant-manager.component.ts              | 13 +--
 .../variant-manager/variant-manager.config.ts | 10 +-
 .../variant-manager/variant-manager.query.gql | 10 +-
 .../variant-manager/variant-manager.types.ts  | 15 ++-
 .../src/app/generated/civic.apollo-helpers.ts |  8 +-
 client/src/app/generated/civic.apollo.ts      | 42 ++++----
 client/src/app/generated/server.model.graphql | 10 +-
 client/src/app/generated/server.schema.json   | 10 +-
 .../app/graphql/resolvers/browse_variants.rb  |  6 +-
 .../browse_tables/browse_variant_type.rb      | 10 +-
 .../browse_tables/variants_sort_columns.rb    |  2 +-
 ...variant_browse_table_rows_to_version_14.rb |  8 ++
 server/db/schema.rb                           | 98 +++++++++----------
 .../views/variant_browse_table_rows_v14.sql   | 46 +++++++++
 18 files changed, 183 insertions(+), 135 deletions(-)
 create mode 100644 server/db/migrate/20231215180038_update_variant_browse_table_rows_to_version_14.rb
 create mode 100644 server/db/views/variant_browse_table_rows_v14.sql

diff --git a/client/src/app/components/variants/variants-table/variants-table.component.html b/client/src/app/components/variants/variants-table/variants-table.component.html
index f690fb93d..88a859591 100644
--- a/client/src/app/components/variants/variants-table/variants-table.component.html
+++ b/client/src/app/components/variants/variants-table/variants-table.component.html
@@ -62,9 +62,9 @@
           Variant Types
         </th>
         <th nzWidth="100px"
-          [nzColumnKey]="sortColumns.EntrezSymbol"
+          [nzColumnKey]="sortColumns.FeatureName"
           [nzSortFn]="true">
-          Gene
+          Feature
         </th>
         <th nzWidth="200px">
           Diseases
@@ -95,7 +95,7 @@
           </cvc-clearable-input-filter>
         </th>
         <th>
-          <cvc-clearable-input-filter [(inputModel)]="geneSymbolInput"
+          <cvc-clearable-input-filter [(inputModel)]="featureNameInput"
             (inputModelChange)="filterChange$.next()"></cvc-clearable-input-filter>
         </th>
         <th>
@@ -139,8 +139,8 @@
             </cvc-tag-overflow>
           </td>
           <td>
-            <cvc-gene-tag [gene]="{id: variant.geneId, name: variant.geneName, link: variant.geneLink}"
-              [truncateLongName]="true"></cvc-gene-tag>
+            <cvc-feature-tag [feature]="{id: variant.featureId, name: variant.featureName, link: variant.featureLink}"
+              [truncateLongName]="true"></cvc-feature-tag>
           </td>
           <td>
             <cvc-tag-overflow
diff --git a/client/src/app/components/variants/variants-table/variants-table.component.ts b/client/src/app/components/variants/variants-table/variants-table.component.ts
index 8fefaea59..c595bd4d5 100644
--- a/client/src/app/components/variants/variants-table/variants-table.component.ts
+++ b/client/src/app/components/variants/variants-table/variants-table.component.ts
@@ -40,7 +40,7 @@ import { pluck } from 'rxjs-etc/operators'
 
 export interface VariantTableUserFilters {
   variantNameInput?: Maybe<string>
-  geneSymbolInput?: Maybe<string>
+  featureNameInput?: Maybe<string>
   diseaseNameInput?: Maybe<string>
   therapyNameInput?: Maybe<string>
   variantAliasInput?: Maybe<string>
@@ -90,7 +90,7 @@ export class CvcVariantsTableComponent implements OnInit {
 
   // filters
   variantNameInput: Maybe<string>
-  geneSymbolInput: Maybe<string>
+  featureNameInput: Maybe<string>
   diseaseNameInput: Maybe<string>
   therapyNameInput: Maybe<string>
   variantAliasInput: Maybe<string>
@@ -209,7 +209,7 @@ export class CvcVariantsTableComponent implements OnInit {
         variantAlias: this.variantAliasInput
           ? this.variantAliasInput
           : undefined,
-        entrezSymbol: this.geneSymbolInput,
+        featureName: this.featureNameInput,
         variantTypeName: this.variantTypeNameInput ? this.variantTypeNameInput : undefined,
         hasNoVariantType: this.hasNoVariantTypeInput
       })
diff --git a/client/src/app/components/variants/variants-table/variants-table.module.ts b/client/src/app/components/variants/variants-table/variants-table.module.ts
index c5cfd7dd8..5b010beac 100644
--- a/client/src/app/components/variants/variants-table/variants-table.module.ts
+++ b/client/src/app/components/variants/variants-table/variants-table.module.ts
@@ -1,6 +1,6 @@
 import { CommonModule } from '@angular/common'
 import { NgModule } from '@angular/core'
-import { CvcGeneTagModule } from '@app/components/genes/gene-tag/gene-tag.module'
+import { CvcFeatureTagModule } from '@app/components/features/feature-tag/feature-tag.module'
 import { CvcClearableInputFilterModule } from '@app/components/shared/clearable-input-filter/clearable-input-filter.module'
 import { CvcNoMoreRowsModule } from '@app/components/shared/no-more-rows/no-more-rows.module'
 import { CvcPlainTagOverflowModule } from '@app/components/shared/plain-tag-overflow/plain-tag-overflow.module'
@@ -39,7 +39,7 @@ import { CvcVariantsTableComponent } from './variants-table.component'
     CvcAutoHeightCardModule,
     CvcAutoHeightTableModule,
     CvcClearableInputFilterModule,
-    CvcGeneTagModule,
+    CvcFeatureTagModule,
     CvcNoMoreRowsModule,
     CvcPipesModule,
     CvcPlainTagOverflowModule,
diff --git a/client/src/app/components/variants/variants-table/variants-table.query.gql b/client/src/app/components/variants/variants-table/variants-table.query.gql
index 86e8fb61b..8917d8cd5 100644
--- a/client/src/app/components/variants/variants-table/variants-table.query.gql
+++ b/client/src/app/components/variants/variants-table/variants-table.query.gql
@@ -1,6 +1,6 @@
 query BrowseVariants(
   $variantName: String
-  $entrezSymbol: String
+  $featureName: String
   $diseaseName: String
   $therapyName: String
   $variantAlias: String
@@ -16,7 +16,7 @@ query BrowseVariants(
 ) {
   browseVariants(
     variantName: $variantName
-    entrezSymbol: $entrezSymbol
+    featureName: $featureName
     diseaseName: $diseaseName
     therapyName: $therapyName
     variantAlias: $variantAlias
@@ -53,9 +53,9 @@ fragment BrowseVariantsFields on BrowseVariant {
   id
   name
   link
-  geneId
-  geneName
-  geneLink
+  featureId
+  featureName
+  featureLink
   diseases {
     id
     name
diff --git a/client/src/app/forms/types/variant-select/variant-manager/variant-manager.component.ts b/client/src/app/forms/types/variant-select/variant-manager/variant-manager.component.ts
index c1fe0f5f1..fabf675da 100644
--- a/client/src/app/forms/types/variant-select/variant-manager/variant-manager.component.ts
+++ b/client/src/app/forms/types/variant-select/variant-manager/variant-manager.component.ts
@@ -13,12 +13,9 @@ import { ApolloQueryResult, gql } from '@apollo/client/core'
 import { ScrollEvent } from '@app/directives/table-scroll/table-scroll.directive'
 import { LinkableEntity } from '@app/forms/components/entity-tag/entity-tag.component'
 import {
-  EvidenceItem,
-  EvidenceItemConnection,
   VariantManagerGQL,
   VariantManagerQuery,
   VariantManagerQueryVariables,
-  EvidenceSortColumns,
   Maybe,
   PageInfo,
   SortDirection,
@@ -287,11 +284,11 @@ export class CvcVariantManagerComponent implements OnChanges, AfterViewInit {
               name: row.name,
               link: row.link,
             },
-            gene: {
-              __typename: 'Gene',
-              id: row.geneId,
-              name: row.geneName,
-              link: row.geneLink,
+            feature: {
+              __typename: 'Feature',
+              id: row.featureId,
+              name: row.featureName,
+              link: row.featureLink,
             },
             selected: selected.has(row.id),
           }
diff --git a/client/src/app/forms/types/variant-select/variant-manager/variant-manager.config.ts b/client/src/app/forms/types/variant-select/variant-manager/variant-manager.config.ts
index eda0daac9..92fd34ac7 100644
--- a/client/src/app/forms/types/variant-select/variant-manager/variant-manager.config.ts
+++ b/client/src/app/forms/types/variant-select/variant-manager/variant-manager.config.ts
@@ -25,7 +25,7 @@ import {
 
 export const columnKeyToSortColumnMap: VariantManagerColSortMap = {
   diseases: VariantsSortColumns.DiseaseName,
-  gene: VariantsSortColumns.EntrezSymbol,
+  feature: VariantsSortColumns.FeatureName,
   therapies: VariantsSortColumns.TherapyName,
   variant: VariantsSortColumns.VariantName,
 }
@@ -37,7 +37,7 @@ export const columnKeyToQueryVariableMap: VariantManagerColQueryMap = {
   diseases: 'diseaseName',
   therapies: 'therapyName',
   variant: 'variantName',
-  gene: 'entrezSymbol',
+  feature: 'featureName',
   aliases: 'variantAlias'
 }
 
@@ -114,8 +114,8 @@ export class VariantManagerConfig {
         },
       },
       {
-        key: 'gene',
-        label: 'Gene',
+        key: 'feature',
+        label: 'Feature',
         type: 'entity-tag',
         width: '135px',
         tag: {
@@ -124,7 +124,7 @@ export class VariantManagerConfig {
         sort: {},
         filter: {
           inputType: 'default',
-          options: [{ key: 'Filter Gene Name', value: null }],
+          options: [{ key: 'Filter Feature Name', value: null }],
         },
       },
       {
diff --git a/client/src/app/forms/types/variant-select/variant-manager/variant-manager.query.gql b/client/src/app/forms/types/variant-select/variant-manager/variant-manager.query.gql
index fb161b408..71d9ad889 100644
--- a/client/src/app/forms/types/variant-select/variant-manager/variant-manager.query.gql
+++ b/client/src/app/forms/types/variant-select/variant-manager/variant-manager.query.gql
@@ -1,6 +1,6 @@
 query VariantManager(
   $variantName: String
-  $entrezSymbol: String
+  $featureName: String
   $diseaseName: String
   $therapyName: String
   $variantAlias: String
@@ -14,7 +14,7 @@ query VariantManager(
 ) {
   browseVariants(
     variantName: $variantName
-    entrezSymbol: $entrezSymbol
+    featureName: $featureName
     diseaseName: $diseaseName
     therapyName: $therapyName
     variantAlias: $variantAlias
@@ -47,9 +47,9 @@ fragment VariantManagerFields on BrowseVariant {
   id
   name
   link
-  geneId
-  geneName
-  geneLink
+  featureId
+  featureName
+  featureLink
   diseases {
     id
     name
diff --git a/client/src/app/forms/types/variant-select/variant-manager/variant-manager.types.ts b/client/src/app/forms/types/variant-select/variant-manager/variant-manager.types.ts
index 9e1c38296..876069a70 100644
--- a/client/src/app/forms/types/variant-select/variant-manager/variant-manager.types.ts
+++ b/client/src/app/forms/types/variant-select/variant-manager/variant-manager.types.ts
@@ -5,17 +5,14 @@ import { TypeGuard } from '@app/core/pipes/type-guard.pipe'
 import { CvcEmptyValueCategory } from '@app/forms/components/empty-value/empty-value.component'
 import { CvcTagLabelMax } from '@app/forms/components/entity-tag/entity-tag.component'
 import {
-  EvidenceItem,
   VariantManagerFieldsFragment,
   VariantManagerQuery,
   VariantManagerQueryVariables,
-  EvidenceSortColumns,
   Maybe,
-  PageInfo,
   SortDirection,
   BrowseVariant,
   VariantsSortColumns,
-  Gene,
+  Feature,
 } from '@app/generated/civic.apollo'
 import { GraphQLError } from 'graphql'
 import {
@@ -46,7 +43,7 @@ export type VariantManagerConnection = VariantManagerQuery['browseVariants']
 type VariantManagerRowDataExtra = {
   variant: Pick<BrowseVariant, 'id' | 'name' | 'link'>
   // need evidence object for entity tag in selectEntity column
-  gene: Pick<Gene, 'id' | 'name' | 'link'>
+  feature: Pick<Feature, 'id' | 'name' | 'link'>
   // additional boolean column to handle row selected state
   selected: boolean
 }
@@ -57,9 +54,9 @@ export type VariantManagerRowData = Pick<
   VariantManagerFieldsFragment,
   | 'id'
   | 'name'
-  | 'geneId'
-  | 'geneName'
-  | 'geneLink'
+  | 'featureId'
+  | 'featureName'
+  | 'featureLink'
   | 'diseases'
   | 'therapies'
   | 'aliases'
@@ -74,7 +71,7 @@ export type ConvertedQueryVar = keyof Pick<
   | 'variantAlias'
   | 'diseaseName'
   | 'therapyName'
-  | 'entrezSymbol'
+  | 'featureName'
   | 'variantAlias'
 >
 
diff --git a/client/src/app/generated/civic.apollo-helpers.ts b/client/src/app/generated/civic.apollo-helpers.ts
index d430ac5d1..e580fa853 100644
--- a/client/src/app/generated/civic.apollo-helpers.ts
+++ b/client/src/app/generated/civic.apollo-helpers.ts
@@ -364,13 +364,13 @@ export type BrowseTherapyEdgeFieldPolicy = {
 	cursor?: FieldPolicy<any> | FieldReadFunction<any>,
 	node?: FieldPolicy<any> | FieldReadFunction<any>
 };
-export type BrowseVariantKeySpecifier = ('aliases' | 'diseases' | 'geneId' | 'geneLink' | 'geneName' | 'id' | 'link' | 'name' | 'therapies' | 'variantTypes' | BrowseVariantKeySpecifier)[];
+export type BrowseVariantKeySpecifier = ('aliases' | 'diseases' | 'featureId' | 'featureLink' | 'featureName' | 'id' | 'link' | 'name' | 'therapies' | 'variantTypes' | BrowseVariantKeySpecifier)[];
 export type BrowseVariantFieldPolicy = {
 	aliases?: FieldPolicy<any> | FieldReadFunction<any>,
 	diseases?: FieldPolicy<any> | FieldReadFunction<any>,
-	geneId?: FieldPolicy<any> | FieldReadFunction<any>,
-	geneLink?: FieldPolicy<any> | FieldReadFunction<any>,
-	geneName?: FieldPolicy<any> | FieldReadFunction<any>,
+	featureId?: FieldPolicy<any> | FieldReadFunction<any>,
+	featureLink?: FieldPolicy<any> | FieldReadFunction<any>,
+	featureName?: FieldPolicy<any> | FieldReadFunction<any>,
 	id?: FieldPolicy<any> | FieldReadFunction<any>,
 	link?: FieldPolicy<any> | FieldReadFunction<any>,
 	name?: FieldPolicy<any> | FieldReadFunction<any>,
diff --git a/client/src/app/generated/civic.apollo.ts b/client/src/app/generated/civic.apollo.ts
index 20512a581..388569e6d 100644
--- a/client/src/app/generated/civic.apollo.ts
+++ b/client/src/app/generated/civic.apollo.ts
@@ -818,9 +818,9 @@ export type BrowseVariant = {
   __typename: 'BrowseVariant';
   aliases: Array<VariantAlias>;
   diseases: Array<Disease>;
-  geneId: Scalars['Int'];
-  geneLink: Scalars['String'];
-  geneName: Scalars['String'];
+  featureId: Scalars['Int'];
+  featureLink: Scalars['String'];
+  featureName: Scalars['String'];
   id: Scalars['Int'];
   link: Scalars['String'];
   name: Scalars['String'];
@@ -3759,7 +3759,7 @@ export type QueryBrowseVariantsArgs = {
   after?: InputMaybe<Scalars['String']>;
   before?: InputMaybe<Scalars['String']>;
   diseaseName?: InputMaybe<Scalars['String']>;
-  entrezSymbol?: InputMaybe<Scalars['String']>;
+  featureName?: InputMaybe<Scalars['String']>;
   first?: InputMaybe<Scalars['Int']>;
   hasNoVariantType?: InputMaybe<Scalars['Boolean']>;
   last?: InputMaybe<Scalars['Int']>;
@@ -5936,7 +5936,7 @@ export type VariantsSort = {
 
 export enum VariantsSortColumns {
   DiseaseName = 'diseaseName',
-  EntrezSymbol = 'entrezSymbol',
+  FeatureName = 'featureName',
   TherapyName = 'therapyName',
   VariantName = 'variantName'
 }
@@ -6820,7 +6820,7 @@ export type MenuVariantFragment = { __typename: 'Variant', id: number, name: str
 
 export type BrowseVariantsQueryVariables = Exact<{
   variantName?: InputMaybe<Scalars['String']>;
-  entrezSymbol?: InputMaybe<Scalars['String']>;
+  featureName?: InputMaybe<Scalars['String']>;
   diseaseName?: InputMaybe<Scalars['String']>;
   therapyName?: InputMaybe<Scalars['String']>;
   variantAlias?: InputMaybe<Scalars['String']>;
@@ -6836,9 +6836,9 @@ export type BrowseVariantsQueryVariables = Exact<{
 }>;
 
 
-export type BrowseVariantsQuery = { __typename: 'Query', browseVariants: { __typename: 'BrowseVariantConnection', totalCount: number, filteredCount: number, pageCount: number, lastUpdated: any, pageInfo: { __typename: 'PageInfo', endCursor?: string | undefined, hasNextPage: boolean, startCursor?: string | undefined, hasPreviousPage: boolean }, edges: Array<{ __typename: 'BrowseVariantEdge', cursor: string, node?: { __typename: 'BrowseVariant', id: number, name: string, link: string, geneId: number, geneName: string, geneLink: string, diseases: Array<{ __typename: 'Disease', id: number, name: string, link: string }>, therapies: Array<{ __typename: 'Therapy', id: number, name: string, link: string }>, aliases: Array<{ __typename: 'VariantAlias', name: string }>, variantTypes: Array<{ __typename: 'LinkableVariantType', id: number, name: string, link: string }> } | undefined }> } };
+export type BrowseVariantsQuery = { __typename: 'Query', browseVariants: { __typename: 'BrowseVariantConnection', totalCount: number, filteredCount: number, pageCount: number, lastUpdated: any, pageInfo: { __typename: 'PageInfo', endCursor?: string | undefined, hasNextPage: boolean, startCursor?: string | undefined, hasPreviousPage: boolean }, edges: Array<{ __typename: 'BrowseVariantEdge', cursor: string, node?: { __typename: 'BrowseVariant', id: number, name: string, link: string, featureId: number, featureName: string, featureLink: string, diseases: Array<{ __typename: 'Disease', id: number, name: string, link: string }>, therapies: Array<{ __typename: 'Therapy', id: number, name: string, link: string }>, aliases: Array<{ __typename: 'VariantAlias', name: string }>, variantTypes: Array<{ __typename: 'LinkableVariantType', id: number, name: string, link: string }> } | undefined }> } };
 
-export type BrowseVariantsFieldsFragment = { __typename: 'BrowseVariant', id: number, name: string, link: string, geneId: number, geneName: string, geneLink: string, diseases: Array<{ __typename: 'Disease', id: number, name: string, link: string }>, therapies: Array<{ __typename: 'Therapy', id: number, name: string, link: string }>, aliases: Array<{ __typename: 'VariantAlias', name: string }>, variantTypes: Array<{ __typename: 'LinkableVariantType', id: number, name: string, link: string }> };
+export type BrowseVariantsFieldsFragment = { __typename: 'BrowseVariant', id: number, name: string, link: string, featureId: number, featureName: string, featureLink: string, diseases: Array<{ __typename: 'Disease', id: number, name: string, link: string }>, therapies: Array<{ __typename: 'Therapy', id: number, name: string, link: string }>, aliases: Array<{ __typename: 'VariantAlias', name: string }>, variantTypes: Array<{ __typename: 'LinkableVariantType', id: number, name: string, link: string }> };
 
 export type ViewerBaseQueryVariables = Exact<{ [key: string]: never; }>;
 
@@ -7432,7 +7432,7 @@ export type TherapySelectTypeaheadFieldsFragment = { __typename: 'Therapy', id:
 
 export type VariantManagerQueryVariables = Exact<{
   variantName?: InputMaybe<Scalars['String']>;
-  entrezSymbol?: InputMaybe<Scalars['String']>;
+  featureName?: InputMaybe<Scalars['String']>;
   diseaseName?: InputMaybe<Scalars['String']>;
   therapyName?: InputMaybe<Scalars['String']>;
   variantAlias?: InputMaybe<Scalars['String']>;
@@ -7446,9 +7446,9 @@ export type VariantManagerQueryVariables = Exact<{
 }>;
 
 
-export type VariantManagerQuery = { __typename: 'Query', browseVariants: { __typename: 'BrowseVariantConnection', totalCount: number, filteredCount: number, pageCount: number, pageInfo: { __typename: 'PageInfo', endCursor?: string | undefined, hasNextPage: boolean, startCursor?: string | undefined, hasPreviousPage: boolean }, edges: Array<{ __typename: 'BrowseVariantEdge', cursor: string, node?: { __typename: 'BrowseVariant', id: number, name: string, link: string, geneId: number, geneName: string, geneLink: string, diseases: Array<{ __typename: 'Disease', id: number, name: string, link: string }>, therapies: Array<{ __typename: 'Therapy', id: number, name: string, link: string }>, aliases: Array<{ __typename: 'VariantAlias', name: string }>, variantTypes: Array<{ __typename: 'LinkableVariantType', id: number, name: string, link: string }> } | undefined }> } };
+export type VariantManagerQuery = { __typename: 'Query', browseVariants: { __typename: 'BrowseVariantConnection', totalCount: number, filteredCount: number, pageCount: number, pageInfo: { __typename: 'PageInfo', endCursor?: string | undefined, hasNextPage: boolean, startCursor?: string | undefined, hasPreviousPage: boolean }, edges: Array<{ __typename: 'BrowseVariantEdge', cursor: string, node?: { __typename: 'BrowseVariant', id: number, name: string, link: string, featureId: number, featureName: string, featureLink: string, diseases: Array<{ __typename: 'Disease', id: number, name: string, link: string }>, therapies: Array<{ __typename: 'Therapy', id: number, name: string, link: string }>, aliases: Array<{ __typename: 'VariantAlias', name: string }>, variantTypes: Array<{ __typename: 'LinkableVariantType', id: number, name: string, link: string }> } | undefined }> } };
 
-export type VariantManagerFieldsFragment = { __typename: 'BrowseVariant', id: number, name: string, link: string, geneId: number, geneName: string, geneLink: string, diseases: Array<{ __typename: 'Disease', id: number, name: string, link: string }>, therapies: Array<{ __typename: 'Therapy', id: number, name: string, link: string }>, aliases: Array<{ __typename: 'VariantAlias', name: string }> };
+export type VariantManagerFieldsFragment = { __typename: 'BrowseVariant', id: number, name: string, link: string, featureId: number, featureName: string, featureLink: string, diseases: Array<{ __typename: 'Disease', id: number, name: string, link: string }>, therapies: Array<{ __typename: 'Therapy', id: number, name: string, link: string }>, aliases: Array<{ __typename: 'VariantAlias', name: string }> };
 
 export type QuickAddVariantMutationVariables = Exact<{
   name: Scalars['String'];
@@ -8986,9 +8986,9 @@ export const BrowseVariantsFieldsFragmentDoc = gql`
   id
   name
   link
-  geneId
-  geneName
-  geneLink
+  featureId
+  featureName
+  featureLink
   diseases {
     id
     name
@@ -9442,9 +9442,9 @@ export const VariantManagerFieldsFragmentDoc = gql`
   id
   name
   link
-  geneId
-  geneName
-  geneLink
+  featureId
+  featureName
+  featureLink
   diseases {
     id
     name
@@ -12482,10 +12482,10 @@ export const VariantTypesForFeatureDocument = gql`
     }
   }
 export const BrowseVariantsDocument = gql`
-    query BrowseVariants($variantName: String, $entrezSymbol: String, $diseaseName: String, $therapyName: String, $variantAlias: String, $variantTypeId: Int, $variantGroupId: Int, $variantTypeName: String, $hasNoVariantType: Boolean, $sortBy: VariantsSort, $first: Int, $last: Int, $before: String, $after: String) {
+    query BrowseVariants($variantName: String, $featureName: String, $diseaseName: String, $therapyName: String, $variantAlias: String, $variantTypeId: Int, $variantGroupId: Int, $variantTypeName: String, $hasNoVariantType: Boolean, $sortBy: VariantsSort, $first: Int, $last: Int, $before: String, $after: String) {
   browseVariants(
     variantName: $variantName
-    entrezSymbol: $entrezSymbol
+    featureName: $featureName
     diseaseName: $diseaseName
     therapyName: $therapyName
     variantAlias: $variantAlias
@@ -14031,10 +14031,10 @@ export const TherapySelectTagDocument = gql`
     }
   }
 export const VariantManagerDocument = gql`
-    query VariantManager($variantName: String, $entrezSymbol: String, $diseaseName: String, $therapyName: String, $variantAlias: String, $variantTypeId: Int, $variantGroupId: Int, $sortBy: VariantsSort, $first: Int, $last: Int, $before: String, $after: String) {
+    query VariantManager($variantName: String, $featureName: String, $diseaseName: String, $therapyName: String, $variantAlias: String, $variantTypeId: Int, $variantGroupId: Int, $sortBy: VariantsSort, $first: Int, $last: Int, $before: String, $after: String) {
   browseVariants(
     variantName: $variantName
-    entrezSymbol: $entrezSymbol
+    featureName: $featureName
     diseaseName: $diseaseName
     therapyName: $therapyName
     variantAlias: $variantAlias
diff --git a/client/src/app/generated/server.model.graphql b/client/src/app/generated/server.model.graphql
index dabe47477..1f7b472d0 100644
--- a/client/src/app/generated/server.model.graphql
+++ b/client/src/app/generated/server.model.graphql
@@ -1385,9 +1385,9 @@ type BrowseTherapyEdge {
 type BrowseVariant {
   aliases: [VariantAlias!]!
   diseases: [Disease!]!
-  geneId: Int!
-  geneLink: String!
-  geneName: String!
+  featureId: Int!
+  featureLink: String!
+  featureName: String!
   id: Int!
   link: String!
   name: String!
@@ -5878,7 +5878,7 @@ type Query {
     """
     before: String
     diseaseName: String
-    entrezSymbol: String
+    featureName: String
 
     """
     Returns the first _n_ elements from the list.
@@ -9754,7 +9754,7 @@ input VariantsSort {
 
 enum VariantsSortColumns {
   diseaseName
-  entrezSymbol
+  featureName
   therapyName
   variantName
 }
diff --git a/client/src/app/generated/server.schema.json b/client/src/app/generated/server.schema.json
index df723e7af..ae77dca87 100644
--- a/client/src/app/generated/server.schema.json
+++ b/client/src/app/generated/server.schema.json
@@ -6509,7 +6509,7 @@
               "deprecationReason": null
             },
             {
-              "name": "geneId",
+              "name": "featureId",
               "description": null,
               "args": [],
               "type": {
@@ -6525,7 +6525,7 @@
               "deprecationReason": null
             },
             {
-              "name": "geneLink",
+              "name": "featureLink",
               "description": null,
               "args": [],
               "type": {
@@ -6541,7 +6541,7 @@
               "deprecationReason": null
             },
             {
-              "name": "geneName",
+              "name": "featureName",
               "description": null,
               "args": [],
               "type": {
@@ -27908,7 +27908,7 @@
                   "deprecationReason": null
                 },
                 {
-                  "name": "entrezSymbol",
+                  "name": "featureName",
                   "description": null,
                   "type": {
                     "kind": "SCALAR",
@@ -44340,7 +44340,7 @@
           "interfaces": null,
           "enumValues": [
             {
-              "name": "entrezSymbol",
+              "name": "featureName",
               "description": null,
               "isDeprecated": false,
               "deprecationReason": null
diff --git a/server/app/graphql/resolvers/browse_variants.rb b/server/app/graphql/resolvers/browse_variants.rb
index 73105fc98..8af6281ec 100644
--- a/server/app/graphql/resolvers/browse_variants.rb
+++ b/server/app/graphql/resolvers/browse_variants.rb
@@ -10,7 +10,7 @@ class Resolvers::BrowseVariants < GraphQL::Schema::Resolver
   scope { MaterializedViews::VariantBrowseTableRow.all }
 
   option(:variant_name, type: String)  { |scope, value| scope.where("name ILIKE ?", "%#{value}%") }
-  option(:entrez_symbol, type: String) { |scope, value| scope.where("gene_name ILIKE ?", "#{value}%") }
+  option(:feature_name, type: String) { |scope, value| scope.where("feature_name ILIKE ?", "#{value}%") }
   option(:variant_type_id, type: Int)  { |scope, value| scope.where(int_array_query_for_column('variant_type_ids'), value) }
   option(:disease_name, type: String)  { |scope, value| scope.where(json_name_query_for_column('diseases'), "%#{value}%") }
   option(:therapy_name, type: String)  { |scope, value| scope.where(json_name_query_for_column('therapies'), "%#{value}%") }
@@ -31,8 +31,8 @@ class Resolvers::BrowseVariants < GraphQL::Schema::Resolver
     case value.column
     when "variantName"
       scope.reorder "name #{value.direction}"
-    when "entrezSymbol"
-      scope.reorder "gene_name #{value.direction}"
+    when "featureName"
+      scope.reorder "feature_name #{value.direction}"
     when "therapyName"
       scope.reorder "drug_names #{value.direction}"
     when "diseaseName"
diff --git a/server/app/graphql/types/browse_tables/browse_variant_type.rb b/server/app/graphql/types/browse_tables/browse_variant_type.rb
index 81167ea3e..10bba3650 100644
--- a/server/app/graphql/types/browse_tables/browse_variant_type.rb
+++ b/server/app/graphql/types/browse_tables/browse_variant_type.rb
@@ -11,9 +11,9 @@ class BrowseVariantType < Types::BaseObject
     field :id, Int, null: false
     field :name, String, null: false
     field :link, String, null: false
-    field :gene_id, Int, null: false
-    field :gene_name, String, null: false
-    field :gene_link, String, null: false
+    field :feature_id, Int, null: false
+    field :feature_name, String, null: false
+    field :feature_link, String, null: false
     field :diseases, [Types::Entities::DiseaseType], null: false
     field :therapies, [Types::Entities::TherapyType], null: false
     field :aliases, [Types::Entities::VariantAliasType], null: false
@@ -23,8 +23,8 @@ def link
       Rails.application.routes.url_helpers.url_for("/variants/#{object.id}")
     end
 
-    def gene_link
-      Rails.application.routes.url_helpers.url_for("/genes/#{object.gene_id}")
+    def feature_link
+      Rails.application.routes.url_helpers.url_for("/features/#{object.feature_id}")
     end
 
     def aliases
diff --git a/server/app/graphql/types/browse_tables/variants_sort_columns.rb b/server/app/graphql/types/browse_tables/variants_sort_columns.rb
index e740c60ba..330e80d01 100644
--- a/server/app/graphql/types/browse_tables/variants_sort_columns.rb
+++ b/server/app/graphql/types/browse_tables/variants_sort_columns.rb
@@ -1,6 +1,6 @@
 module Types::BrowseTables
   class VariantsSortColumns < Types::BaseEnum
-    value "entrezSymbol"
+    value "featureName"
     value "variantName"
     value "diseaseName"
     value "therapyName"
diff --git a/server/db/migrate/20231215180038_update_variant_browse_table_rows_to_version_14.rb b/server/db/migrate/20231215180038_update_variant_browse_table_rows_to_version_14.rb
new file mode 100644
index 000000000..d14b13a2a
--- /dev/null
+++ b/server/db/migrate/20231215180038_update_variant_browse_table_rows_to_version_14.rb
@@ -0,0 +1,8 @@
+class UpdateVariantBrowseTableRowsToVersion14 < ActiveRecord::Migration[6.1]
+  def change
+    update_view :variant_browse_table_rows,
+      version: 14,
+      revert_to_version: 13,
+      materialized: true
+  end
+end
diff --git a/server/db/schema.rb b/server/db/schema.rb
index 763bed676..67a3126d9 100644
--- a/server/db/schema.rb
+++ b/server/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2023_12_15_162427) do
+ActiveRecord::Schema.define(version: 2023_12_15_180038) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -1113,54 +1113,6 @@
   SQL
   add_index "source_browse_table_rows", ["id"], name: "index_source_browse_table_rows_on_id", unique: true
 
-  create_view "variant_browse_table_rows", materialized: true, sql_definition: <<-SQL
-      SELECT outer_variants.id,
-      outer_variants.name,
-      genes.id AS gene_id,
-      genes.name AS gene_name,
-      array_agg(DISTINCT variant_aliases.name ORDER BY variant_aliases.name) AS alias_names,
-      array_agg(DISTINCT variant_types.id) AS variant_type_ids,
-      json_agg(DISTINCT jsonb_build_object('name', variant_types.display_name, 'id', variant_types.id)) FILTER (WHERE (variant_types.* IS NOT NULL)) AS variant_types,
-      count(DISTINCT variant_types.id) AS variant_type_count,
-      count(DISTINCT evidence_items.id) FILTER (WHERE (evidence_items.id IS NOT NULL)) AS evidence_item_count,
-      json_agg(DISTINCT jsonb_build_object('name', diseases.name, 'id', diseases.id, 'total', disease_count.total)) FILTER (WHERE (diseases.name IS NOT NULL)) AS diseases,
-      json_agg(DISTINCT jsonb_build_object('name', therapies.name, 'id', therapies.id, 'total', therapy_count.total)) FILTER (WHERE (therapies.name IS NOT NULL)) AS therapies,
-      count(DISTINCT assertions.id) AS assertion_count
-     FROM ((((((((((((((variants outer_variants
-       LEFT JOIN variant_aliases_variants ON ((variant_aliases_variants.variant_id = outer_variants.id)))
-       LEFT JOIN variant_aliases ON ((variant_aliases.id = variant_aliases_variants.variant_alias_id)))
-       JOIN molecular_profiles_variants ON ((molecular_profiles_variants.variant_id = outer_variants.id)))
-       JOIN molecular_profiles ON ((molecular_profiles.id = molecular_profiles_variants.molecular_profile_id)))
-       LEFT JOIN evidence_items ON ((evidence_items.molecular_profile_id = molecular_profiles.id)))
-       JOIN genes ON ((genes.id = outer_variants.gene_id)))
-       LEFT JOIN diseases ON ((diseases.id = evidence_items.disease_id)))
-       LEFT JOIN evidence_items_therapies ON ((evidence_items_therapies.evidence_item_id = evidence_items.id)))
-       LEFT JOIN therapies ON ((therapies.id = evidence_items_therapies.therapy_id)))
-       LEFT JOIN assertions ON ((assertions.molecular_profile_id = molecular_profiles.id)))
-       LEFT JOIN variant_types_variants ON ((variant_types_variants.variant_id = outer_variants.id)))
-       LEFT JOIN variant_types ON ((variant_types_variants.variant_type_id = variant_types.id)))
-       LEFT JOIN LATERAL ( SELECT therapies_1.id AS therapy_id,
-              count(DISTINCT evidence_items_1.id) FILTER (WHERE (evidence_items_1.id IS NOT NULL)) AS total
-             FROM ((((evidence_items evidence_items_1
-               JOIN evidence_items_therapies evidence_items_therapies_1 ON ((evidence_items_therapies_1.evidence_item_id = evidence_items_1.id)))
-               JOIN therapies therapies_1 ON ((therapies_1.id = evidence_items_therapies_1.therapy_id)))
-               JOIN molecular_profiles molecular_profiles_1 ON ((molecular_profiles_1.id = evidence_items_1.molecular_profile_id)))
-               JOIN molecular_profiles_variants molecular_profiles_variants_1 ON ((molecular_profiles_variants_1.molecular_profile_id = molecular_profiles_1.id)))
-            WHERE (molecular_profiles_variants_1.variant_id = outer_variants.id)
-            GROUP BY therapies_1.id) therapy_count ON ((therapies.id = therapy_count.therapy_id)))
-       LEFT JOIN LATERAL ( SELECT diseases_1.id AS disease_id,
-              count(DISTINCT evidence_items_1.id) FILTER (WHERE (evidence_items_1.id IS NOT NULL)) AS total
-             FROM (((evidence_items evidence_items_1
-               JOIN diseases diseases_1 ON ((diseases_1.id = evidence_items_1.disease_id)))
-               JOIN molecular_profiles molecular_profiles_1 ON ((molecular_profiles_1.id = evidence_items_1.molecular_profile_id)))
-               JOIN molecular_profiles_variants molecular_profiles_variants_1 ON ((molecular_profiles_variants_1.molecular_profile_id = molecular_profiles_1.id)))
-            WHERE (molecular_profiles_variants_1.variant_id = outer_variants.id)
-            GROUP BY diseases_1.id) disease_count ON ((diseases.id = disease_count.disease_id)))
-    WHERE ((((evidence_items.status)::text <> 'rejected'::text) OR (evidence_items.status IS NULL)) AND (outer_variants.deprecated = false))
-    GROUP BY outer_variants.id, outer_variants.name, genes.id, genes.name;
-  SQL
-  add_index "variant_browse_table_rows", ["id"], name: "index_variant_browse_table_rows_on_id", unique: true
-
   create_view "evidence_items_by_types", sql_definition: <<-SQL
       SELECT mp.id AS molecular_profile_id,
       sum(
@@ -1307,4 +1259,52 @@
   SQL
   add_index "molecular_profile_browse_table_rows", ["id"], name: "index_molecular_profile_browse_table_rows_on_id", unique: true
 
+  create_view "variant_browse_table_rows", materialized: true, sql_definition: <<-SQL
+      SELECT outer_variants.id,
+      outer_variants.name,
+      features.id AS feature_id,
+      features.name AS feature_name,
+      array_agg(DISTINCT variant_aliases.name ORDER BY variant_aliases.name) AS alias_names,
+      array_agg(DISTINCT variant_types.id) AS variant_type_ids,
+      json_agg(DISTINCT jsonb_build_object('name', variant_types.display_name, 'id', variant_types.id)) FILTER (WHERE (variant_types.* IS NOT NULL)) AS variant_types,
+      count(DISTINCT variant_types.id) AS variant_type_count,
+      count(DISTINCT evidence_items.id) FILTER (WHERE (evidence_items.id IS NOT NULL)) AS evidence_item_count,
+      json_agg(DISTINCT jsonb_build_object('name', diseases.name, 'id', diseases.id, 'total', disease_count.total)) FILTER (WHERE (diseases.name IS NOT NULL)) AS diseases,
+      json_agg(DISTINCT jsonb_build_object('name', therapies.name, 'id', therapies.id, 'total', therapy_count.total)) FILTER (WHERE (therapies.name IS NOT NULL)) AS therapies,
+      count(DISTINCT assertions.id) AS assertion_count
+     FROM ((((((((((((((variants outer_variants
+       LEFT JOIN variant_aliases_variants ON ((variant_aliases_variants.variant_id = outer_variants.id)))
+       LEFT JOIN variant_aliases ON ((variant_aliases.id = variant_aliases_variants.variant_alias_id)))
+       JOIN molecular_profiles_variants ON ((molecular_profiles_variants.variant_id = outer_variants.id)))
+       JOIN molecular_profiles ON ((molecular_profiles.id = molecular_profiles_variants.molecular_profile_id)))
+       LEFT JOIN evidence_items ON ((evidence_items.molecular_profile_id = molecular_profiles.id)))
+       JOIN features ON ((features.id = outer_variants.feature_id)))
+       LEFT JOIN diseases ON ((diseases.id = evidence_items.disease_id)))
+       LEFT JOIN evidence_items_therapies ON ((evidence_items_therapies.evidence_item_id = evidence_items.id)))
+       LEFT JOIN therapies ON ((therapies.id = evidence_items_therapies.therapy_id)))
+       LEFT JOIN assertions ON ((assertions.molecular_profile_id = molecular_profiles.id)))
+       LEFT JOIN variant_types_variants ON ((variant_types_variants.variant_id = outer_variants.id)))
+       LEFT JOIN variant_types ON ((variant_types_variants.variant_type_id = variant_types.id)))
+       LEFT JOIN LATERAL ( SELECT therapies_1.id AS therapy_id,
+              count(DISTINCT evidence_items_1.id) FILTER (WHERE (evidence_items_1.id IS NOT NULL)) AS total
+             FROM ((((evidence_items evidence_items_1
+               JOIN evidence_items_therapies evidence_items_therapies_1 ON ((evidence_items_therapies_1.evidence_item_id = evidence_items_1.id)))
+               JOIN therapies therapies_1 ON ((therapies_1.id = evidence_items_therapies_1.therapy_id)))
+               JOIN molecular_profiles molecular_profiles_1 ON ((molecular_profiles_1.id = evidence_items_1.molecular_profile_id)))
+               JOIN molecular_profiles_variants molecular_profiles_variants_1 ON ((molecular_profiles_variants_1.molecular_profile_id = molecular_profiles_1.id)))
+            WHERE (molecular_profiles_variants_1.variant_id = outer_variants.id)
+            GROUP BY therapies_1.id) therapy_count ON ((therapies.id = therapy_count.therapy_id)))
+       LEFT JOIN LATERAL ( SELECT diseases_1.id AS disease_id,
+              count(DISTINCT evidence_items_1.id) FILTER (WHERE (evidence_items_1.id IS NOT NULL)) AS total
+             FROM (((evidence_items evidence_items_1
+               JOIN diseases diseases_1 ON ((diseases_1.id = evidence_items_1.disease_id)))
+               JOIN molecular_profiles molecular_profiles_1 ON ((molecular_profiles_1.id = evidence_items_1.molecular_profile_id)))
+               JOIN molecular_profiles_variants molecular_profiles_variants_1 ON ((molecular_profiles_variants_1.molecular_profile_id = molecular_profiles_1.id)))
+            WHERE (molecular_profiles_variants_1.variant_id = outer_variants.id)
+            GROUP BY diseases_1.id) disease_count ON ((diseases.id = disease_count.disease_id)))
+    WHERE ((((evidence_items.status)::text <> 'rejected'::text) OR (evidence_items.status IS NULL)) AND (outer_variants.deprecated = false))
+    GROUP BY outer_variants.id, outer_variants.name, features.id, features.name;
+  SQL
+  add_index "variant_browse_table_rows", ["id"], name: "index_variant_browse_table_rows_on_id", unique: true
+
 end
diff --git a/server/db/views/variant_browse_table_rows_v14.sql b/server/db/views/variant_browse_table_rows_v14.sql
new file mode 100644
index 000000000..f745d1d03
--- /dev/null
+++ b/server/db/views/variant_browse_table_rows_v14.sql
@@ -0,0 +1,46 @@
+SELECT outer_variants.id,
+  outer_variants.name,
+  features.id as feature_id,
+  features.name as feature_name,
+  array_agg(distinct(variant_aliases.name) order by variant_aliases.name) as alias_names,
+  array_agg(DISTINCT(variant_types.id)) as variant_type_ids,
+  json_agg(distinct jsonb_build_object('name', variant_types.display_name, 'id', variant_types.id)) FILTER (where variant_types IS NOT NULL) as variant_types,
+  COUNT(DISTINCT(variant_types.id)) as variant_type_count,
+  COUNT(DISTINCT(evidence_items.id)) FILTER (WHERE evidence_items.id IS NOT NULL) as evidence_item_count,
+  json_agg(distinct jsonb_build_object('name', diseases.name, 'id', diseases.id, 'total', disease_count.total))  FILTER (WHERE diseases.name IS NOT NULL) as diseases,
+  json_agg(distinct jsonb_build_object('name', therapies.name, 'id', therapies.id, 'total', therapy_count.total))  FILTER (WHERE therapies.name IS NOT NULL) as therapies,
+  COUNT(DISTINCT(assertions.id)) as assertion_count
+FROM variants outer_variants
+LEFT OUTER JOIN variant_aliases_variants ON variant_aliases_variants.variant_id = outer_variants.id
+LEFT OUTER JOIN variant_aliases ON variant_aliases.id = variant_aliases_variants.variant_alias_id
+INNER JOIN molecular_profiles_variants on molecular_profiles_variants.variant_id = outer_variants.id
+INNER JOIN molecular_profiles on molecular_profiles.id = molecular_profiles_variants.molecular_profile_id
+LEFT OUTER JOIN evidence_items ON evidence_items.molecular_profile_id = molecular_profiles.id
+INNER JOIN features ON features.id = outer_variants.feature_id
+LEFT OUTER JOIN diseases ON diseases.id = evidence_items.disease_id
+LEFT OUTER JOIN evidence_items_therapies ON evidence_items_therapies.evidence_item_id = evidence_items.id
+LEFT OUTER JOIN therapies ON therapies.id = evidence_items_therapies.therapy_id
+LEFT OUTER JOIN assertions ON assertions.molecular_profile_id = molecular_profiles.id
+LEFT OUTER JOIN variant_types_variants ON variant_types_variants.variant_id = outer_variants.id
+LEFT OUTER JOIN variant_types ON variant_types_variants.variant_type_id = variant_types.id
+LEFT JOIN LATERAL (SELECT therapies.id as therapy_id, COUNT(DISTINCT(evidence_items.id)) FILTER (WHERE evidence_items.id IS NOT NULL) as total
+  FROM evidence_items
+  INNER JOIN evidence_items_therapies ON evidence_items_therapies.evidence_item_id = evidence_items.id
+  INNER JOIN therapies ON therapies.id = evidence_items_therapies.therapy_id
+  INNER JOIN molecular_profiles on molecular_profiles.id = evidence_items.molecular_profile_id
+  INNER JOIN molecular_profiles_variants on molecular_profiles_variants.molecular_profile_id = molecular_profiles.id
+  WHERE molecular_profiles_variants.variant_id = outer_variants.id
+  GROUP BY therapies.id
+) therapy_count on therapies.id = therapy_count.therapy_id
+
+LEFT JOIN LATERAL (SELECT diseases.id as disease_id, COUNT(DISTINCT(evidence_items.id)) FILTER (WHERE evidence_items.id IS NOT NULL) as total
+  FROM evidence_items
+  INNER JOIN diseases ON diseases.id = evidence_items.disease_id
+  INNER JOIN molecular_profiles on molecular_profiles.id = evidence_items.molecular_profile_id
+  INNER JOIN molecular_profiles_variants on molecular_profiles_variants.molecular_profile_id = molecular_profiles.id
+  WHERE molecular_profiles_variants.variant_id = outer_variants.id
+  GROUP BY diseases.id
+) disease_count on diseases.id = disease_count.disease_id
+WHERE (evidence_items.status != 'rejected' OR evidence_items.status IS NULL)
+AND outer_variants.deprecated = FALSE
+GROUP BY outer_variants.id, outer_variants.name, features.id, features.name

From ee87dcda1276f5f9e8fd33fff69cf1c859464994 Mon Sep 17 00:00:00 2001
From: Susanna Kiwala <susanna.kiwala@wustl.edu>
Date: Mon, 18 Dec 2023 11:00:20 -0600
Subject: [PATCH 013/125] Update Feature to be an event subject

---
 .../src/app/generated/civic.apollo-helpers.ts |   3 +-
 client/src/app/generated/civic.apollo.ts      |  71 ++++++----
 .../src/app/generated/civic.possible-types.ts |   1 +
 client/src/app/generated/server.model.graphql |  35 ++++-
 client/src/app/generated/server.schema.json   | 129 +++++++++++++++++-
 .../graphql/types/entities/feature_type.rb    |   1 +
 .../app/graphql/types/entities/gene_type.rb   |   1 -
 .../graphql/types/interfaces/event_subject.rb |   2 +
 8 files changed, 209 insertions(+), 34 deletions(-)

diff --git a/client/src/app/generated/civic.apollo-helpers.ts b/client/src/app/generated/civic.apollo-helpers.ts
index e580fa853..ac7248097 100644
--- a/client/src/app/generated/civic.apollo-helpers.ts
+++ b/client/src/app/generated/civic.apollo-helpers.ts
@@ -812,9 +812,10 @@ export type FdaCodeFieldPolicy = {
 	code?: FieldPolicy<any> | FieldReadFunction<any>,
 	description?: FieldPolicy<any> | FieldReadFunction<any>
 };
-export type FeatureKeySpecifier = ('description' | 'featureAliases' | 'featureInstance' | 'flagged' | 'flags' | 'id' | 'link' | 'name' | 'sources' | 'variants' | FeatureKeySpecifier)[];
+export type FeatureKeySpecifier = ('description' | 'events' | 'featureAliases' | 'featureInstance' | 'flagged' | 'flags' | 'id' | 'link' | 'name' | 'sources' | 'variants' | FeatureKeySpecifier)[];
 export type FeatureFieldPolicy = {
 	description?: FieldPolicy<any> | FieldReadFunction<any>,
+	events?: FieldPolicy<any> | FieldReadFunction<any>,
 	featureAliases?: FieldPolicy<any> | FieldReadFunction<any>,
 	featureInstance?: FieldPolicy<any> | FieldReadFunction<any>,
 	flagged?: FieldPolicy<any> | FieldReadFunction<any>,
diff --git a/client/src/app/generated/civic.apollo.ts b/client/src/app/generated/civic.apollo.ts
index 388569e6d..299fa5274 100644
--- a/client/src/app/generated/civic.apollo.ts
+++ b/client/src/app/generated/civic.apollo.ts
@@ -1840,9 +1840,11 @@ export type FdaCode = {
 };
 
 /** The Feature that a Variant can belong to */
-export type Feature = Flaggable & {
+export type Feature = EventSubject & Flaggable & {
   __typename: 'Feature';
   description: Scalars['String'];
+  /** List and filter events for an object */
+  events: EventConnection;
   featureAliases: Array<Scalars['String']>;
   featureInstance: FeatureInstance;
   flagged: Scalars['Boolean'];
@@ -1857,6 +1859,19 @@ export type Feature = Flaggable & {
 };
 
 
+/** The Feature that a Variant can belong to */
+export type FeatureEventsArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  eventType?: InputMaybe<EventAction>;
+  first?: InputMaybe<Scalars['Int']>;
+  last?: InputMaybe<Scalars['Int']>;
+  organizationId?: InputMaybe<Scalars['Int']>;
+  originatingUserId?: InputMaybe<Scalars['Int']>;
+  sortBy?: InputMaybe<DateSort>;
+};
+
+
 /** The Feature that a Variant can belong to */
 export type FeatureFlagsArgs = {
   after?: InputMaybe<Scalars['String']>;
@@ -6013,41 +6028,41 @@ export type ActivityFeedQueryVariables = Exact<{
 }>;
 
 
-export type ActivityFeedQuery = { __typename: 'Query', activities: { __typename: 'ActivityInterfaceConnection', pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, edges: Array<{ __typename: 'ActivityInterfaceEdge', cursor: string, node?: { __typename: 'AcceptRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CommentActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CreateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CreateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'DeprecateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'DeprecateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'FlagEntityActivity', id: number, verbiage: string, createdAt: any, flag: { __typename: 'Flag', id: number, name: string, link: string }, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ModerateAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ModerateEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'RejectRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ResolveFlagActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SubmitAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SubmitEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SuggestRevisionSetActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SuggestSourceActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'UpdateSourceSuggestionStatusActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | undefined }> } };
+export type ActivityFeedQuery = { __typename: 'Query', activities: { __typename: 'ActivityInterfaceConnection', pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, edges: Array<{ __typename: 'ActivityInterfaceEdge', cursor: string, node?: { __typename: 'AcceptRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CommentActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CreateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CreateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'DeprecateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'DeprecateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'FlagEntityActivity', id: number, verbiage: string, createdAt: any, flag: { __typename: 'Flag', id: number, name: string, link: string }, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ModerateAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ModerateEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'RejectRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ResolveFlagActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SubmitAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SubmitEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SuggestRevisionSetActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SuggestSourceActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'UpdateSourceSuggestionStatusActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | undefined }> } };
 
-export type ActivityFeedFragment = { __typename: 'ActivityInterfaceConnection', pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, edges: Array<{ __typename: 'ActivityInterfaceEdge', cursor: string, node?: { __typename: 'AcceptRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CommentActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CreateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CreateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'DeprecateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'DeprecateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'FlagEntityActivity', id: number, verbiage: string, createdAt: any, flag: { __typename: 'Flag', id: number, name: string, link: string }, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ModerateAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ModerateEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'RejectRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ResolveFlagActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SubmitAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SubmitEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SuggestRevisionSetActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SuggestSourceActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'UpdateSourceSuggestionStatusActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | undefined }> };
+export type ActivityFeedFragment = { __typename: 'ActivityInterfaceConnection', pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, edges: Array<{ __typename: 'ActivityInterfaceEdge', cursor: string, node?: { __typename: 'AcceptRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CommentActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CreateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CreateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'DeprecateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'DeprecateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'FlagEntityActivity', id: number, verbiage: string, createdAt: any, flag: { __typename: 'Flag', id: number, name: string, link: string }, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ModerateAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ModerateEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'RejectRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ResolveFlagActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SubmitAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SubmitEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SuggestRevisionSetActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SuggestSourceActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'UpdateSourceSuggestionStatusActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | undefined }> };
 
-type ActivityFeedNode_AcceptRevisionsActivity_Fragment = { __typename: 'AcceptRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_AcceptRevisionsActivity_Fragment = { __typename: 'AcceptRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_CommentActivity_Fragment = { __typename: 'CommentActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_CommentActivity_Fragment = { __typename: 'CommentActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_CreateComplexMolecularProfileActivity_Fragment = { __typename: 'CreateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_CreateComplexMolecularProfileActivity_Fragment = { __typename: 'CreateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_CreateVariantActivity_Fragment = { __typename: 'CreateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_CreateVariantActivity_Fragment = { __typename: 'CreateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_DeprecateComplexMolecularProfileActivity_Fragment = { __typename: 'DeprecateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_DeprecateComplexMolecularProfileActivity_Fragment = { __typename: 'DeprecateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_DeprecateVariantActivity_Fragment = { __typename: 'DeprecateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_DeprecateVariantActivity_Fragment = { __typename: 'DeprecateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_FlagEntityActivity_Fragment = { __typename: 'FlagEntityActivity', id: number, verbiage: string, createdAt: any, flag: { __typename: 'Flag', id: number, name: string, link: string }, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_FlagEntityActivity_Fragment = { __typename: 'FlagEntityActivity', id: number, verbiage: string, createdAt: any, flag: { __typename: 'Flag', id: number, name: string, link: string }, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_ModerateAssertionActivity_Fragment = { __typename: 'ModerateAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_ModerateAssertionActivity_Fragment = { __typename: 'ModerateAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_ModerateEvidenceItemActivity_Fragment = { __typename: 'ModerateEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_ModerateEvidenceItemActivity_Fragment = { __typename: 'ModerateEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_RejectRevisionsActivity_Fragment = { __typename: 'RejectRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_RejectRevisionsActivity_Fragment = { __typename: 'RejectRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_ResolveFlagActivity_Fragment = { __typename: 'ResolveFlagActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_ResolveFlagActivity_Fragment = { __typename: 'ResolveFlagActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_SubmitAssertionActivity_Fragment = { __typename: 'SubmitAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_SubmitAssertionActivity_Fragment = { __typename: 'SubmitAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_SubmitEvidenceItemActivity_Fragment = { __typename: 'SubmitEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_SubmitEvidenceItemActivity_Fragment = { __typename: 'SubmitEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_SuggestRevisionSetActivity_Fragment = { __typename: 'SuggestRevisionSetActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_SuggestRevisionSetActivity_Fragment = { __typename: 'SuggestRevisionSetActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_SuggestSourceActivity_Fragment = { __typename: 'SuggestSourceActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_SuggestSourceActivity_Fragment = { __typename: 'SuggestSourceActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_UpdateSourceSuggestionStatusActivity_Fragment = { __typename: 'UpdateSourceSuggestionStatusActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_UpdateSourceSuggestionStatusActivity_Fragment = { __typename: 'UpdateSourceSuggestionStatusActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
 export type ActivityFeedNodeFragment = ActivityFeedNode_AcceptRevisionsActivity_Fragment | ActivityFeedNode_CommentActivity_Fragment | ActivityFeedNode_CreateComplexMolecularProfileActivity_Fragment | ActivityFeedNode_CreateVariantActivity_Fragment | ActivityFeedNode_DeprecateComplexMolecularProfileActivity_Fragment | ActivityFeedNode_DeprecateVariantActivity_Fragment | ActivityFeedNode_FlagEntityActivity_Fragment | ActivityFeedNode_ModerateAssertionActivity_Fragment | ActivityFeedNode_ModerateEvidenceItemActivity_Fragment | ActivityFeedNode_RejectRevisionsActivity_Fragment | ActivityFeedNode_ResolveFlagActivity_Fragment | ActivityFeedNode_SubmitAssertionActivity_Fragment | ActivityFeedNode_SubmitEvidenceItemActivity_Fragment | ActivityFeedNode_SuggestRevisionSetActivity_Fragment | ActivityFeedNode_SuggestSourceActivity_Fragment | ActivityFeedNode_UpdateSourceSuggestionStatusActivity_Fragment;
 
@@ -6204,11 +6219,11 @@ export type EventFeedQueryVariables = Exact<{
 }>;
 
 
-export type EventFeedQuery = { __typename: 'Query', events: { __typename: 'EventConnection', eventTypes?: Array<EventAction>, unfilteredCount: number, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, uniqueParticipants?: Array<{ __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined }>, participatingOrganizations?: Array<{ __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined }>, edges: Array<{ __typename: 'EventEdge', cursor: string, node?: { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined } | undefined }> } };
+export type EventFeedQuery = { __typename: 'Query', events: { __typename: 'EventConnection', eventTypes?: Array<EventAction>, unfilteredCount: number, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, uniqueParticipants?: Array<{ __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined }>, participatingOrganizations?: Array<{ __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined }>, edges: Array<{ __typename: 'EventEdge', cursor: string, node?: { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined } | undefined }> } };
 
-export type EventFeedFragment = { __typename: 'EventConnection', eventTypes?: Array<EventAction>, unfilteredCount: number, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, uniqueParticipants?: Array<{ __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined }>, participatingOrganizations?: Array<{ __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined }>, edges: Array<{ __typename: 'EventEdge', cursor: string, node?: { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined } | undefined }> };
+export type EventFeedFragment = { __typename: 'EventConnection', eventTypes?: Array<EventAction>, unfilteredCount: number, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, uniqueParticipants?: Array<{ __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined }>, participatingOrganizations?: Array<{ __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined }>, edges: Array<{ __typename: 'EventEdge', cursor: string, node?: { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined } | undefined }> };
 
-export type EventFeedNodeFragment = { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined };
+export type EventFeedNodeFragment = { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined };
 
 export type EvidencePopoverQueryVariables = Exact<{
   evidenceId: Scalars['Int'];
@@ -6510,9 +6525,9 @@ export type RevisionPopoverQueryVariables = Exact<{
 }>;
 
 
-export type RevisionPopoverQuery = { __typename: 'Query', revision?: { __typename: 'Revision', id: number, name: string, link: string, status: RevisionStatus, createdAt: any, creationActivity?: { __typename: 'SuggestRevisionSetActivity', user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, subject: { __typename: 'Assertion', id: number, link: string, name: string } | { __typename: 'EvidenceItem', id: number, link: string, name: string } | { __typename: 'Flag', id: number, link: string, name: string } | { __typename: 'Gene', id: number, link: string, name: string } | { __typename: 'MolecularProfile', id: number, link: string, name: string } | { __typename: 'Revision', id: number, link: string, name: string } | { __typename: 'RevisionSet', id: number, link: string, name: string } | { __typename: 'Source', id: number, link: string, name: string } | { __typename: 'SourcePopover', id: number, link: string, name: string } | { __typename: 'SourceSuggestion', id: number, link: string, name: string } | { __typename: 'Variant', id: number, link: string, name: string } | { __typename: 'VariantGroup', id: number, link: string, name: string }, linkoutData: { __typename: 'LinkoutData', name: string } } | undefined };
+export type RevisionPopoverQuery = { __typename: 'Query', revision?: { __typename: 'Revision', id: number, name: string, link: string, status: RevisionStatus, createdAt: any, creationActivity?: { __typename: 'SuggestRevisionSetActivity', user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, subject: { __typename: 'Assertion', id: number, link: string, name: string } | { __typename: 'EvidenceItem', id: number, link: string, name: string } | { __typename: 'Feature', id: number, link: string, name: string } | { __typename: 'Flag', id: number, link: string, name: string } | { __typename: 'Gene', id: number, link: string, name: string } | { __typename: 'MolecularProfile', id: number, link: string, name: string } | { __typename: 'Revision', id: number, link: string, name: string } | { __typename: 'RevisionSet', id: number, link: string, name: string } | { __typename: 'Source', id: number, link: string, name: string } | { __typename: 'SourcePopover', id: number, link: string, name: string } | { __typename: 'SourceSuggestion', id: number, link: string, name: string } | { __typename: 'Variant', id: number, link: string, name: string } | { __typename: 'VariantGroup', id: number, link: string, name: string }, linkoutData: { __typename: 'LinkoutData', name: string } } | undefined };
 
-export type RevisionPopoverFragment = { __typename: 'Revision', id: number, name: string, link: string, status: RevisionStatus, createdAt: any, creationActivity?: { __typename: 'SuggestRevisionSetActivity', user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, subject: { __typename: 'Assertion', id: number, link: string, name: string } | { __typename: 'EvidenceItem', id: number, link: string, name: string } | { __typename: 'Flag', id: number, link: string, name: string } | { __typename: 'Gene', id: number, link: string, name: string } | { __typename: 'MolecularProfile', id: number, link: string, name: string } | { __typename: 'Revision', id: number, link: string, name: string } | { __typename: 'RevisionSet', id: number, link: string, name: string } | { __typename: 'Source', id: number, link: string, name: string } | { __typename: 'SourcePopover', id: number, link: string, name: string } | { __typename: 'SourceSuggestion', id: number, link: string, name: string } | { __typename: 'Variant', id: number, link: string, name: string } | { __typename: 'VariantGroup', id: number, link: string, name: string }, linkoutData: { __typename: 'LinkoutData', name: string } };
+export type RevisionPopoverFragment = { __typename: 'Revision', id: number, name: string, link: string, status: RevisionStatus, createdAt: any, creationActivity?: { __typename: 'SuggestRevisionSetActivity', user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, subject: { __typename: 'Assertion', id: number, link: string, name: string } | { __typename: 'EvidenceItem', id: number, link: string, name: string } | { __typename: 'Feature', id: number, link: string, name: string } | { __typename: 'Flag', id: number, link: string, name: string } | { __typename: 'Gene', id: number, link: string, name: string } | { __typename: 'MolecularProfile', id: number, link: string, name: string } | { __typename: 'Revision', id: number, link: string, name: string } | { __typename: 'RevisionSet', id: number, link: string, name: string } | { __typename: 'Source', id: number, link: string, name: string } | { __typename: 'SourcePopover', id: number, link: string, name: string } | { __typename: 'SourceSuggestion', id: number, link: string, name: string } | { __typename: 'Variant', id: number, link: string, name: string } | { __typename: 'VariantGroup', id: number, link: string, name: string }, linkoutData: { __typename: 'LinkoutData', name: string } };
 
 export type RevisionsQueryVariables = Exact<{
   subject?: InputMaybe<ModeratedInput>;
@@ -7735,22 +7750,22 @@ export type UserNotificationsQueryVariables = Exact<{
 }>;
 
 
-export type UserNotificationsQuery = { __typename: 'Query', notifications: { __typename: 'NotificationConnection', eventTypes: Array<EventAction>, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, notificationSubjects: Array<{ __typename: 'EventSubjectWithCount', occuranceCount: number, subject?: { __typename: 'Assertion', id: number, name: string } | { __typename: 'EvidenceItem', id: number, name: string } | { __typename: 'Flag', id: number, name: string } | { __typename: 'Gene', id: number, name: string } | { __typename: 'MolecularProfile', id: number, name: string } | { __typename: 'Revision', id: number, name: string } | { __typename: 'RevisionSet', id: number, name: string } | { __typename: 'Source', id: number, name: string } | { __typename: 'SourcePopover', id: number, name: string } | { __typename: 'SourceSuggestion', id: number, name: string } | { __typename: 'Variant', id: number, name: string } | { __typename: 'VariantGroup', id: number, name: string } | undefined }>, originatingUsers: Array<{ __typename: 'User', id: number, displayName: string }>, organizations: Array<{ __typename: 'Organization', id: number, name: string }>, edges: Array<{ __typename: 'NotificationEdge', node?: { __typename: 'Notification', id: number, type: NotificationReason, seen: boolean, event: { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined }, subscription?: { __typename: 'Subscription', id: number, subscribable: { __typename: 'Assertion', id: number, name: string } | { __typename: 'EvidenceItem', id: number, name: string } | { __typename: 'Flag', id: number, name: string } | { __typename: 'Gene', id: number, name: string } | { __typename: 'MolecularProfile', id: number, name: string } | { __typename: 'Revision', id: number, name: string } | { __typename: 'RevisionSet', id: number, name: string } | { __typename: 'Source', id: number, name: string } | { __typename: 'SourcePopover', id: number, name: string } | { __typename: 'SourceSuggestion', id: number, name: string } | { __typename: 'Variant', id: number, name: string } | { __typename: 'VariantGroup', id: number, name: string } } | undefined } | undefined }> } };
+export type UserNotificationsQuery = { __typename: 'Query', notifications: { __typename: 'NotificationConnection', eventTypes: Array<EventAction>, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, notificationSubjects: Array<{ __typename: 'EventSubjectWithCount', occuranceCount: number, subject?: { __typename: 'Assertion', id: number, name: string } | { __typename: 'EvidenceItem', id: number, name: string } | { __typename: 'Feature', id: number, name: string } | { __typename: 'Flag', id: number, name: string } | { __typename: 'Gene', id: number, name: string } | { __typename: 'MolecularProfile', id: number, name: string } | { __typename: 'Revision', id: number, name: string } | { __typename: 'RevisionSet', id: number, name: string } | { __typename: 'Source', id: number, name: string } | { __typename: 'SourcePopover', id: number, name: string } | { __typename: 'SourceSuggestion', id: number, name: string } | { __typename: 'Variant', id: number, name: string } | { __typename: 'VariantGroup', id: number, name: string } | undefined }>, originatingUsers: Array<{ __typename: 'User', id: number, displayName: string }>, organizations: Array<{ __typename: 'Organization', id: number, name: string }>, edges: Array<{ __typename: 'NotificationEdge', node?: { __typename: 'Notification', id: number, type: NotificationReason, seen: boolean, event: { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined }, subscription?: { __typename: 'Subscription', id: number, subscribable: { __typename: 'Assertion', id: number, name: string } | { __typename: 'EvidenceItem', id: number, name: string } | { __typename: 'Feature', id: number, name: string } | { __typename: 'Flag', id: number, name: string } | { __typename: 'Gene', id: number, name: string } | { __typename: 'MolecularProfile', id: number, name: string } | { __typename: 'Revision', id: number, name: string } | { __typename: 'RevisionSet', id: number, name: string } | { __typename: 'Source', id: number, name: string } | { __typename: 'SourcePopover', id: number, name: string } | { __typename: 'SourceSuggestion', id: number, name: string } | { __typename: 'Variant', id: number, name: string } | { __typename: 'VariantGroup', id: number, name: string } } | undefined } | undefined }> } };
 
 export type NotificationOrganizationFragment = { __typename: 'Organization', id: number, name: string };
 
 export type NotificationOriginatingUsersFragment = { __typename: 'User', id: number, displayName: string };
 
-export type NotificationFeedSubjectsFragment = { __typename: 'EventSubjectWithCount', occuranceCount: number, subject?: { __typename: 'Assertion', id: number, name: string } | { __typename: 'EvidenceItem', id: number, name: string } | { __typename: 'Flag', id: number, name: string } | { __typename: 'Gene', id: number, name: string } | { __typename: 'MolecularProfile', id: number, name: string } | { __typename: 'Revision', id: number, name: string } | { __typename: 'RevisionSet', id: number, name: string } | { __typename: 'Source', id: number, name: string } | { __typename: 'SourcePopover', id: number, name: string } | { __typename: 'SourceSuggestion', id: number, name: string } | { __typename: 'Variant', id: number, name: string } | { __typename: 'VariantGroup', id: number, name: string } | undefined };
+export type NotificationFeedSubjectsFragment = { __typename: 'EventSubjectWithCount', occuranceCount: number, subject?: { __typename: 'Assertion', id: number, name: string } | { __typename: 'EvidenceItem', id: number, name: string } | { __typename: 'Feature', id: number, name: string } | { __typename: 'Flag', id: number, name: string } | { __typename: 'Gene', id: number, name: string } | { __typename: 'MolecularProfile', id: number, name: string } | { __typename: 'Revision', id: number, name: string } | { __typename: 'RevisionSet', id: number, name: string } | { __typename: 'Source', id: number, name: string } | { __typename: 'SourcePopover', id: number, name: string } | { __typename: 'SourceSuggestion', id: number, name: string } | { __typename: 'Variant', id: number, name: string } | { __typename: 'VariantGroup', id: number, name: string } | undefined };
 
-export type NotificationNodeFragment = { __typename: 'Notification', id: number, type: NotificationReason, seen: boolean, event: { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined }, subscription?: { __typename: 'Subscription', id: number, subscribable: { __typename: 'Assertion', id: number, name: string } | { __typename: 'EvidenceItem', id: number, name: string } | { __typename: 'Flag', id: number, name: string } | { __typename: 'Gene', id: number, name: string } | { __typename: 'MolecularProfile', id: number, name: string } | { __typename: 'Revision', id: number, name: string } | { __typename: 'RevisionSet', id: number, name: string } | { __typename: 'Source', id: number, name: string } | { __typename: 'SourcePopover', id: number, name: string } | { __typename: 'SourceSuggestion', id: number, name: string } | { __typename: 'Variant', id: number, name: string } | { __typename: 'VariantGroup', id: number, name: string } } | undefined };
+export type NotificationNodeFragment = { __typename: 'Notification', id: number, type: NotificationReason, seen: boolean, event: { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined }, subscription?: { __typename: 'Subscription', id: number, subscribable: { __typename: 'Assertion', id: number, name: string } | { __typename: 'EvidenceItem', id: number, name: string } | { __typename: 'Feature', id: number, name: string } | { __typename: 'Flag', id: number, name: string } | { __typename: 'Gene', id: number, name: string } | { __typename: 'MolecularProfile', id: number, name: string } | { __typename: 'Revision', id: number, name: string } | { __typename: 'RevisionSet', id: number, name: string } | { __typename: 'Source', id: number, name: string } | { __typename: 'SourcePopover', id: number, name: string } | { __typename: 'SourceSuggestion', id: number, name: string } | { __typename: 'Variant', id: number, name: string } | { __typename: 'VariantGroup', id: number, name: string } } | undefined };
 
 export type UpdateNotificationStatusMutationVariables = Exact<{
   input: UpdateNotificationStatusInput;
 }>;
 
 
-export type UpdateNotificationStatusMutation = { __typename: 'Mutation', updateNotificationStatus?: { __typename: 'UpdateNotificationStatusPayload', notifications: Array<{ __typename: 'Notification', id: number, type: NotificationReason, seen: boolean, event: { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined }, subscription?: { __typename: 'Subscription', id: number, subscribable: { __typename: 'Assertion', id: number, name: string } | { __typename: 'EvidenceItem', id: number, name: string } | { __typename: 'Flag', id: number, name: string } | { __typename: 'Gene', id: number, name: string } | { __typename: 'MolecularProfile', id: number, name: string } | { __typename: 'Revision', id: number, name: string } | { __typename: 'RevisionSet', id: number, name: string } | { __typename: 'Source', id: number, name: string } | { __typename: 'SourcePopover', id: number, name: string } | { __typename: 'SourceSuggestion', id: number, name: string } | { __typename: 'Variant', id: number, name: string } | { __typename: 'VariantGroup', id: number, name: string } } | undefined }> } | undefined };
+export type UpdateNotificationStatusMutation = { __typename: 'Mutation', updateNotificationStatus?: { __typename: 'UpdateNotificationStatusPayload', notifications: Array<{ __typename: 'Notification', id: number, type: NotificationReason, seen: boolean, event: { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined }, subscription?: { __typename: 'Subscription', id: number, subscribable: { __typename: 'Assertion', id: number, name: string } | { __typename: 'EvidenceItem', id: number, name: string } | { __typename: 'Feature', id: number, name: string } | { __typename: 'Flag', id: number, name: string } | { __typename: 'Gene', id: number, name: string } | { __typename: 'MolecularProfile', id: number, name: string } | { __typename: 'Revision', id: number, name: string } | { __typename: 'RevisionSet', id: number, name: string } | { __typename: 'Source', id: number, name: string } | { __typename: 'SourcePopover', id: number, name: string } | { __typename: 'SourceSuggestion', id: number, name: string } | { __typename: 'Variant', id: number, name: string } | { __typename: 'VariantGroup', id: number, name: string } } | undefined }> } | undefined };
 
 export type UnsubscribeMutationVariables = Exact<{
   input: UnsubscribeInput;
diff --git a/client/src/app/generated/civic.possible-types.ts b/client/src/app/generated/civic.possible-types.ts
index 5b1a08385..38586e564 100644
--- a/client/src/app/generated/civic.possible-types.ts
+++ b/client/src/app/generated/civic.possible-types.ts
@@ -54,6 +54,7 @@
     "EventSubject": [
       "Assertion",
       "EvidenceItem",
+      "Feature",
       "Flag",
       "Gene",
       "MolecularProfile",
diff --git a/client/src/app/generated/server.model.graphql b/client/src/app/generated/server.model.graphql
index 1f7b472d0..a12e67cb6 100644
--- a/client/src/app/generated/server.model.graphql
+++ b/client/src/app/generated/server.model.graphql
@@ -2914,8 +2914,41 @@ type FdaCode {
 """
 The Feature that a Variant can belong to
 """
-type Feature implements Flaggable {
+type Feature implements EventSubject & Flaggable {
   description: String!
+
+  """
+  List and filter events for an object
+  """
+  events(
+    """
+    Returns the elements in the list that come after the specified cursor.
+    """
+    after: String
+
+    """
+    Returns the elements in the list that come before the specified cursor.
+    """
+    before: String
+    eventType: EventAction
+
+    """
+    Returns the first _n_ elements from the list.
+    """
+    first: Int
+
+    """
+    Returns the last _n_ elements from the list.
+    """
+    last: Int
+    organizationId: Int
+    originatingUserId: Int
+
+    """
+    Sort order for the events. Defaults to most recent.
+    """
+    sortBy: DateSort
+  ): EventConnection!
   featureAliases: [String!]!
   featureInstance: FeatureInstance!
   flagged: Boolean!
diff --git a/client/src/app/generated/server.schema.json b/client/src/app/generated/server.schema.json
index ae77dca87..542aff2e8 100644
--- a/client/src/app/generated/server.schema.json
+++ b/client/src/app/generated/server.schema.json
@@ -12471,6 +12471,11 @@
               "name": "EvidenceItem",
               "ofType": null
             },
+            {
+              "kind": "OBJECT",
+              "name": "Feature",
+              "ofType": null
+            },
             {
               "kind": "OBJECT",
               "name": "Flag",
@@ -14592,6 +14597,119 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "events",
+              "description": "List and filter events for an object",
+              "args": [
+                {
+                  "name": "eventType",
+                  "description": null,
+                  "type": {
+                    "kind": "ENUM",
+                    "name": "EventAction",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "originatingUserId",
+                  "description": null,
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "organizationId",
+                  "description": null,
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "sortBy",
+                  "description": "Sort order for the events. Defaults to most recent.",
+                  "type": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "DateSort",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "after",
+                  "description": "Returns the elements in the list that come after the specified cursor.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "before",
+                  "description": "Returns the elements in the list that come before the specified cursor.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "first",
+                  "description": "Returns the first _n_ elements from the list.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "last",
+                  "description": "Returns the last _n_ elements from the list.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                }
+              ],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "EventConnection",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "featureAliases",
               "description": null,
@@ -14917,6 +15035,11 @@
               "kind": "INTERFACE",
               "name": "Flaggable",
               "ofType": null
+            },
+            {
+              "kind": "INTERFACE",
+              "name": "EventSubject",
+              "ofType": null
             }
           ],
           "enumValues": null,
@@ -17204,17 +17327,17 @@
             },
             {
               "kind": "INTERFACE",
-              "name": "EventSubject",
+              "name": "MolecularProfileComponent",
               "ofType": null
             },
             {
               "kind": "INTERFACE",
-              "name": "MolecularProfileComponent",
+              "name": "Flaggable",
               "ofType": null
             },
             {
               "kind": "INTERFACE",
-              "name": "Flaggable",
+              "name": "EventSubject",
               "ofType": null
             }
           ],
diff --git a/server/app/graphql/types/entities/feature_type.rb b/server/app/graphql/types/entities/feature_type.rb
index 5cf168725..40cd6129d 100644
--- a/server/app/graphql/types/entities/feature_type.rb
+++ b/server/app/graphql/types/entities/feature_type.rb
@@ -1,6 +1,7 @@
 module Types::Entities
   class FeatureType < Types::BaseObject
     implements Types::Interfaces::Flaggable
+    implements Types::Interfaces::EventSubject
 
     description 'The Feature that a Variant can belong to'
 
diff --git a/server/app/graphql/types/entities/gene_type.rb b/server/app/graphql/types/entities/gene_type.rb
index 255369e73..5fb76f4cd 100644
--- a/server/app/graphql/types/entities/gene_type.rb
+++ b/server/app/graphql/types/entities/gene_type.rb
@@ -2,7 +2,6 @@ module Types::Entities
   class GeneType < Types::Entities::FeatureType
     implements Types::Interfaces::Commentable
     implements Types::Interfaces::WithRevisions
-    implements Types::Interfaces::EventSubject
     implements Types::Interfaces::MolecularProfileComponent
 
     field :entrez_id, Int, null: false
diff --git a/server/app/graphql/types/interfaces/event_subject.rb b/server/app/graphql/types/interfaces/event_subject.rb
index db380f41d..731946cbb 100644
--- a/server/app/graphql/types/interfaces/event_subject.rb
+++ b/server/app/graphql/types/interfaces/event_subject.rb
@@ -15,6 +15,8 @@ def resolve_type(object, context)
         case object
         when Features::Gene
           Types::Entities::GeneType
+        when Feature
+          Types::Entities::FeatureType
         when Variant
           Types::Entities::VariantType
         when EvidenceItem

From 01ceab3ec551603b2347c1ec95ec78460b6c05fa Mon Sep 17 00:00:00 2001
From: Susanna Kiwala <susanna.kiwala@wustl.edu>
Date: Mon, 18 Dec 2023 11:31:49 -0600
Subject: [PATCH 014/125] Get comments working for Features

---
 client/src/app/generated/civic.apollo.ts                   | 2 +-
 client/src/app/generated/server.model.graphql              | 2 +-
 client/src/app/generated/server.schema.json                | 2 +-
 .../features-comments/features-comments.page.ts            | 6 +++---
 .../genes-detail/genes-comments/genes-comments.page.ts     | 2 +-
 .../graphql/types/commentable/commentable_entities_type.rb | 2 +-
 server/app/graphql/types/commentable/commentable_input.rb  | 4 ++--
 server/app/models/concerns/is_feature_instance.rb          | 3 +++
 server/app/models/event_hierarchy.rb                       | 3 +--
 server/app/models/feature.rb                               | 1 +
 server/app/models/features/gene.rb                         | 1 -
 server/misc_scripts/features/backfill_feature_comments.rb  | 7 +++++++
 12 files changed, 22 insertions(+), 13 deletions(-)
 create mode 100644 server/misc_scripts/features/backfill_feature_comments.rb

diff --git a/client/src/app/generated/civic.apollo.ts b/client/src/app/generated/civic.apollo.ts
index 299fa5274..c616a9c6f 100644
--- a/client/src/app/generated/civic.apollo.ts
+++ b/client/src/app/generated/civic.apollo.ts
@@ -1122,7 +1122,7 @@ export type CommentableCommentsArgs = {
 export enum CommentableEntities {
   Assertion = 'ASSERTION',
   EvidenceItem = 'EVIDENCE_ITEM',
-  Gene = 'GENE',
+  Feature = 'FEATURE',
   MolecularProfile = 'MOLECULAR_PROFILE',
   Source = 'SOURCE',
   Variant = 'VARIANT',
diff --git a/client/src/app/generated/server.model.graphql b/client/src/app/generated/server.model.graphql
index a12e67cb6..f15983807 100644
--- a/client/src/app/generated/server.model.graphql
+++ b/client/src/app/generated/server.model.graphql
@@ -1840,7 +1840,7 @@ interface Commentable {
 enum CommentableEntities {
   ASSERTION
   EVIDENCE_ITEM
-  GENE
+  FEATURE
   MOLECULAR_PROFILE
   SOURCE
   VARIANT
diff --git a/client/src/app/generated/server.schema.json b/client/src/app/generated/server.schema.json
index 542aff2e8..c16fcb5db 100644
--- a/client/src/app/generated/server.schema.json
+++ b/client/src/app/generated/server.schema.json
@@ -9134,7 +9134,7 @@
           "interfaces": null,
           "enumValues": [
             {
-              "name": "GENE",
+              "name": "FEATURE",
               "description": null,
               "isDeprecated": false,
               "deprecationReason": null
diff --git a/client/src/app/views/features/features-detail/features-comments/features-comments.page.ts b/client/src/app/views/features/features-detail/features-comments/features-comments.page.ts
index 60c87000f..2a5c4877d 100644
--- a/client/src/app/views/features/features-detail/features-comments/features-comments.page.ts
+++ b/client/src/app/views/features/features-detail/features-comments/features-comments.page.ts
@@ -14,10 +14,10 @@ export class FeaturesCommentsPage {
   commentable: CommentableInput
 
   constructor(private route: ActivatedRoute) {
-    const geneId: number = +this.route.snapshot.params['featureId']
+    const featureId: number = +this.route.snapshot.params['featureId']
     this.commentable = {
-      id: geneId,
-      entityType: CommentableEntities.Gene,
+      id: featureId,
+      entityType: CommentableEntities.Feature,
     }
   }
 }
diff --git a/client/src/app/views/genes/genes-detail/genes-comments/genes-comments.page.ts b/client/src/app/views/genes/genes-detail/genes-comments/genes-comments.page.ts
index 6dc0641d4..819450767 100644
--- a/client/src/app/views/genes/genes-detail/genes-comments/genes-comments.page.ts
+++ b/client/src/app/views/genes/genes-detail/genes-comments/genes-comments.page.ts
@@ -17,7 +17,7 @@ export class GenesCommentsPage {
     const geneId: number = +this.route.snapshot.params['geneId']
     this.commentable = {
       id: geneId,
-      entityType: CommentableEntities.Gene,
+      entityType: CommentableEntities.Feature,
     }
   }
 }
diff --git a/server/app/graphql/types/commentable/commentable_entities_type.rb b/server/app/graphql/types/commentable/commentable_entities_type.rb
index 12e84649d..a14ad9217 100644
--- a/server/app/graphql/types/commentable/commentable_entities_type.rb
+++ b/server/app/graphql/types/commentable/commentable_entities_type.rb
@@ -1,6 +1,6 @@
 module Types::Commentable
   class CommentableEntitiesType < Types::BaseEnum
-    value 'GENE'
+    value 'FEATURE'
     value 'VARIANT'
     value 'EVIDENCE_ITEM'
     value 'ASSERTION'
diff --git a/server/app/graphql/types/commentable/commentable_input.rb b/server/app/graphql/types/commentable/commentable_input.rb
index 2f9664299..2070b3710 100644
--- a/server/app/graphql/types/commentable/commentable_input.rb
+++ b/server/app/graphql/types/commentable/commentable_input.rb
@@ -9,8 +9,8 @@ class CommentableInput < Types::BaseInputObject
 
     def prepare
       const = case entity_type
-      when 'GENE'
-        Gene
+      when 'FEATURE'
+        Feature
       when 'VARIANT'
         Variant
       when 'EVIDENCE_ITEM'
diff --git a/server/app/models/concerns/is_feature_instance.rb b/server/app/models/concerns/is_feature_instance.rb
index 666c2a1d5..bc833071b 100644
--- a/server/app/models/concerns/is_feature_instance.rb
+++ b/server/app/models/concerns/is_feature_instance.rb
@@ -13,5 +13,8 @@ module IsFeatureInstance
     delegate :flagged, to: :feature
     delegate :flags, to: :feature
     delegate :most_recent_flag, to: :feature
+
+    delegate :comments, to: :feature
+    delegate :last_comment_event, to: :feature
   end
 end
diff --git a/server/app/models/event_hierarchy.rb b/server/app/models/event_hierarchy.rb
index eb800cd47..85ae4db57 100644
--- a/server/app/models/event_hierarchy.rb
+++ b/server/app/models/event_hierarchy.rb
@@ -23,10 +23,9 @@ def self.hierarchy
       @hierarchy
     else
       hierarchy = {
-        Gene => {
+        Feature => {
           children: [
             :variants,
-            :assertions
           ],
           direct_relations: [
             :revisions,
diff --git a/server/app/models/feature.rb b/server/app/models/feature.rb
index f239ee706..367799806 100644
--- a/server/app/models/feature.rb
+++ b/server/app/models/feature.rb
@@ -1,5 +1,6 @@
 class Feature < ApplicationRecord
   include Flaggable
+  include Commentable
   include Subscribable
 
   delegated_type :feature_instance, types: %w[ Features::Gene ]
diff --git a/server/app/models/features/gene.rb b/server/app/models/features/gene.rb
index bf2cd8250..5fe7c2575 100644
--- a/server/app/models/features/gene.rb
+++ b/server/app/models/features/gene.rb
@@ -2,7 +2,6 @@ module Features
   class Gene < ActiveRecord::Base
     include Moderated
     include Subscribable
-    include Commentable
     include WithTimepointCounts
     include IsFeatureInstance
 
diff --git a/server/misc_scripts/features/backfill_feature_comments.rb b/server/misc_scripts/features/backfill_feature_comments.rb
new file mode 100644
index 000000000..638a7e39b
--- /dev/null
+++ b/server/misc_scripts/features/backfill_feature_comments.rb
@@ -0,0 +1,7 @@
+Comment.where(commentable_type: 'Gene').find_each do |comment|
+  gene = Features::Gene.find(comment.commentable_id)
+  feature = gene.feature
+
+  comment.commentable = feature
+  comment.save!
+end

From 415b54f4a32a26f107ed1c8a57598cc668b82724 Mon Sep 17 00:00:00 2001
From: Susanna Kiwala <susanna.kiwala@wustl.edu>
Date: Mon, 18 Dec 2023 14:25:27 -0600
Subject: [PATCH 015/125] Update revisions to work with Features

---
 .../config/gene-revise/gene-revise.form.ts     | 18 +++++++++---------
 .../config/gene-revise/gene-revise.query.gql   |  6 +++---
 .../gene-revise-test.page.html                 |  2 +-
 client/src/app/generated/civic.apollo.ts       | 13 +++++++------
 client/src/app/generated/server.model.graphql  |  1 +
 client/src/app/generated/server.schema.json    |  6 ++++++
 .../features-revisions.page.html               |  2 +-
 .../features-revisions.page.ts                 |  6 +++---
 .../features-suggest.page.html                 |  6 +++---
 .../features-suggest/features-suggest.page.ts  |  4 ++--
 .../genes-suggest/genes-suggest.page.html      |  1 -
 .../graphql/mutations/suggest_gene_revision.rb | 10 ++++++----
 .../types/revisions/moderated_entities_type.rb |  1 +
 .../app/models/actions/suggest_revision_set.rb |  8 +++++++-
 .../models/activities/suggest_revision_set.rb  |  7 ++++++-
 .../app/models/concerns/is_feature_instance.rb |  8 ++++++++
 server/app/models/feature.rb                   |  1 +
 server/app/models/features/gene.rb             |  1 -
 .../input_adaptors/gene_input_adaptor.rb       |  6 ++++--
 .../features/backfill_feature_revisions.rb     |  7 +++++++
 20 files changed, 76 insertions(+), 38 deletions(-)
 create mode 100644 server/misc_scripts/features/backfill_feature_revisions.rb

diff --git a/client/src/app/forms/config/gene-revise/gene-revise.form.ts b/client/src/app/forms/config/gene-revise/gene-revise.form.ts
index cff5f3ed3..0d86a6b0f 100644
--- a/client/src/app/forms/config/gene-revise/gene-revise.form.ts
+++ b/client/src/app/forms/config/gene-revise/gene-revise.form.ts
@@ -23,7 +23,7 @@ import { geneReviseFields } from './gene-revise.form.config'
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class CvcGeneReviseForm implements OnInit, AfterViewInit {
-  @Input() geneId!: number
+  @Input() featureId!: number
   model?: GeneReviseModel
   form: UntypedFormGroup
   fields: FormlyFieldConfig[]
@@ -49,19 +49,19 @@ export class CvcGeneReviseForm implements OnInit, AfterViewInit {
   }
 
   ngOnInit() {
-    this.url = `/genes/${this.geneId}/revisions`
+    this.url = `/features/${this.featureId}/revisions`
   }
 
   ngAfterViewInit(): void {
     this.revisableFieldsGQL
-      .fetch({ geneId: this.geneId })
+      .fetch({ featureId: this.featureId })
       .pipe(untilDestroyed(this))
       .subscribe({
-        next: ({ data: { gene } }) => {
-          if (gene) {
+        next: ({ data: { feature } }) => {
+          if (feature) {
             this.model = {
-              id: gene.id,
-              fields: geneToModelFields(gene),
+              id: feature.id,
+              fields: geneToModelFields(feature),
             }
             this.cdr.detectChanges()
           }
@@ -76,8 +76,8 @@ export class CvcGeneReviseForm implements OnInit, AfterViewInit {
   }
 
   onSubmit(model: GeneReviseModel) {
-    if(!this.geneId) {return}
-    let input = geneFormModelToReviseInput(this.geneId, model)
+    if(!this.featureId) {return}
+    let input = geneFormModelToReviseInput(this.featureId, model)
     if (input) {
       this.mutationState = this.reviseEvidenceMutator.mutate(this.submitRevisionsGQL, { input: input})
     }
diff --git a/client/src/app/forms/config/gene-revise/gene-revise.query.gql b/client/src/app/forms/config/gene-revise/gene-revise.query.gql
index 23779b942..c5ff05ea9 100644
--- a/client/src/app/forms/config/gene-revise/gene-revise.query.gql
+++ b/client/src/app/forms/config/gene-revise/gene-revise.query.gql
@@ -1,10 +1,10 @@
-query GeneRevisableFields($geneId: Int!) {
-  gene(id: $geneId) {
+query GeneRevisableFields($featureId: Int!) {
+  feature(id: $featureId) {
     ...RevisableGeneFields
   }
 }
 
-fragment RevisableGeneFields on Gene {
+fragment RevisableGeneFields on Feature {
   id
   description
   sources {
diff --git a/client/src/app/forms/test-pages/gene-revise-test/gene-revise-test.page.html b/client/src/app/forms/test-pages/gene-revise-test/gene-revise-test.page.html
index b7728b52b..427b88a55 100644
--- a/client/src/app/forms/test-pages/gene-revise-test/gene-revise-test.page.html
+++ b/client/src/app/forms/test-pages/gene-revise-test/gene-revise-test.page.html
@@ -1 +1 @@
-<cvc-gene-revise-form [geneId]="6"></cvc-gene-revise-form>
\ No newline at end of file
+<cvc-gene-revise-form [featureId]="6"></cvc-gene-revise-form>
\ No newline at end of file
diff --git a/client/src/app/generated/civic.apollo.ts b/client/src/app/generated/civic.apollo.ts
index c616a9c6f..52553cbd3 100644
--- a/client/src/app/generated/civic.apollo.ts
+++ b/client/src/app/generated/civic.apollo.ts
@@ -2539,6 +2539,7 @@ export type ModerateEvidenceItemPayload = {
 export enum ModeratedEntities {
   Assertion = 'ASSERTION',
   EvidenceItem = 'EVIDENCE_ITEM',
+  Feature = 'FEATURE',
   Gene = 'GENE',
   MolecularProfile = 'MOLECULAR_PROFILE',
   Variant = 'VARIANT',
@@ -7076,13 +7077,13 @@ export type FullyCuratedSourceQueryVariables = Exact<{
 export type FullyCuratedSourceQuery = { __typename: 'Query', source?: { __typename: 'Source', fullyCurated: boolean } | undefined };
 
 export type GeneRevisableFieldsQueryVariables = Exact<{
-  geneId: Scalars['Int'];
+  featureId: Scalars['Int'];
 }>;
 
 
-export type GeneRevisableFieldsQuery = { __typename: 'Query', gene?: { __typename: 'Gene', id: number, description: string, sources: Array<{ __typename: 'Source', id: number, sourceType: SourceSource, citation?: string | undefined, citationId: string }> } | undefined };
+export type GeneRevisableFieldsQuery = { __typename: 'Query', feature?: { __typename: 'Feature', id: number, description: string, sources: Array<{ __typename: 'Source', id: number, sourceType: SourceSource, citation?: string | undefined, citationId: string }> } | undefined };
 
-export type RevisableGeneFieldsFragment = { __typename: 'Gene', id: number, description: string, sources: Array<{ __typename: 'Source', id: number, sourceType: SourceSource, citation?: string | undefined, citationId: string }> };
+export type RevisableGeneFieldsFragment = { __typename: 'Feature', id: number, description: string, sources: Array<{ __typename: 'Source', id: number, sourceType: SourceSource, citation?: string | undefined, citationId: string }> };
 
 export type SuggestGeneRevisionMutationVariables = Exact<{
   input: SuggestGeneRevisionInput;
@@ -9220,7 +9221,7 @@ export const SubmittableEvidenceFieldsFragmentDoc = gql`
 }
     `;
 export const RevisableGeneFieldsFragmentDoc = gql`
-    fragment RevisableGeneFields on Gene {
+    fragment RevisableGeneFields on Feature {
   id
   description
   sources {
@@ -13171,8 +13172,8 @@ export const FullyCuratedSourceDocument = gql`
     }
   }
 export const GeneRevisableFieldsDocument = gql`
-    query GeneRevisableFields($geneId: Int!) {
-  gene(id: $geneId) {
+    query GeneRevisableFields($featureId: Int!) {
+  feature(id: $featureId) {
     ...RevisableGeneFields
   }
 }
diff --git a/client/src/app/generated/server.model.graphql b/client/src/app/generated/server.model.graphql
index f15983807..03ab4fa4c 100644
--- a/client/src/app/generated/server.model.graphql
+++ b/client/src/app/generated/server.model.graphql
@@ -4128,6 +4128,7 @@ Enumeration of all moderated CIViC entities.
 enum ModeratedEntities {
   ASSERTION
   EVIDENCE_ITEM
+  FEATURE
   GENE
   MOLECULAR_PROFILE
   VARIANT
diff --git a/client/src/app/generated/server.schema.json b/client/src/app/generated/server.schema.json
index c16fcb5db..f52c07355 100644
--- a/client/src/app/generated/server.schema.json
+++ b/client/src/app/generated/server.schema.json
@@ -20077,6 +20077,12 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "FEATURE",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "VARIANT",
               "description": null,
diff --git a/client/src/app/views/features/features-detail/features-revisions/features-revisions.page.html b/client/src/app/views/features/features-detail/features-revisions/features-revisions.page.html
index 1452354c2..1062ee47f 100644
--- a/client/src/app/views/features/features-detail/features-revisions/features-revisions.page.html
+++ b/client/src/app/views/features/features-detail/features-revisions/features-revisions.page.html
@@ -1,3 +1,3 @@
 <cvc-revisions-list-and-filter
-  [id]="this.geneId"
+  [id]="this.featureId"
   [entityType]="this.entityType"></cvc-revisions-list-and-filter>
diff --git a/client/src/app/views/features/features-detail/features-revisions/features-revisions.page.ts b/client/src/app/views/features/features-detail/features-revisions/features-revisions.page.ts
index 6b297e431..c2d9f55ec 100644
--- a/client/src/app/views/features/features-detail/features-revisions/features-revisions.page.ts
+++ b/client/src/app/views/features/features-detail/features-revisions/features-revisions.page.ts
@@ -9,15 +9,15 @@ import { Subscription } from 'rxjs'
   styleUrls: ['./features-revisions.page.less'],
 })
 export class FeaturesRevisionsPage implements OnDestroy {
-  geneId!: number
+  featureId!: number
   entityType!: ModeratedEntities
 
   routeSub: Subscription
 
   constructor(private route: ActivatedRoute) {
     this.routeSub = this.route.params.subscribe((params) => {
-      this.geneId = +params.featureId
-      this.entityType = ModeratedEntities['Gene']
+      this.featureId = +params.featureId
+      this.entityType = ModeratedEntities.Feature
     })
   }
 
diff --git a/client/src/app/views/features/features-revise/features-suggest/features-suggest.page.html b/client/src/app/views/features/features-revise/features-suggest/features-suggest.page.html
index a0fb97f80..b64191d71 100644
--- a/client/src/app/views/features/features-revise/features-suggest/features-suggest.page.html
+++ b/client/src/app/views/features/features-revise/features-suggest/features-suggest.page.html
@@ -1,4 +1,4 @@
-<ng-container *ngIf="geneId; else loadingGene">
-  <cvc-gene-revise-form [geneId]="geneId"> </cvc-gene-revise-form>
+<ng-container *ngIf="featureId; else loadingGene">
+  <cvc-gene-revise-form [featureId]="featureId"> </cvc-gene-revise-form>
 </ng-container>
-<ng-template #loadingGene>Loading Gene...</ng-template>
+<ng-template #loadingGene>Loading Feature...</ng-template>
diff --git a/client/src/app/views/features/features-revise/features-suggest/features-suggest.page.ts b/client/src/app/views/features/features-revise/features-suggest/features-suggest.page.ts
index 36bc3f875..5971932b9 100644
--- a/client/src/app/views/features/features-revise/features-suggest/features-suggest.page.ts
+++ b/client/src/app/views/features/features-revise/features-suggest/features-suggest.page.ts
@@ -8,12 +8,12 @@ import { Subscription } from 'rxjs'
   styleUrls: ['./features-suggest.page.less'],
 })
 export class FeaturesSuggestPage implements OnDestroy {
-  geneId?: number
+  featureId?: number
   routeParams$: Subscription
 
   constructor(private route: ActivatedRoute) {
     this.routeParams$ = this.route.params.subscribe((params) => {
-      this.geneId = +params.featureId
+      this.featureId = +params.featureId
     })
   }
 
diff --git a/client/src/app/views/genes/genes-revise/genes-suggest/genes-suggest.page.html b/client/src/app/views/genes/genes-revise/genes-suggest/genes-suggest.page.html
index a0fb97f80..d544ebd92 100644
--- a/client/src/app/views/genes/genes-revise/genes-suggest/genes-suggest.page.html
+++ b/client/src/app/views/genes/genes-revise/genes-suggest/genes-suggest.page.html
@@ -1,4 +1,3 @@
 <ng-container *ngIf="geneId; else loadingGene">
-  <cvc-gene-revise-form [geneId]="geneId"> </cvc-gene-revise-form>
 </ng-container>
 <ng-template #loadingGene>Loading Gene...</ng-template>
diff --git a/server/app/graphql/mutations/suggest_gene_revision.rb b/server/app/graphql/mutations/suggest_gene_revision.rb
index 4b34607a1..1830ffadb 100644
--- a/server/app/graphql/mutations/suggest_gene_revision.rb
+++ b/server/app/graphql/mutations/suggest_gene_revision.rb
@@ -1,8 +1,8 @@
 class Mutations::SuggestGeneRevision < Mutations::MutationWithOrg
-  description 'Suggest a Revision to a Gene entity.'
+  description 'Suggest a Revision to a Feature entity of instance type "Gene".'
 
   argument :id, Int, required: true,
-    description: 'The ID of the Gene to suggest a Revision to.'
+    description: 'The ID of the Feature of instance type "Gene" to suggest a Revision to.'
 
   argument :fields, Types::Revisions::GeneFields, required: true,
     description: <<~DOC.strip
@@ -32,9 +32,11 @@ def ready?(organization_id: nil, id:, fields:, **kwargs)
     validate_user_logged_in
     validate_user_org(organization_id)
 
-    gene = Gene.find_by(id: id)
+    gene = Feature.find_by(id: id)&.feature_instance
     if gene.nil?
-      raise GraphQL::ExecutionError, "Gene with id #{id} doesn't exist."
+      raise GraphQL::ExecutionError, "Feature with id #{id} doesn't exist."
+    elsif !gene.is_a?(Features::Gene)
+      raise GraphQL::ExecutionError, "Feature with id #{id} is not a Gene feature."
     end
 
     @gene = gene
diff --git a/server/app/graphql/types/revisions/moderated_entities_type.rb b/server/app/graphql/types/revisions/moderated_entities_type.rb
index 3b43bc63c..4fbc6f473 100644
--- a/server/app/graphql/types/revisions/moderated_entities_type.rb
+++ b/server/app/graphql/types/revisions/moderated_entities_type.rb
@@ -2,6 +2,7 @@ module Types::Revisions
   class ModeratedEntitiesType < Types::BaseEnum
     description 'Enumeration of all moderated CIViC entities.'
     value 'GENE', value: 'Gene'
+    value 'FEATURE', value: 'Feature'
     value 'VARIANT', value: 'Variant'
     value 'EVIDENCE_ITEM', value: 'EvidenceItem'
     value 'ASSERTION', value: 'Assertion'
diff --git a/server/app/models/actions/suggest_revision_set.rb b/server/app/models/actions/suggest_revision_set.rb
index 55af0973f..ff9dd29e5 100644
--- a/server/app/models/actions/suggest_revision_set.rb
+++ b/server/app/models/actions/suggest_revision_set.rb
@@ -37,8 +37,14 @@ def execute
       next unless change_present
       any_changes = true
 
+      subject = if existing_obj.kind_of?(IsFeatureInstance)
+        existing_obj.feature
+      else
+        existing_obj
+      end
+
       cmd = Actions::SuggestRevision.new(
-        subject: existing_obj,
+        subject: subject,
         field_name: field_name,
         current_value: current_value,
         suggested_value: suggested_value,
diff --git a/server/app/models/activities/suggest_revision_set.rb b/server/app/models/activities/suggest_revision_set.rb
index b740d3a97..e009e176a 100644
--- a/server/app/models/activities/suggest_revision_set.rb
+++ b/server/app/models/activities/suggest_revision_set.rb
@@ -10,8 +10,13 @@ def initialize(originating_user:, existing_obj:, updated_obj:, organization_id:
 
     private
     def create_activity
+      subject = if existing_obj.kind_of?(IsFeatureInstance)
+        existing_obj.feature
+      else
+        existing_obj
+      end
       @activity = SuggestRevisionSetActivity.create!(
-        subject: existing_obj,
+        subject: subject,
         user: user,
         organization: organization,
         note: note
diff --git a/server/app/models/concerns/is_feature_instance.rb b/server/app/models/concerns/is_feature_instance.rb
index bc833071b..f24bf7fc8 100644
--- a/server/app/models/concerns/is_feature_instance.rb
+++ b/server/app/models/concerns/is_feature_instance.rb
@@ -8,6 +8,7 @@ module IsFeatureInstance
     delegate :description, to: :feature
     delegate :feature_aliases, to: :feature
     delegate :sources, to: :feature
+    delegate :source_ids, to: :feature
     delegate :variants, to: :feature
 
     delegate :flagged, to: :feature
@@ -16,5 +17,12 @@ module IsFeatureInstance
 
     delegate :comments, to: :feature
     delegate :last_comment_event, to: :feature
+
+    delegate :revisions, to: :feature
+    delegate :open_revisions, to: :feature
+    delegate :last_accepted_revision, to: :feature
+    delegate :last_accepted_revision_event, to: :feature
+    delegate :events, to: :feature
+    delegate :last_submitted_revision_event, to: :feature
   end
 end
diff --git a/server/app/models/feature.rb b/server/app/models/feature.rb
index 367799806..f32f48641 100644
--- a/server/app/models/feature.rb
+++ b/server/app/models/feature.rb
@@ -1,6 +1,7 @@
 class Feature < ApplicationRecord
   include Flaggable
   include Commentable
+  include Moderated
   include Subscribable
 
   delegated_type :feature_instance, types: %w[ Features::Gene ]
diff --git a/server/app/models/features/gene.rb b/server/app/models/features/gene.rb
index 5fe7c2575..ee58ef569 100644
--- a/server/app/models/features/gene.rb
+++ b/server/app/models/features/gene.rb
@@ -1,6 +1,5 @@
 module Features
   class Gene < ActiveRecord::Base
-    include Moderated
     include Subscribable
     include WithTimepointCounts
     include IsFeatureInstance
diff --git a/server/app/models/input_adaptors/gene_input_adaptor.rb b/server/app/models/input_adaptors/gene_input_adaptor.rb
index 15f6c93cc..cb40de86a 100644
--- a/server/app/models/input_adaptors/gene_input_adaptor.rb
+++ b/server/app/models/input_adaptors/gene_input_adaptor.rb
@@ -7,9 +7,11 @@ def initialize(gene_input_object: )
   end
 
   def perform
-    Gene.new(
+    g = Features::Gene.new()
+    Feature.new(
       description: input.description,
-      source_ids: input.source_ids
+      source_ids: input.source_ids,
+      feature_instance: g
     )
   end
 end
diff --git a/server/misc_scripts/features/backfill_feature_revisions.rb b/server/misc_scripts/features/backfill_feature_revisions.rb
new file mode 100644
index 000000000..4917d7977
--- /dev/null
+++ b/server/misc_scripts/features/backfill_feature_revisions.rb
@@ -0,0 +1,7 @@
+Revision.where(subject_type: 'Gene').find_each do |revision|
+  gene = Features::Gene.find(revision.subject_id)
+  feature = gene.feature
+
+  revision.subject = feature
+  revision.save!
+end

From 6a3f82bbae76f08ab1936802e812fb382fed461e Mon Sep 17 00:00:00 2001
From: Adam Coffman <acoffman@wustl.edu>
Date: Wed, 20 Dec 2023 10:18:58 -0600
Subject: [PATCH 016/125] update sitewide stats to use Features

---
 .../site-stats-card/site-stats-card.component.html  | 12 ++++++------
 .../site-stats-card/site-stats-card.query.gql       |  2 +-
 client/src/app/generated/civic.apollo-helpers.ts    |  4 ++--
 client/src/app/generated/civic.apollo.ts            | 10 +++++-----
 client/src/app/generated/server.model.graphql       |  6 +++---
 client/src/app/generated/server.schema.json         |  6 +++---
 server/app/graphql/types/civic_timepoint_stats.rb   |  2 +-
 server/app/models/civic_stats.rb                    |  2 +-
 server/app/models/feature.rb                        | 13 +++++++++++++
 server/app/models/features/gene.rb                  | 13 -------------
 10 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/client/src/app/components/shared/site-stats-card/site-stats-card.component.html b/client/src/app/components/shared/site-stats-card/site-stats-card.component.html
index 0c2044fbe..a62dea3c4 100644
--- a/client/src/app/components/shared/site-stats-card/site-stats-card.component.html
+++ b/client/src/app/components/shared/site-stats-card/site-stats-card.component.html
@@ -64,12 +64,12 @@
         </a>
       </nz-col>
       <nz-col nzFlex="1">
-        <a routerLink="/genes">
+        <a routerLink="/features">
           <nz-statistic
-                    [nzTitle]="label() + ' Genes'"
-                    [nzValue]="(stats.genes[statsType] | number)!"
-                    [nzPrefix]="geneIcon"></nz-statistic>
-          <ng-template #geneIcon>
+                    [nzTitle]="label() + ' Features'"
+                    [nzValue]="(stats.features[statsType] | number)!"
+                    [nzPrefix]="featureIcon"></nz-statistic>
+          <ng-template #featureIcon>
             <i
               nz-icon
               nzTheme="twotone"
@@ -98,7 +98,7 @@
           <nz-statistic
                     [nzTitle]="label() + ' Molecular Profiles'"
                     [nzValue]="(stats.molecularProfiles[statsType] | number)!"
-                    [nzPrefix]="mpIcon"></nz-statistic> 
+                    [nzPrefix]="mpIcon"></nz-statistic>
           <ng-template #mpIcon>
             <i
               nz-icon
diff --git a/client/src/app/components/shared/site-stats-card/site-stats-card.query.gql b/client/src/app/components/shared/site-stats-card/site-stats-card.query.gql
index 8f342b278..95aa1d4e3 100644
--- a/client/src/app/components/shared/site-stats-card/site-stats-card.query.gql
+++ b/client/src/app/components/shared/site-stats-card/site-stats-card.query.gql
@@ -12,7 +12,7 @@ query CivicStats {
     evidenceItems {
       ...TimepointCount
     }
-    genes {
+    features {
       ...TimepointCount
     }
     revisions {
diff --git a/client/src/app/generated/civic.apollo-helpers.ts b/client/src/app/generated/civic.apollo-helpers.ts
index ac7248097..98579957d 100644
--- a/client/src/app/generated/civic.apollo-helpers.ts
+++ b/client/src/app/generated/civic.apollo-helpers.ts
@@ -441,13 +441,13 @@ export type BrowseVariantTypeEdgeFieldPolicy = {
 	cursor?: FieldPolicy<any> | FieldReadFunction<any>,
 	node?: FieldPolicy<any> | FieldReadFunction<any>
 };
-export type CivicTimepointStatsKeySpecifier = ('assertions' | 'comments' | 'diseases' | 'evidenceItems' | 'genes' | 'molecularProfiles' | 'revisions' | 'sources' | 'therapies' | 'users' | 'variants' | CivicTimepointStatsKeySpecifier)[];
+export type CivicTimepointStatsKeySpecifier = ('assertions' | 'comments' | 'diseases' | 'evidenceItems' | 'features' | 'molecularProfiles' | 'revisions' | 'sources' | 'therapies' | 'users' | 'variants' | CivicTimepointStatsKeySpecifier)[];
 export type CivicTimepointStatsFieldPolicy = {
 	assertions?: FieldPolicy<any> | FieldReadFunction<any>,
 	comments?: FieldPolicy<any> | FieldReadFunction<any>,
 	diseases?: FieldPolicy<any> | FieldReadFunction<any>,
 	evidenceItems?: FieldPolicy<any> | FieldReadFunction<any>,
-	genes?: FieldPolicy<any> | FieldReadFunction<any>,
+	features?: FieldPolicy<any> | FieldReadFunction<any>,
 	molecularProfiles?: FieldPolicy<any> | FieldReadFunction<any>,
 	revisions?: FieldPolicy<any> | FieldReadFunction<any>,
 	sources?: FieldPolicy<any> | FieldReadFunction<any>,
diff --git a/client/src/app/generated/civic.apollo.ts b/client/src/app/generated/civic.apollo.ts
index 52553cbd3..e75007de8 100644
--- a/client/src/app/generated/civic.apollo.ts
+++ b/client/src/app/generated/civic.apollo.ts
@@ -940,7 +940,7 @@ export type CivicTimepointStats = {
   comments: TimePointCounts;
   diseases: TimePointCounts;
   evidenceItems: TimePointCounts;
-  genes: TimePointCounts;
+  features: TimePointCounts;
   molecularProfiles: TimePointCounts;
   revisions: TimePointCounts;
   sources: TimePointCounts;
@@ -2857,7 +2857,7 @@ export type Mutation = {
   suggestAssertionRevision?: Maybe<SuggestAssertionRevisionPayload>;
   /** Suggest a Revision to an EvidenceItem entity. */
   suggestEvidenceItemRevision?: Maybe<SuggestEvidenceItemRevisionPayload>;
-  /** Suggest a Revision to a Gene entity. */
+  /** Suggest a Revision to a Feature entity of instance type "Gene". */
   suggestGeneRevision?: Maybe<SuggestGeneRevisionPayload>;
   /** Suggest a Revision to a MolecularProfile entity. */
   suggestMolecularProfileRevision?: Maybe<SuggestMolecularProfileRevisionPayload>;
@@ -5042,7 +5042,7 @@ export type SuggestGeneRevisionInput = {
    * If no change is desired for a particular field, pass in the current value of that field.
    */
   fields: GeneFields;
-  /** The ID of the Gene to suggest a Revision to. */
+  /** The ID of the Feature of instance type "Gene" to suggest a Revision to. */
   id: Scalars['Int'];
   /**
    * The ID of the organization to credit the user's contributions to.
@@ -6583,7 +6583,7 @@ export type ModerateAssertionMutation = { __typename: 'Mutation', moderateAssert
 export type CivicStatsQueryVariables = Exact<{ [key: string]: never; }>;
 
 
-export type CivicStatsQuery = { __typename: 'Query', timepointStats: { __typename: 'CivicTimepointStats', assertions: { __typename: 'TimePointCounts', allTime: number, newThisMonth: number, newThisWeek: number, newThisYear: number }, diseases: { __typename: 'TimePointCounts', allTime: number, newThisMonth: number, newThisWeek: number, newThisYear: number }, therapies: { __typename: 'TimePointCounts', allTime: number, newThisMonth: number, newThisWeek: number, newThisYear: number }, evidenceItems: { __typename: 'TimePointCounts', allTime: number, newThisMonth: number, newThisWeek: number, newThisYear: number }, genes: { __typename: 'TimePointCounts', allTime: number, newThisMonth: number, newThisWeek: number, newThisYear: number }, revisions: { __typename: 'TimePointCounts', allTime: number, newThisMonth: number, newThisWeek: number, newThisYear: number }, sources: { __typename: 'TimePointCounts', allTime: number, newThisMonth: number, newThisWeek: number, newThisYear: number }, users: { __typename: 'TimePointCounts', allTime: number, newThisMonth: number, newThisWeek: number, newThisYear: number }, variants: { __typename: 'TimePointCounts', allTime: number, newThisMonth: number, newThisWeek: number, newThisYear: number }, comments: { __typename: 'TimePointCounts', allTime: number, newThisMonth: number, newThisWeek: number, newThisYear: number }, molecularProfiles: { __typename: 'TimePointCounts', allTime: number, newThisMonth: number, newThisWeek: number, newThisYear: number } } };
+export type CivicStatsQuery = { __typename: 'Query', timepointStats: { __typename: 'CivicTimepointStats', assertions: { __typename: 'TimePointCounts', allTime: number, newThisMonth: number, newThisWeek: number, newThisYear: number }, diseases: { __typename: 'TimePointCounts', allTime: number, newThisMonth: number, newThisWeek: number, newThisYear: number }, therapies: { __typename: 'TimePointCounts', allTime: number, newThisMonth: number, newThisWeek: number, newThisYear: number }, evidenceItems: { __typename: 'TimePointCounts', allTime: number, newThisMonth: number, newThisWeek: number, newThisYear: number }, features: { __typename: 'TimePointCounts', allTime: number, newThisMonth: number, newThisWeek: number, newThisYear: number }, revisions: { __typename: 'TimePointCounts', allTime: number, newThisMonth: number, newThisWeek: number, newThisYear: number }, sources: { __typename: 'TimePointCounts', allTime: number, newThisMonth: number, newThisWeek: number, newThisYear: number }, users: { __typename: 'TimePointCounts', allTime: number, newThisMonth: number, newThisWeek: number, newThisYear: number }, variants: { __typename: 'TimePointCounts', allTime: number, newThisMonth: number, newThisWeek: number, newThisYear: number }, comments: { __typename: 'TimePointCounts', allTime: number, newThisMonth: number, newThisWeek: number, newThisYear: number }, molecularProfiles: { __typename: 'TimePointCounts', allTime: number, newThisMonth: number, newThisWeek: number, newThisYear: number } } };
 
 export type TimepointCountFragment = { __typename: 'TimePointCounts', allTime: number, newThisMonth: number, newThisWeek: number, newThisYear: number };
 
@@ -11830,7 +11830,7 @@ export const CivicStatsDocument = gql`
     evidenceItems {
       ...TimepointCount
     }
-    genes {
+    features {
       ...TimepointCount
     }
     revisions {
diff --git a/client/src/app/generated/server.model.graphql b/client/src/app/generated/server.model.graphql
index 03ab4fa4c..bc4d95550 100644
--- a/client/src/app/generated/server.model.graphql
+++ b/client/src/app/generated/server.model.graphql
@@ -1587,7 +1587,7 @@ type CivicTimepointStats {
   comments: TimePointCounts!
   diseases: TimePointCounts!
   evidenceItems: TimePointCounts!
-  genes: TimePointCounts!
+  features: TimePointCounts!
   molecularProfiles: TimePointCounts!
   revisions: TimePointCounts!
   sources: TimePointCounts!
@@ -4831,7 +4831,7 @@ type Mutation {
   ): SuggestEvidenceItemRevisionPayload
 
   """
-  Suggest a Revision to a Gene entity.
+  Suggest a Revision to a Feature entity of instance type "Gene".
   """
   suggestGeneRevision(
     """
@@ -8228,7 +8228,7 @@ input SuggestGeneRevisionInput {
   fields: GeneFields!
 
   """
-  The ID of the Gene to suggest a Revision to.
+  The ID of the Feature of instance type "Gene" to suggest a Revision to.
   """
   id: Int!
 
diff --git a/client/src/app/generated/server.schema.json b/client/src/app/generated/server.schema.json
index f52c07355..369909b4d 100644
--- a/client/src/app/generated/server.schema.json
+++ b/client/src/app/generated/server.schema.json
@@ -7504,7 +7504,7 @@
               "deprecationReason": null
             },
             {
-              "name": "genes",
+              "name": "features",
               "description": null,
               "args": [],
               "type": {
@@ -22641,7 +22641,7 @@
             },
             {
               "name": "suggestGeneRevision",
-              "description": "Suggest a Revision to a Gene entity.",
+              "description": "Suggest a Revision to a Feature entity of instance type \"Gene\".",
               "args": [
                 {
                   "name": "input",
@@ -37948,7 +37948,7 @@
             },
             {
               "name": "id",
-              "description": "The ID of the Gene to suggest a Revision to.",
+              "description": "The ID of the Feature of instance type \"Gene\" to suggest a Revision to.",
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
diff --git a/server/app/graphql/types/civic_timepoint_stats.rb b/server/app/graphql/types/civic_timepoint_stats.rb
index 10a36aeb0..e622bf531 100644
--- a/server/app/graphql/types/civic_timepoint_stats.rb
+++ b/server/app/graphql/types/civic_timepoint_stats.rb
@@ -8,7 +8,7 @@ class TimePointCounts < Types::BaseObject
 
   class CivicTimepointStats < Types::BaseObject
     description 'Counts of CIViC activity over time, used for the homepage'
-    field :genes, TimePointCounts, null: false
+    field :features, TimePointCounts, null: false
     field :variants, TimePointCounts, null: false
     field :molecular_profiles, TimePointCounts, null: false
     field :revisions, TimePointCounts, null: false
diff --git a/server/app/models/civic_stats.rb b/server/app/models/civic_stats.rb
index 7e86c5e3a..e804be114 100644
--- a/server/app/models/civic_stats.rb
+++ b/server/app/models/civic_stats.rb
@@ -2,7 +2,7 @@ class CivicStats
 
   def self.homepage_stats
     [
-      Gene,
+      Feature,
       Variant,
       EvidenceItem,
       Therapy,
diff --git a/server/app/models/feature.rb b/server/app/models/feature.rb
index f32f48641..7955c63c0 100644
--- a/server/app/models/feature.rb
+++ b/server/app/models/feature.rb
@@ -3,6 +3,7 @@ class Feature < ApplicationRecord
   include Commentable
   include Moderated
   include Subscribable
+  include WithTimepointCounts
 
   delegated_type :feature_instance, types: %w[ Features::Gene ]
   has_and_belongs_to_many :feature_aliases, class_name: 'Features::FeatureAlias'
@@ -13,4 +14,16 @@ class Feature < ApplicationRecord
   def link
     Rails.application.routes.url_helpers.url_for("/features/#{self.id}")
   end
+
+  def self.timepoint_query
+    ->(x) {
+      self.joins(variants: { molecular_profiles: [:evidence_items] })
+        .group('features.id')
+        .select('features.id')
+        .where("evidence_items.status != 'rejected'")
+        .having('MIN(evidence_items.created_at) >= ?', x)
+        .distinct
+        .count
+    }
+  end
 end
diff --git a/server/app/models/features/gene.rb b/server/app/models/features/gene.rb
index ee58ef569..e218732d5 100644
--- a/server/app/models/features/gene.rb
+++ b/server/app/models/features/gene.rb
@@ -1,7 +1,6 @@
 module Features
   class Gene < ActiveRecord::Base
     include Subscribable
-    include WithTimepointCounts
     include IsFeatureInstance
 
     #has_many :variants
@@ -26,18 +25,6 @@ def display_name
       name
     end
 
-    def self.timepoint_query
-      ->(x) {
-        self.joins(variants: { molecular_profiles: [:evidence_items] })
-          .group('genes.id')
-          .select('genes.id')
-          .where("evidence_items.status != 'rejected'")
-          .having('MIN(evidence_items.created_at) >= ?', x)
-          .distinct
-          .count
-      }
-    end
-
     def editable_fields
       [
         :description,

From e1a0d7693fbd06ec74e6b4c814ca7385815b1f32 Mon Sep 17 00:00:00 2001
From: Adam Coffman <acoffman@wustl.edu>
Date: Wed, 20 Dec 2023 10:19:46 -0600
Subject: [PATCH 017/125] backfill script to update activities and events to
 point to features

---
 .../features/backfill_events_and_activites.rb      | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 server/misc_scripts/features/backfill_events_and_activites.rb

diff --git a/server/misc_scripts/features/backfill_events_and_activites.rb b/server/misc_scripts/features/backfill_events_and_activites.rb
new file mode 100644
index 000000000..11c3b7fea
--- /dev/null
+++ b/server/misc_scripts/features/backfill_events_and_activites.rb
@@ -0,0 +1,14 @@
+Event.where(subject_type: 'Gene').find_each do |event|
+  gene = Features::Gene.find(event.subject_id)
+  feature = gene.feature
+  event.subject = feature
+  event.save!
+end
+
+Activity.where(subject_type: 'Gene').find_each do |activity|
+  gene = Features::Gene.find(activity.subject_id)
+  feature = gene.feature
+  activity.subject = feature
+  activity.save!
+end
+

From 52811f5b6dd536aa0aaa8c5c69aa2903e499e69b Mon Sep 17 00:00:00 2001
From: Adam Coffman <acoffman@wustl.edu>
Date: Wed, 20 Dec 2023 10:20:04 -0600
Subject: [PATCH 018/125] updated schema file

---
 server/db/schema.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/server/db/schema.rb b/server/db/schema.rb
index 67a3126d9..4f5382c4b 100644
--- a/server/db/schema.rb
+++ b/server/db/schema.rb
@@ -711,7 +711,8 @@
     t.integer "source_type", null: false
     t.integer "asco_abstract_id"
     t.text "asco_presenter"
-    t.boolean "fully_curated", default: false, null: false
+    #t.boolean "fully_curated", default: false, null: false
+    t.text "status", default: "fully_curated", null: false
     t.index ["asco_abstract_id"], name: "index_sources_on_asco_abstract_id"
     t.index ["asco_presenter"], name: "index_sources_on_asco_presenter"
     t.index ["citation_id"], name: "index_sources_on_citation_id"

From 4c3472adad59fab6c3cefccb5917fec7faeef6dc Mon Sep 17 00:00:00 2001
From: Adam Coffman <acoffman@wustl.edu>
Date: Wed, 20 Dec 2023 10:20:30 -0600
Subject: [PATCH 019/125] fix typo in method name

---
 server/app/graphql/types/entities/molecular_profile_type.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/app/graphql/types/entities/molecular_profile_type.rb b/server/app/graphql/types/entities/molecular_profile_type.rb
index 72135dfed..07df26c9b 100644
--- a/server/app/graphql/types/entities/molecular_profile_type.rb
+++ b/server/app/graphql/types/entities/molecular_profile_type.rb
@@ -53,7 +53,7 @@ def parsed_name
       Loaders::MolecularProfileSegmentsLoader.for(MolecularProfile).load(object.id)
     end
 
-    def variant
+    def variants
       Loaders::AssociationLoader.for(MolecularProfile, :variants).load(object)
     end
 

From f8260c7b542a2a670585537d83832c61744e213b Mon Sep 17 00:00:00 2001
From: Adam Coffman <acoffman@wustl.edu>
Date: Wed, 20 Dec 2023 10:21:48 -0600
Subject: [PATCH 020/125] remove GID from MP names, with backfill script

---
 .../loaders/molecular_profile_segments_loader.rb     |  5 +----
 .../actions/generate_molecular_profile_name.rb       |  2 +-
 server/app/models/molecular_profile.rb               | 12 ++++--------
 server/misc_scripts/features/backfill_mp_names.rb    |  6 ++++++
 4 files changed, 12 insertions(+), 13 deletions(-)
 create mode 100644 server/misc_scripts/features/backfill_mp_names.rb

diff --git a/server/app/graphql/loaders/molecular_profile_segments_loader.rb b/server/app/graphql/loaders/molecular_profile_segments_loader.rb
index a3f5506af..991da5f5f 100644
--- a/server/app/graphql/loaders/molecular_profile_segments_loader.rb
+++ b/server/app/graphql/loaders/molecular_profile_segments_loader.rb
@@ -11,9 +11,7 @@ def perform(ids)
 
       MolecularProfile.where(id: ids).each do |mp|
         mps[mp.id] = mp.name.split(' ').map do |segment|
-          if gene_match = segment.match(MolecularProfile::GENE_REGEX)
-            nil
-          elsif variant_match = segment.match(MolecularProfile::VARIANT_REGEX)
+          if variant_match = segment.match(MolecularProfile::VARIANT_REGEX)
             variant_id = variant_match[:id].to_i
             resolved_variants[variant_id] = nil
             ->(features, vars) { [ features[vars[variant_id].feature_id], vars[variant_id] ] }
@@ -21,7 +19,6 @@ def perform(ids)
             ->(features, vars) { segment }
           end
         end
-          .compact
       end
 
       Variant.where(id: resolved_variants.keys)
diff --git a/server/app/models/actions/generate_molecular_profile_name.rb b/server/app/models/actions/generate_molecular_profile_name.rb
index 7aa9728eb..e75b34261 100644
--- a/server/app/models/actions/generate_molecular_profile_name.rb
+++ b/server/app/models/actions/generate_molecular_profile_name.rb
@@ -5,7 +5,7 @@ def self.generate_name(structure: )
     end
 
     def self.generate_single_variant_mp_name(variant: )
-        "#GID#{variant.gene.id} #VID#{variant.id}"
+        "#VID#{variant.id}"
     end
 
     private
diff --git a/server/app/models/molecular_profile.rb b/server/app/models/molecular_profile.rb
index 4af3c1556..f18e62651 100644
--- a/server/app/models/molecular_profile.rb
+++ b/server/app/models/molecular_profile.rb
@@ -81,18 +81,14 @@ def link
   def segments
     #TODO - we could batch these queries if it becomes an issue
     @segments ||= name.split(' ').map do |segment|
-      if gene_match = segment.match(GENE_REGEX)
-        nil
-      elsif variant_match = segment.match(VARIANT_REGEX)
+      if variant_match = segment.match(VARIANT_REGEX)
         v = Variant.find(variant_match[:id])
-        g = Feature.find(v.feature_id)
-        [v, g]
+        f = Feature.find(v.feature_id)
+        [f, v]
       else
         segment
       end
-        .flatten
-    end
-    @segements ||= s.flatten
+    end.flatten
   end
 
   def self.timepoint_query
diff --git a/server/misc_scripts/features/backfill_mp_names.rb b/server/misc_scripts/features/backfill_mp_names.rb
new file mode 100644
index 000000000..d6001d69d
--- /dev/null
+++ b/server/misc_scripts/features/backfill_mp_names.rb
@@ -0,0 +1,6 @@
+regex = MolecularProfile::GENE_REGEX
+
+MolecularProfile.find_each do |mp|
+  mp.name = mp.name.gsub(regex, '').squish
+  mp.save!
+end

From 615c5a827d1ca9ff8989c73bc51a4525a987ccd9 Mon Sep 17 00:00:00 2001
From: Adam Coffman <acoffman@wustl.edu>
Date: Wed, 20 Dec 2023 10:24:16 -0600
Subject: [PATCH 021/125] fix feature display on event feed

---
 .../event-timeline-item/event-timeline-item-module.ts       | 4 ++--
 .../event-timeline-item/event-timeline-item.component.html  | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/src/app/components/events/event-timeline-item/event-timeline-item-module.ts b/client/src/app/components/events/event-timeline-item/event-timeline-item-module.ts
index 1ebcc7ab4..dd39930da 100644
--- a/client/src/app/components/events/event-timeline-item/event-timeline-item-module.ts
+++ b/client/src/app/components/events/event-timeline-item/event-timeline-item-module.ts
@@ -7,7 +7,6 @@ import { NzTypographyModule } from 'ng-zorro-antd/typography'
 import { CvcPipesModule } from '@app/core/pipes/pipes.module'
 import { CvcCommentTagModule } from '@app/components/comments/comment-tag/comment-tag.module'
 import { CvcFlagTagModule } from '@app/components/flags/flag-tag/flag-tag.module'
-import { CvcGeneTagModule } from '@app/components/genes/gene-tag/gene-tag.module'
 import { CvcAssertionsTagModule } from '@app/components/assertions/assertions-tag/assertions-tag.module'
 import { CvcEvidenceTagModule } from '@app/components/evidence/evidence-tag/evidence-tag.module'
 import { CvcVariantTagModule } from '@app/components/variants/variant-tag/variant-tag.module'
@@ -21,6 +20,7 @@ import { CvcVariantGroupTagModule } from '@app/components/variant-groups/variant
 import { NzTagModule } from 'ng-zorro-antd/tag'
 import { RouterModule } from '@angular/router'
 import { CvcMolecularProfileTagModule } from '@app/components/molecular-profiles/molecular-profile-tag/molecular-profile-tag.module'
+import { CvcFeatureTagModule } from '@app/components/features/feature-tag/feature-tag.module'
 
 @NgModule({
   declarations: [CvcEventTimelineItemComponent],
@@ -38,7 +38,7 @@ import { CvcMolecularProfileTagModule } from '@app/components/molecular-profiles
     CvcPipesModule,
     CvcCommentTagModule,
     CvcFlagTagModule,
-    CvcGeneTagModule,
+    CvcFeatureTagModule,
     CvcAssertionsTagModule,
     CvcEvidenceTagModule,
     CvcVariantTagModule,
diff --git a/client/src/app/components/events/event-timeline-item/event-timeline-item.component.html b/client/src/app/components/events/event-timeline-item/event-timeline-item.component.html
index 2349e2e5f..52db91dc5 100644
--- a/client/src/app/components/events/event-timeline-item/event-timeline-item.component.html
+++ b/client/src/app/components/events/event-timeline-item/event-timeline-item.component.html
@@ -66,9 +66,9 @@
     <ng-container
       *ngIf="tagDisplay != 'hideSubject' && event.subject as subject"
       [ngSwitch]="subject.__typename">
-      <cvc-gene-tag
-        *ngSwitchCase="'Gene'"
-        [gene]="subject"></cvc-gene-tag>
+      <cvc-feature-tag
+        *ngSwitchCase="'Feature'"
+        [feature]="subject"></cvc-feature-tag>
       <cvc-assertion-tag
         *ngSwitchCase="'Assertion'"
         [assertion]="subject"></cvc-assertion-tag>

From 77196c1f611f7980adc29e0f85f48bbadd8c963c Mon Sep 17 00:00:00 2001
From: Adam Coffman <acoffman@wustl.edu>
Date: Wed, 20 Dec 2023 10:38:35 -0600
Subject: [PATCH 022/125] comment preview and typeahead working with features

---
 .../comment-body/comment-body.component.html  | 36 +++++++++----------
 .../comment-body/comment-body.module.ts       |  4 +--
 .../comment-input/comment-input.form.ts       |  4 +--
 client/src/app/generated/civic.apollo.ts      |  2 +-
 client/src/app/generated/server.model.graphql |  2 +-
 client/src/app/generated/server.schema.json   |  2 +-
 .../types/commentable/taggable_entity.rb      |  2 +-
 .../app/models/actions/extract_references.rb  |  8 ++---
 8 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/client/src/app/components/comments/comment-body/comment-body.component.html b/client/src/app/components/comments/comment-body/comment-body.component.html
index 6585baab5..030580c91 100644
--- a/client/src/app/components/comments/comment-body/comment-body.component.html
+++ b/client/src/app/components/comments/comment-body/comment-body.component.html
@@ -9,28 +9,28 @@
     <ng-container [ngSwitch]="c.tagType">
       <span *ngSwitchCase="'REVISION'">
         <!--<cvc-revision-tag-->
-          <!--[revision]="{-->
-            <!--id: c.entityId,-->
-            <!--name: c.displayName,-->
-            <!--link: c.link,-->
-            <!--revisionSetId: c.revisionSetId!-->
-          <!--}"></cvc-revision-tag>-->
-          <nz-tag>
-            <i
-              nz-icon
-              nzType="civic-revision"
-              nzTheme="twotone"
-              nzTwotoneColor="#F0673A"></i>
-            {{ c.displayName }}
-          </nz-tag>
+        <!--[revision]="{-->
+        <!--id: c.entityId,-->
+        <!--name: c.displayName,-->
+        <!--link: c.link,-->
+        <!--revisionSetId: c.revisionSetId!-->
+        <!--}"></cvc-revision-tag>-->
+        <nz-tag>
+          <i
+            nz-icon
+            nzType="civic-revision"
+            nzTheme="twotone"
+            nzTwotoneColor="#F0673A"></i>
+          {{ c.displayName }}
+        </nz-tag>
       </span>
-      <span *ngSwitchCase="'GENE'">
-        <cvc-gene-tag
-          [gene]="{
+      <span *ngSwitchCase="'FEATURE'">
+        <cvc-feature-tag
+          [feature]="{
             id: c.entityId,
             name: c.displayName,
             link: c.link
-          }"></cvc-gene-tag>
+          }"></cvc-feature-tag>
       </span>
       <span *ngSwitchCase="'VARIANT'">
         <cvc-variant-tag
diff --git a/client/src/app/components/comments/comment-body/comment-body.module.ts b/client/src/app/components/comments/comment-body/comment-body.module.ts
index 7c6e7cb95..f9c9a60aa 100644
--- a/client/src/app/components/comments/comment-body/comment-body.module.ts
+++ b/client/src/app/components/comments/comment-body/comment-body.module.ts
@@ -6,12 +6,12 @@ import { CvcAssertionsTagModule } from '@app/components/assertions/assertions-ta
 import { CvcEvidenceTagModule } from '@app/components/evidence/evidence-tag/evidence-tag.module'
 import { CvcVariantTagModule } from '@app/components/variants/variant-tag/variant-tag.module'
 import { CvcVariantGroupTagModule } from '@app/components/variant-groups/variant-group-tag/variant-group-tag.module'
-import { CvcGeneTagModule } from '@app/components/genes/gene-tag/gene-tag.module'
 import { CvcUserTagModule } from '@app/components/users/user-tag/user-tag.module'
 import { CvcOrganizationTagModule } from '@app/components/organizations/organization-tag/organization-tag.module'
 import { NzTagModule } from 'ng-zorro-antd/tag'
 import { NzIconModule } from 'ng-zorro-antd/icon'
 import { CvcMolecularProfileTagModule } from '@app/components/molecular-profiles/molecular-profile-tag/molecular-profile-tag.module'
+import { CvcFeatureTagModule } from '@app/components/features/feature-tag/feature-tag.module'
 
 @NgModule({
   declarations: [CvcCommentBodyComponent],
@@ -25,7 +25,7 @@ import { CvcMolecularProfileTagModule } from '@app/components/molecular-profiles
     CvcEvidenceTagModule,
     CvcVariantTagModule,
     CvcVariantGroupTagModule,
-    CvcGeneTagModule,
+    CvcFeatureTagModule,
     CvcUserTagModule,
     CvcOrganizationTagModule,
     CvcMolecularProfileTagModule,
diff --git a/client/src/app/forms/components/comment-input/comment-input.form.ts b/client/src/app/forms/components/comment-input/comment-input.form.ts
index 32299fd3d..5f753c975 100644
--- a/client/src/app/forms/components/comment-input/comment-input.form.ts
+++ b/client/src/app/forms/components/comment-input/comment-input.form.ts
@@ -128,8 +128,8 @@ export class CvcCommentInputForm implements OnDestroy, OnChanges {
 
   tagForEntityTypeAndId(entityType: TaggableEntity, id: number): string {
     switch (entityType) {
-      case TaggableEntity.Gene:
-        return `GID${id}`
+      case TaggableEntity.Feature:
+        return `FID${id}`
       case TaggableEntity.Variant:
         return `VID${id}`
       case TaggableEntity.VariantGroup:
diff --git a/client/src/app/generated/civic.apollo.ts b/client/src/app/generated/civic.apollo.ts
index e75007de8..8f164dc25 100644
--- a/client/src/app/generated/civic.apollo.ts
+++ b/client/src/app/generated/civic.apollo.ts
@@ -5249,7 +5249,7 @@ export type SuggestVariantRevisionPayload = {
 export enum TaggableEntity {
   Assertion = 'ASSERTION',
   EvidenceItem = 'EVIDENCE_ITEM',
-  Gene = 'GENE',
+  Feature = 'FEATURE',
   MolecularProfile = 'MOLECULAR_PROFILE',
   Revision = 'REVISION',
   Role = 'ROLE',
diff --git a/client/src/app/generated/server.model.graphql b/client/src/app/generated/server.model.graphql
index bc4d95550..8b59e045f 100644
--- a/client/src/app/generated/server.model.graphql
+++ b/client/src/app/generated/server.model.graphql
@@ -8522,7 +8522,7 @@ type SuggestVariantRevisionPayload {
 enum TaggableEntity {
   ASSERTION
   EVIDENCE_ITEM
-  GENE
+  FEATURE
   MOLECULAR_PROFILE
   REVISION
   ROLE
diff --git a/client/src/app/generated/server.schema.json b/client/src/app/generated/server.schema.json
index 369909b4d..c64ef050d 100644
--- a/client/src/app/generated/server.schema.json
+++ b/client/src/app/generated/server.schema.json
@@ -39041,7 +39041,7 @@
           "interfaces": null,
           "enumValues": [
             {
-              "name": "GENE",
+              "name": "FEATURE",
               "description": null,
               "isDeprecated": false,
               "deprecationReason": null
diff --git a/server/app/graphql/types/commentable/taggable_entity.rb b/server/app/graphql/types/commentable/taggable_entity.rb
index 8c40efed9..c5d80510d 100644
--- a/server/app/graphql/types/commentable/taggable_entity.rb
+++ b/server/app/graphql/types/commentable/taggable_entity.rb
@@ -1,6 +1,6 @@
 module Types::Commentable
   class TaggableEntity < Types::BaseEnum
-    value 'GENE'
+    value 'FEATURE'
     value 'VARIANT'
     value 'VARIANT_GROUP'
     value 'EVIDENCE_ITEM'
diff --git a/server/app/models/actions/extract_references.rb b/server/app/models/actions/extract_references.rb
index 8888208d6..591b21d69 100644
--- a/server/app/models/actions/extract_references.rb
+++ b/server/app/models/actions/extract_references.rb
@@ -87,8 +87,8 @@ def self.extract_type(type)
       case type.upcase
       when 'V'
         [Variant, 'VARIANT']
-      when 'G'
-        [Gene, 'GENE']
+      when 'F'
+        [Feature, 'FEATURE']
       when 'VG'
         [VariantGroup, 'VARIANT_GROUP']
       when 'E'
@@ -103,11 +103,11 @@ def self.extract_type(type)
     end
 
     def self.split_regex
-      @split_regex ||= Regexp.new(/\s*(#(?:a|v|g|vg|e|r|mp)(?:id)?\d+)\b/i)
+      @split_regex ||= Regexp.new(/\s*(#(?:a|v|f|vg|e|r|mp)(?:id)?\d+)\b/i)
     end
 
     def self.scan_regex
-      @scan_regex ||= Regexp.new(/#(?<type>a|v|g|vg|e|r|mp)(?:id)?(?<id>\d+)\b/i)
+      @scan_regex ||= Regexp.new(/#(?<type>a|v|f|vg|e|r|mp)(?:id)?(?<id>\d+)\b/i)
     end
   end
 end

From ee04ba88a80f58e8f1656b7b575c836f618b5974 Mon Sep 17 00:00:00 2001
From: Adam Coffman <acoffman@wustl.edu>
Date: Wed, 20 Dec 2023 11:10:54 -0600
Subject: [PATCH 023/125] introduce full name on features, move gene official
 name over

---
 .../feature-popover.component.html            | 11 +++--
 .../feature-popover/feature-popover.query.gql |  4 +-
 .../gene-popover/gene-popover.component.html  |  2 +-
 .../genes/gene-popover/gene-popover.query.gql |  2 +-
 .../src/app/generated/civic.apollo-helpers.ts |  7 +--
 client/src/app/generated/civic.apollo.ts      | 43 +++++++++----------
 client/src/app/generated/server.model.graphql |  3 +-
 client/src/app/generated/server.schema.json   | 40 ++++++++++-------
 .../features-detail/features-detail.query.gql |  5 +--
 .../features-detail/features-detail.view.html |  7 +--
 .../features-summary.query.gql                |  2 +-
 .../features-revise/features-revise.view.html |  2 +-
 .../genes/genes-detail/genes-detail.query.gql |  2 +-
 .../genes/genes-detail/genes-detail.view.html |  4 +-
 .../genes-summary/genes-summary.query.gql     |  1 -
 .../genes/genes-revise/genes-revise.view.html |  2 +-
 .../graphql/types/entities/feature_type.rb    |  5 +--
 .../app/graphql/types/entities/gene_type.rb   |  1 -
 .../models/concerns/is_feature_instance.rb    |  1 +
 ...0231220164444_add_full_name_to_features.rb | 14 ++++++
 server/db/schema.rb                           |  4 +-
 21 files changed, 89 insertions(+), 73 deletions(-)
 create mode 100644 server/db/migrate/20231220164444_add_full_name_to_features.rb

diff --git a/client/src/app/components/features/feature-popover/feature-popover.component.html b/client/src/app/components/features/feature-popover/feature-popover.component.html
index e2fd3ead6..8b9edd83a 100644
--- a/client/src/app/components/features/feature-popover/feature-popover.component.html
+++ b/client/src/app/components/features/feature-popover/feature-popover.component.html
@@ -11,7 +11,6 @@
           [nzTwotoneColor]="'Gene' | entityColor"
           nzType="civic-gene"></i>
         {{ feature.featureInstance.__typename }} - {{ feature.name }}
-        <!-- {{ feature.officialName }} -->
       </ng-template>
 
       <nz-descriptions
@@ -23,7 +22,9 @@
           nzTitle="Aliases"
           nzSpan="2"
           *ngIf="feature.featureAliases.length > 0">
-          <nz-tag *ngFor="let alias of feature.featureAliases">{{ alias }}</nz-tag>
+          <nz-tag *ngFor="let alias of feature.featureAliases">{{
+            alias
+          }}</nz-tag>
         </nz-descriptions-item>
 
         <!-- variant count-->
@@ -53,7 +54,8 @@
                 <i
                   nz-icon
                   nzType="civic-revision"></i>
-                Revisions <!-- ({{ feature.revisions.totalCount }}) -->
+                Revisions
+                <!-- ({{ feature.revisions.totalCount }}) -->
               </nz-tag>
             </a>
             <a
@@ -63,7 +65,8 @@
                 <i
                   nz-icon
                   nzType="civic-comment"></i>
-                Comments <!-- ({{ feature.comments.totalCount }}) -->
+                Comments
+                <!-- ({{ feature.comments.totalCount }}) -->
               </nz-tag>
             </a>
           </nz-space>
diff --git a/client/src/app/components/features/feature-popover/feature-popover.query.gql b/client/src/app/components/features/feature-popover/feature-popover.query.gql
index 5e96548ac..6ed1a9ff3 100644
--- a/client/src/app/components/features/feature-popover/feature-popover.query.gql
+++ b/client/src/app/components/features/feature-popover/feature-popover.query.gql
@@ -8,9 +8,7 @@ fragment featurePopover on Feature {
   id
   name
   featureInstance {
-    ... on Gene {
-      officialName
-    }
+    __typename
   }
   featureAliases
   variants {
diff --git a/client/src/app/components/genes/gene-popover/gene-popover.component.html b/client/src/app/components/genes/gene-popover/gene-popover.component.html
index 705a9722d..54628b964 100644
--- a/client/src/app/components/genes/gene-popover/gene-popover.component.html
+++ b/client/src/app/components/genes/gene-popover/gene-popover.component.html
@@ -10,7 +10,7 @@
           nzTheme="twotone"
           [nzTwotoneColor]="'Gene' | entityColor"
           nzType="civic-gene"></i>
-        {{ gene.officialName }}
+        {{ gene.fullName }}
       </ng-template>
 
       <nz-descriptions
diff --git a/client/src/app/components/genes/gene-popover/gene-popover.query.gql b/client/src/app/components/genes/gene-popover/gene-popover.query.gql
index 91ace9185..c573d3f7e 100644
--- a/client/src/app/components/genes/gene-popover/gene-popover.query.gql
+++ b/client/src/app/components/genes/gene-popover/gene-popover.query.gql
@@ -7,7 +7,7 @@ query GenePopover($geneId: Int!) {
 fragment genePopover on Gene {
   id
   name
-  officialName
+  fullName
   featureAliases
   variants {
     totalCount
diff --git a/client/src/app/generated/civic.apollo-helpers.ts b/client/src/app/generated/civic.apollo-helpers.ts
index 98579957d..d21464051 100644
--- a/client/src/app/generated/civic.apollo-helpers.ts
+++ b/client/src/app/generated/civic.apollo-helpers.ts
@@ -812,7 +812,7 @@ export type FdaCodeFieldPolicy = {
 	code?: FieldPolicy<any> | FieldReadFunction<any>,
 	description?: FieldPolicy<any> | FieldReadFunction<any>
 };
-export type FeatureKeySpecifier = ('description' | 'events' | 'featureAliases' | 'featureInstance' | 'flagged' | 'flags' | 'id' | 'link' | 'name' | 'sources' | 'variants' | FeatureKeySpecifier)[];
+export type FeatureKeySpecifier = ('description' | 'events' | 'featureAliases' | 'featureInstance' | 'flagged' | 'flags' | 'fullName' | 'id' | 'link' | 'name' | 'sources' | 'variants' | FeatureKeySpecifier)[];
 export type FeatureFieldPolicy = {
 	description?: FieldPolicy<any> | FieldReadFunction<any>,
 	events?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -820,6 +820,7 @@ export type FeatureFieldPolicy = {
 	featureInstance?: FieldPolicy<any> | FieldReadFunction<any>,
 	flagged?: FieldPolicy<any> | FieldReadFunction<any>,
 	flags?: FieldPolicy<any> | FieldReadFunction<any>,
+	fullName?: FieldPolicy<any> | FieldReadFunction<any>,
 	id?: FieldPolicy<any> | FieldReadFunction<any>,
 	link?: FieldPolicy<any> | FieldReadFunction<any>,
 	name?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -894,7 +895,7 @@ export type FlaggableFieldPolicy = {
 	link?: FieldPolicy<any> | FieldReadFunction<any>,
 	name?: FieldPolicy<any> | FieldReadFunction<any>
 };
-export type GeneKeySpecifier = ('comments' | 'description' | 'entrezId' | 'events' | 'featureAliases' | 'featureInstance' | 'flagged' | 'flags' | 'id' | 'lastAcceptedRevisionEvent' | 'lastCommentEvent' | 'lastSubmittedRevisionEvent' | 'link' | 'myGeneInfoDetails' | 'name' | 'officialName' | 'revisions' | 'sources' | 'variants' | GeneKeySpecifier)[];
+export type GeneKeySpecifier = ('comments' | 'description' | 'entrezId' | 'events' | 'featureAliases' | 'featureInstance' | 'flagged' | 'flags' | 'fullName' | 'id' | 'lastAcceptedRevisionEvent' | 'lastCommentEvent' | 'lastSubmittedRevisionEvent' | 'link' | 'myGeneInfoDetails' | 'name' | 'revisions' | 'sources' | 'variants' | GeneKeySpecifier)[];
 export type GeneFieldPolicy = {
 	comments?: FieldPolicy<any> | FieldReadFunction<any>,
 	description?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -904,6 +905,7 @@ export type GeneFieldPolicy = {
 	featureInstance?: FieldPolicy<any> | FieldReadFunction<any>,
 	flagged?: FieldPolicy<any> | FieldReadFunction<any>,
 	flags?: FieldPolicy<any> | FieldReadFunction<any>,
+	fullName?: FieldPolicy<any> | FieldReadFunction<any>,
 	id?: FieldPolicy<any> | FieldReadFunction<any>,
 	lastAcceptedRevisionEvent?: FieldPolicy<any> | FieldReadFunction<any>,
 	lastCommentEvent?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -911,7 +913,6 @@ export type GeneFieldPolicy = {
 	link?: FieldPolicy<any> | FieldReadFunction<any>,
 	myGeneInfoDetails?: FieldPolicy<any> | FieldReadFunction<any>,
 	name?: FieldPolicy<any> | FieldReadFunction<any>,
-	officialName?: FieldPolicy<any> | FieldReadFunction<any>,
 	revisions?: FieldPolicy<any> | FieldReadFunction<any>,
 	sources?: FieldPolicy<any> | FieldReadFunction<any>,
 	variants?: FieldPolicy<any> | FieldReadFunction<any>
diff --git a/client/src/app/generated/civic.apollo.ts b/client/src/app/generated/civic.apollo.ts
index 8f164dc25..5977d9ee9 100644
--- a/client/src/app/generated/civic.apollo.ts
+++ b/client/src/app/generated/civic.apollo.ts
@@ -1850,6 +1850,7 @@ export type Feature = EventSubject & Flaggable & {
   flagged: Scalars['Boolean'];
   /** List and filter flags. */
   flags: FlagConnection;
+  fullName?: Maybe<Scalars['String']>;
   id: Scalars['Int'];
   link: Scalars['String'];
   name: Scalars['String'];
@@ -2107,6 +2108,7 @@ export type Gene = Commentable & EventSubject & Flaggable & MolecularProfileComp
   flagged: Scalars['Boolean'];
   /** List and filter flags. */
   flags: FlagConnection;
+  fullName?: Maybe<Scalars['String']>;
   id: Scalars['Int'];
   lastAcceptedRevisionEvent?: Maybe<Event>;
   lastCommentEvent?: Maybe<Event>;
@@ -2114,7 +2116,6 @@ export type Gene = Commentable & EventSubject & Flaggable & MolecularProfileComp
   link: Scalars['String'];
   myGeneInfoDetails?: Maybe<Scalars['JSON']>;
   name: Scalars['String'];
-  officialName: Scalars['String'];
   /** List and filter revisions. */
   revisions: RevisionConnection;
   sources: Array<Source>;
@@ -6275,9 +6276,9 @@ export type FeaturePopoverQueryVariables = Exact<{
 }>;
 
 
-export type FeaturePopoverQuery = { __typename: 'Query', feature?: { __typename: 'Feature', id: number, name: string, featureAliases: Array<string>, featureInstance: { __typename: 'Gene', officialName: string }, variants: { __typename: 'VariantConnection', totalCount: number }, flags: { __typename: 'FlagConnection', totalCount: number } } | undefined };
+export type FeaturePopoverQuery = { __typename: 'Query', feature?: { __typename: 'Feature', id: number, name: string, featureAliases: Array<string>, featureInstance: { __typename: 'Gene' }, variants: { __typename: 'VariantConnection', totalCount: number }, flags: { __typename: 'FlagConnection', totalCount: number } } | undefined };
 
-export type FeaturePopoverFragment = { __typename: 'Feature', id: number, name: string, featureAliases: Array<string>, featureInstance: { __typename: 'Gene', officialName: string }, variants: { __typename: 'VariantConnection', totalCount: number }, flags: { __typename: 'FlagConnection', totalCount: number } };
+export type FeaturePopoverFragment = { __typename: 'Feature', id: number, name: string, featureAliases: Array<string>, featureInstance: { __typename: 'Gene' }, variants: { __typename: 'VariantConnection', totalCount: number }, flags: { __typename: 'FlagConnection', totalCount: number } };
 
 export type BrowseFeaturesQueryVariables = Exact<{
   featureName?: InputMaybe<Scalars['String']>;
@@ -6329,9 +6330,9 @@ export type GenePopoverQueryVariables = Exact<{
 }>;
 
 
-export type GenePopoverQuery = { __typename: 'Query', gene?: { __typename: 'Gene', id: number, name: string, officialName: string, featureAliases: Array<string>, variants: { __typename: 'VariantConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, flags: { __typename: 'FlagConnection', totalCount: number } } | undefined };
+export type GenePopoverQuery = { __typename: 'Query', gene?: { __typename: 'Gene', id: number, name: string, fullName?: string | undefined, featureAliases: Array<string>, variants: { __typename: 'VariantConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, flags: { __typename: 'FlagConnection', totalCount: number } } | undefined };
 
-export type GenePopoverFragment = { __typename: 'Gene', id: number, name: string, officialName: string, featureAliases: Array<string>, variants: { __typename: 'VariantConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, flags: { __typename: 'FlagConnection', totalCount: number } };
+export type GenePopoverFragment = { __typename: 'Gene', id: number, name: string, fullName?: string | undefined, featureAliases: Array<string>, variants: { __typename: 'VariantConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, flags: { __typename: 'FlagConnection', totalCount: number } };
 
 export type BrowseGenesQueryVariables = Exact<{
   entrezSymbol?: InputMaybe<Scalars['String']>;
@@ -7587,36 +7588,36 @@ export type FeatureDetailQueryVariables = Exact<{
 }>;
 
 
-export type FeatureDetailQuery = { __typename: 'Query', feature?: { __typename: 'Feature', id: number, name: string, featureInstance: { __typename: 'Gene', officialName: string }, flags: { __typename: 'FlagConnection', totalCount: number } } | undefined };
+export type FeatureDetailQuery = { __typename: 'Query', feature?: { __typename: 'Feature', id: number, name: string, fullName?: string | undefined, featureInstance: { __typename: 'Gene' }, flags: { __typename: 'FlagConnection', totalCount: number } } | undefined };
 
-export type FeatureDetailFieldsFragment = { __typename: 'Feature', id: number, name: string, featureInstance: { __typename: 'Gene', officialName: string }, flags: { __typename: 'FlagConnection', totalCount: number } };
+export type FeatureDetailFieldsFragment = { __typename: 'Feature', id: number, name: string, fullName?: string | undefined, featureInstance: { __typename: 'Gene' }, flags: { __typename: 'FlagConnection', totalCount: number } };
 
 export type FeaturesSummaryQueryVariables = Exact<{
   featureId: Scalars['Int'];
 }>;
 
 
-export type FeaturesSummaryQuery = { __typename: 'Query', feature?: { __typename: 'Feature', id: number, name: string, featureInstance: { __typename: 'Gene', id: number, description: string, featureAliases: Array<string>, name: string, entrezId: number, officialName: string, myGeneInfoDetails?: any | undefined, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceUrl?: string | undefined, displayType: string, sourceType: SourceSource }> } } | undefined };
+export type FeaturesSummaryQuery = { __typename: 'Query', feature?: { __typename: 'Feature', id: number, name: string, fullName?: string | undefined, featureInstance: { __typename: 'Gene', id: number, description: string, featureAliases: Array<string>, name: string, entrezId: number, myGeneInfoDetails?: any | undefined, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceUrl?: string | undefined, displayType: string, sourceType: SourceSource }> } } | undefined };
 
-export type FeatureSummaryFieldsFragment = { __typename: 'Feature', id: number, name: string, featureInstance: { __typename: 'Gene', id: number, description: string, featureAliases: Array<string>, name: string, entrezId: number, officialName: string, myGeneInfoDetails?: any | undefined, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceUrl?: string | undefined, displayType: string, sourceType: SourceSource }> } };
+export type FeatureSummaryFieldsFragment = { __typename: 'Feature', id: number, name: string, fullName?: string | undefined, featureInstance: { __typename: 'Gene', id: number, description: string, featureAliases: Array<string>, name: string, entrezId: number, myGeneInfoDetails?: any | undefined, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceUrl?: string | undefined, displayType: string, sourceType: SourceSource }> } };
 
 export type GeneDetailQueryVariables = Exact<{
   geneId: Scalars['Int'];
 }>;
 
 
-export type GeneDetailQuery = { __typename: 'Query', gene?: { __typename: 'Gene', id: number, name: string, officialName: string, entrezId: number, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number } } | undefined };
+export type GeneDetailQuery = { __typename: 'Query', gene?: { __typename: 'Gene', id: number, name: string, fullName?: string | undefined, entrezId: number, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number } } | undefined };
 
-export type GeneDetailFieldsFragment = { __typename: 'Gene', id: number, name: string, officialName: string, entrezId: number, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number } };
+export type GeneDetailFieldsFragment = { __typename: 'Gene', id: number, name: string, fullName?: string | undefined, entrezId: number, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number } };
 
 export type GenesSummaryQueryVariables = Exact<{
   geneId: Scalars['Int'];
 }>;
 
 
-export type GenesSummaryQuery = { __typename: 'Query', gene?: { __typename: 'Gene', description: string, entrezId: number, featureAliases: Array<string>, id: number, name: string, officialName: string, myGeneInfoDetails?: any | undefined, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceUrl?: string | undefined, displayType: string, sourceType: SourceSource }> } | undefined };
+export type GenesSummaryQuery = { __typename: 'Query', gene?: { __typename: 'Gene', description: string, entrezId: number, featureAliases: Array<string>, id: number, name: string, myGeneInfoDetails?: any | undefined, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceUrl?: string | undefined, displayType: string, sourceType: SourceSource }> } | undefined };
 
-export type GeneSummaryFieldsFragment = { __typename: 'Gene', description: string, entrezId: number, featureAliases: Array<string>, id: number, name: string, officialName: string, myGeneInfoDetails?: any | undefined, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceUrl?: string | undefined, displayType: string, sourceType: SourceSource }> };
+export type GeneSummaryFieldsFragment = { __typename: 'Gene', description: string, entrezId: number, featureAliases: Array<string>, id: number, name: string, myGeneInfoDetails?: any | undefined, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceUrl?: string | undefined, displayType: string, sourceType: SourceSource }> };
 
 export type MolecularProfileDetailQueryVariables = Exact<{
   mpId: Scalars['Int'];
@@ -8306,9 +8307,7 @@ export const FeaturePopoverFragmentDoc = gql`
   id
   name
   featureInstance {
-    ... on Gene {
-      officialName
-    }
+    __typename
   }
   featureAliases
   variants {
@@ -8433,7 +8432,7 @@ export const GenePopoverFragmentDoc = gql`
     fragment genePopover on Gene {
   id
   name
-  officialName
+  fullName
   featureAliases
   variants {
     totalCount
@@ -9826,10 +9825,9 @@ export const FeatureDetailFieldsFragmentDoc = gql`
     fragment FeatureDetailFields on Feature {
   id
   name
+  fullName
   featureInstance {
-    ... on Gene {
-      officialName
-    }
+    __typename
   }
   flags(state: OPEN) {
     totalCount
@@ -9840,6 +9838,7 @@ export const FeatureSummaryFieldsFragmentDoc = gql`
     fragment FeatureSummaryFields on Feature {
   id
   name
+  fullName
   featureInstance {
     __typename
     ... on Gene {
@@ -9856,7 +9855,6 @@ export const FeatureSummaryFieldsFragmentDoc = gql`
         sourceType
       }
       entrezId
-      officialName
       myGeneInfoDetails
     }
   }
@@ -9866,7 +9864,7 @@ export const GeneDetailFieldsFragmentDoc = gql`
     fragment GeneDetailFields on Gene {
   id
   name
-  officialName
+  fullName
   entrezId
   flags(state: OPEN) {
     totalCount
@@ -9886,7 +9884,6 @@ export const GeneSummaryFieldsFragmentDoc = gql`
   featureAliases
   id
   name
-  officialName
   sources {
     id
     citation
diff --git a/client/src/app/generated/server.model.graphql b/client/src/app/generated/server.model.graphql
index 8b59e045f..6b75e6da7 100644
--- a/client/src/app/generated/server.model.graphql
+++ b/client/src/app/generated/server.model.graphql
@@ -2997,6 +2997,7 @@ type Feature implements EventSubject & Flaggable {
     """
     state: FlagState
   ): FlagConnection!
+  fullName: String
   id: Int!
   link: String!
   name: String!
@@ -3515,6 +3516,7 @@ type Gene implements Commentable & EventSubject & Flaggable & MolecularProfileCo
     """
     state: FlagState
   ): FlagConnection!
+  fullName: String
   id: Int!
   lastAcceptedRevisionEvent: Event
   lastCommentEvent: Event
@@ -3522,7 +3524,6 @@ type Gene implements Commentable & EventSubject & Flaggable & MolecularProfileCo
   link: String!
   myGeneInfoDetails: JSON
   name: String!
-  officialName: String!
 
   """
   List and filter revisions.
diff --git a/client/src/app/generated/server.schema.json b/client/src/app/generated/server.schema.json
index c64ef050d..8de573712 100644
--- a/client/src/app/generated/server.schema.json
+++ b/client/src/app/generated/server.schema.json
@@ -14879,6 +14879,18 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "fullName",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "id",
               "description": null,
@@ -16974,6 +16986,18 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "fullName",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "id",
               "description": null,
@@ -17070,22 +17094,6 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
-            {
-              "name": "officialName",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
             {
               "name": "revisions",
               "description": "List and filter revisions.",
diff --git a/client/src/app/views/features/features-detail/features-detail.query.gql b/client/src/app/views/features/features-detail/features-detail.query.gql
index f4f15ebcb..eae9a7674 100644
--- a/client/src/app/views/features/features-detail/features-detail.query.gql
+++ b/client/src/app/views/features/features-detail/features-detail.query.gql
@@ -7,10 +7,9 @@ query FeatureDetail($featureId: Int!) {
 fragment FeatureDetailFields on Feature {
   id
   name
+  fullName
   featureInstance {
-    ... on Gene {
-      officialName
-    }
+    __typename
   }
   flags(state: OPEN) {
     totalCount
diff --git a/client/src/app/views/features/features-detail/features-detail.view.html b/client/src/app/views/features/features-detail/features-detail.view.html
index 79c517669..c0661f87e 100644
--- a/client/src/app/views/features/features-detail/features-detail.view.html
+++ b/client/src/app/views/features/features-detail/features-detail.view.html
@@ -1,5 +1,6 @@
 <ng-container *ngIf="feature$ | async as feature">
-  <cvc-section-navigation [displayName]="feature.name"> </cvc-section-navigation>
+  <cvc-section-navigation [displayName]="feature.name">
+  </cvc-section-navigation>
   <div
     cvcFlaggable
     [flags]="flagsTotal$ | ngrxPush">
@@ -18,8 +19,8 @@
 
       <!-- subtitle -->
       <nz-page-header-subtitle>
-        <ng-container *ngIf="feature.featureInstance.__typename == 'Gene'">
-          {{ feature.featureInstance.officialName }}
+        <ng-container *ngIf="feature.fullName">
+          {{ feature.fullName }}
         </ng-container>
       </nz-page-header-subtitle>
 
diff --git a/client/src/app/views/features/features-detail/features-summary/features-summary.query.gql b/client/src/app/views/features/features-detail/features-summary/features-summary.query.gql
index 375e9a002..60ee3e0d5 100644
--- a/client/src/app/views/features/features-detail/features-summary/features-summary.query.gql
+++ b/client/src/app/views/features/features-detail/features-summary/features-summary.query.gql
@@ -7,6 +7,7 @@ query FeaturesSummary($featureId: Int!) {
 fragment FeatureSummaryFields on Feature{
   id
   name
+  fullName
   featureInstance {
     __typename
     ... on Gene {
@@ -23,7 +24,6 @@ fragment FeatureSummaryFields on Feature{
         sourceType
       }
       entrezId
-      officialName
       myGeneInfoDetails
     }
   }
diff --git a/client/src/app/views/features/features-revise/features-revise.view.html b/client/src/app/views/features/features-revise/features-revise.view.html
index af88f2d5b..ce54f13e6 100644
--- a/client/src/app/views/features/features-revise/features-revise.view.html
+++ b/client/src/app/views/features/features-revise/features-revise.view.html
@@ -14,7 +14,7 @@
     </nz-page-header-title>
 
     <!-- subtitle -->
-    <nz-page-header-subtitle> {{ gene.officialName }} </nz-page-header-subtitle>
+    <nz-page-header-subtitle> {{ gene.fullName }} </nz-page-header-subtitle>
 
     <nz-page-header-content>
       <div class="content">
diff --git a/client/src/app/views/genes/genes-detail/genes-detail.query.gql b/client/src/app/views/genes/genes-detail/genes-detail.query.gql
index e8f27ac36..ce34b8ec8 100644
--- a/client/src/app/views/genes/genes-detail/genes-detail.query.gql
+++ b/client/src/app/views/genes/genes-detail/genes-detail.query.gql
@@ -7,7 +7,7 @@ query GeneDetail($geneId: Int!) {
 fragment GeneDetailFields on Gene {
   id
   name
-  officialName
+  fullName
   entrezId
   flags(state: OPEN) {
     totalCount
diff --git a/client/src/app/views/genes/genes-detail/genes-detail.view.html b/client/src/app/views/genes/genes-detail/genes-detail.view.html
index c2f4a30d6..527e6d5d9 100644
--- a/client/src/app/views/genes/genes-detail/genes-detail.view.html
+++ b/client/src/app/views/genes/genes-detail/genes-detail.view.html
@@ -17,9 +17,7 @@
       </nz-page-header-title>
 
       <!-- subtitle -->
-      <nz-page-header-subtitle>
-        {{ gene.officialName }}
-      </nz-page-header-subtitle>
+      <nz-page-header-subtitle> {{ gene.fullName }} </nz-page-header-subtitle>
 
       <!-- header action btns, actions menu -->
       <nz-page-header-extra *ngrxLet="viewer$ as viewer">
diff --git a/client/src/app/views/genes/genes-detail/genes-summary/genes-summary.query.gql b/client/src/app/views/genes/genes-detail/genes-summary/genes-summary.query.gql
index 638c2441f..e0f2a25dc 100644
--- a/client/src/app/views/genes/genes-detail/genes-summary/genes-summary.query.gql
+++ b/client/src/app/views/genes/genes-detail/genes-summary/genes-summary.query.gql
@@ -10,7 +10,6 @@ fragment GeneSummaryFields on Gene {
   featureAliases
   id
   name
-  officialName
   sources {
     id
     citation
diff --git a/client/src/app/views/genes/genes-revise/genes-revise.view.html b/client/src/app/views/genes/genes-revise/genes-revise.view.html
index af88f2d5b..ce54f13e6 100644
--- a/client/src/app/views/genes/genes-revise/genes-revise.view.html
+++ b/client/src/app/views/genes/genes-revise/genes-revise.view.html
@@ -14,7 +14,7 @@
     </nz-page-header-title>
 
     <!-- subtitle -->
-    <nz-page-header-subtitle> {{ gene.officialName }} </nz-page-header-subtitle>
+    <nz-page-header-subtitle> {{ gene.fullName }} </nz-page-header-subtitle>
 
     <nz-page-header-content>
       <div class="content">
diff --git a/server/app/graphql/types/entities/feature_type.rb b/server/app/graphql/types/entities/feature_type.rb
index 40cd6129d..0181e7290 100644
--- a/server/app/graphql/types/entities/feature_type.rb
+++ b/server/app/graphql/types/entities/feature_type.rb
@@ -7,6 +7,7 @@ class FeatureType < Types::BaseObject
 
     field :id, Int, null: false
     field :name, String, null: false
+    field :full_name, String, null: true
     field :description, String, null: false
     field :feature_aliases, [String], null: false
     field :sources, [Types::Entities::SourceType], null: false
@@ -14,10 +15,6 @@ class FeatureType < Types::BaseObject
     field :link, String, null: false
     field :feature_instance, Types::FeatureInstanceType, null: false
 
-    #orphan_types(
-    #  Types::Entities::GeneType
-    #)
-
     def id
       object.id
     end
diff --git a/server/app/graphql/types/entities/gene_type.rb b/server/app/graphql/types/entities/gene_type.rb
index 5fb76f4cd..9bb0a04a5 100644
--- a/server/app/graphql/types/entities/gene_type.rb
+++ b/server/app/graphql/types/entities/gene_type.rb
@@ -5,7 +5,6 @@ class GeneType < Types::Entities::FeatureType
     implements Types::Interfaces::MolecularProfileComponent
 
     field :entrez_id, Int, null: false
-    field :official_name, String, null: false
     field :my_gene_info_details, GraphQL::Types::JSON, null: true
 
     def my_gene_info_details
diff --git a/server/app/models/concerns/is_feature_instance.rb b/server/app/models/concerns/is_feature_instance.rb
index f24bf7fc8..7798728c6 100644
--- a/server/app/models/concerns/is_feature_instance.rb
+++ b/server/app/models/concerns/is_feature_instance.rb
@@ -6,6 +6,7 @@ module IsFeatureInstance
 
     delegate :name, to: :feature
     delegate :description, to: :feature
+    delegate :full_name, to: :feature
     delegate :feature_aliases, to: :feature
     delegate :sources, to: :feature
     delegate :source_ids, to: :feature
diff --git a/server/db/migrate/20231220164444_add_full_name_to_features.rb b/server/db/migrate/20231220164444_add_full_name_to_features.rb
new file mode 100644
index 000000000..0d7b26fdf
--- /dev/null
+++ b/server/db/migrate/20231220164444_add_full_name_to_features.rb
@@ -0,0 +1,14 @@
+class AddFullNameToFeatures < ActiveRecord::Migration[6.1]
+  def up
+    add_column :features, :full_name, :text, index: true
+
+    Features::Gene.find_each do |g|
+      g.feature.full_name = g.official_name
+      g.feature.save!
+    end
+  end
+
+  def down
+    remove_column :features, :full_name
+  end
+end
diff --git a/server/db/schema.rb b/server/db/schema.rb
index 4f5382c4b..9cf6418e0 100644
--- a/server/db/schema.rb
+++ b/server/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2023_12_15_180038) do
+ActiveRecord::Schema.define(version: 2023_12_20_164444) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -465,6 +465,7 @@
     t.string "feature_instance_type", null: false
     t.bigint "feature_instance_id", null: false
     t.boolean "flagged", default: false, null: false
+    t.text "full_name"
     t.index ["feature_instance_type", "feature_instance_id"], name: "index_features_on_feature_instance"
   end
 
@@ -711,7 +712,6 @@
     t.integer "source_type", null: false
     t.integer "asco_abstract_id"
     t.text "asco_presenter"
-    #t.boolean "fully_curated", default: false, null: false
     t.text "status", default: "fully_curated", null: false
     t.index ["asco_abstract_id"], name: "index_sources_on_asco_abstract_id"
     t.index ["asco_presenter"], name: "index_sources_on_asco_presenter"

From 802bfd4572fd8163d73339d4398576c6105fe5c9 Mon Sep 17 00:00:00 2001
From: Adam Coffman <acoffman@wustl.edu>
Date: Wed, 20 Dec 2023 12:56:12 -0600
Subject: [PATCH 024/125] update entrez importer to work with features

---
 server/Gemfile                            |  3 ++
 server/Gemfile.lock                       |  6 ++++
 server/app/lib/importer/entrez_symbols.rb | 35 +++++++++++++++++------
 3 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/server/Gemfile b/server/Gemfile
index ef52f1618..e111db4db 100644
--- a/server/Gemfile
+++ b/server/Gemfile
@@ -28,6 +28,9 @@ gem 'search_object_graphql', '0.3.1'
 
 gem 'scenic', '~>1.5.4'
 
+#entrez symbol downloads
+gem 'net-ftp', '~>0.3.3'
+
 #higher performance json encoding
 gem 'oj', '~> 3.13.10'
 
diff --git a/server/Gemfile.lock b/server/Gemfile.lock
index 973bcf9a4..6bd733ec6 100644
--- a/server/Gemfile.lock
+++ b/server/Gemfile.lock
@@ -235,6 +235,9 @@ GEM
     multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.3.0)
+    net-ftp (0.3.3)
+      net-protocol
+      time
     net-imap (0.3.7)
       date
       net-protocol
@@ -444,6 +447,8 @@ GEM
       net-ssh (>= 2.8.0)
     thor (1.2.2)
     tilt (2.3.0)
+    time (0.3.0)
+      date
     timeout (0.4.0)
     trestle (0.9.8)
       activemodel (>= 4.2.0)
@@ -505,6 +510,7 @@ DEPENDENCIES
   htmlentities (~> 4.3.4)
   image_processing (~> 1.12.2)
   listen (~> 3.3)
+  net-ftp (~> 0.3.3)
   obo (~> 0.1.5)
   oj (~> 3.13.10)
   omniauth (~> 2.0.2)
diff --git a/server/app/lib/importer/entrez_symbols.rb b/server/app/lib/importer/entrez_symbols.rb
index 577129ff2..d9b6f8978 100644
--- a/server/app/lib/importer/entrez_symbols.rb
+++ b/server/app/lib/importer/entrez_symbols.rb
@@ -32,24 +32,41 @@ def valid_line?(line)
     end
 
     def process_line(line)
-      gene = Gene.where(entrez_id: line['GeneID']).first_or_initialize
-      gene.name = line['Symbol_from_nomenclature_authority']
-      gene.official_name = line['description']
+      gene = Features::Gene.where(entrez_id: line['GeneID']).first_or_initialize
+
+      if gene.feature.nil?
+        feature = Feature.create!(
+          name: line['Symbol_from_nomenclature_authority'],
+          full_name: line['description'],
+          description: ''
+        )
+        gene.feature = feature
+        gene.save!
+      else
+        feature = gene.feature
+        feature.name = line['Symbol_from_nomenclature_authority']
+        feature.full_name = line['description']
+        feature.save!
+      end
+
       if line['Synonyms'].present?
         synonyms = line['Synonyms'].split('|').map do |synonym|
           if synonym.strip == '-'
             nil
           else
-            GeneAlias.where(name: synonym).first_or_create
+            Features::FeatureAlias.where(name: synonym).first_or_create
           end
         end.compact
-        synonyms << GeneAlias.where(name: line['Symbol']).first_or_create
-        gene.gene_aliases = synonyms.uniq
+        synonyms << Features::FeatureAlias.where(name: line['Symbol']).first_or_create
+        gene.feature.feature_aliases = synonyms.uniq
       end
-      if gene.description.blank?
-        gene.description = ''
+
+      if feature.description.blank?
+        feature.description = ''
       end
-      gene.save
+
+      gene.save!
+      feature.save!
     end
   end
 end

From 17f00d104c9b812595a5328e00485e11be450b9d Mon Sep 17 00:00:00 2001
From: Adam Coffman <acoffman@wustl.edu>
Date: Wed, 20 Dec 2023 13:04:21 -0600
Subject: [PATCH 025/125] add revisions and comments to feature connection,
 restore tab badges

---
 .../src/app/generated/civic.apollo-helpers.ts |   7 +-
 client/src/app/generated/civic.apollo.ts      |  51 ++-
 .../src/app/generated/civic.possible-types.ts |   3 +
 client/src/app/generated/server.model.graphql | 104 +++++-
 client/src/app/generated/server.schema.json   | 324 +++++++++++++++++-
 .../features-detail/features-detail.query.gql |  12 +-
 .../features-detail/features-detail.view.ts   |   6 +-
 .../graphql/types/entities/feature_type.rb    |   3 +
 .../app/graphql/types/entities/gene_type.rb   |   3 -
 9 files changed, 489 insertions(+), 24 deletions(-)

diff --git a/client/src/app/generated/civic.apollo-helpers.ts b/client/src/app/generated/civic.apollo-helpers.ts
index d21464051..be0a63f44 100644
--- a/client/src/app/generated/civic.apollo-helpers.ts
+++ b/client/src/app/generated/civic.apollo-helpers.ts
@@ -812,8 +812,9 @@ export type FdaCodeFieldPolicy = {
 	code?: FieldPolicy<any> | FieldReadFunction<any>,
 	description?: FieldPolicy<any> | FieldReadFunction<any>
 };
-export type FeatureKeySpecifier = ('description' | 'events' | 'featureAliases' | 'featureInstance' | 'flagged' | 'flags' | 'fullName' | 'id' | 'link' | 'name' | 'sources' | 'variants' | FeatureKeySpecifier)[];
+export type FeatureKeySpecifier = ('comments' | 'description' | 'events' | 'featureAliases' | 'featureInstance' | 'flagged' | 'flags' | 'fullName' | 'id' | 'lastAcceptedRevisionEvent' | 'lastCommentEvent' | 'lastSubmittedRevisionEvent' | 'link' | 'name' | 'revisions' | 'sources' | 'variants' | FeatureKeySpecifier)[];
 export type FeatureFieldPolicy = {
+	comments?: FieldPolicy<any> | FieldReadFunction<any>,
 	description?: FieldPolicy<any> | FieldReadFunction<any>,
 	events?: FieldPolicy<any> | FieldReadFunction<any>,
 	featureAliases?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -822,8 +823,12 @@ export type FeatureFieldPolicy = {
 	flags?: FieldPolicy<any> | FieldReadFunction<any>,
 	fullName?: FieldPolicy<any> | FieldReadFunction<any>,
 	id?: FieldPolicy<any> | FieldReadFunction<any>,
+	lastAcceptedRevisionEvent?: FieldPolicy<any> | FieldReadFunction<any>,
+	lastCommentEvent?: FieldPolicy<any> | FieldReadFunction<any>,
+	lastSubmittedRevisionEvent?: FieldPolicy<any> | FieldReadFunction<any>,
 	link?: FieldPolicy<any> | FieldReadFunction<any>,
 	name?: FieldPolicy<any> | FieldReadFunction<any>,
+	revisions?: FieldPolicy<any> | FieldReadFunction<any>,
 	sources?: FieldPolicy<any> | FieldReadFunction<any>,
 	variants?: FieldPolicy<any> | FieldReadFunction<any>
 };
diff --git a/client/src/app/generated/civic.apollo.ts b/client/src/app/generated/civic.apollo.ts
index 5977d9ee9..c946f4abc 100644
--- a/client/src/app/generated/civic.apollo.ts
+++ b/client/src/app/generated/civic.apollo.ts
@@ -1840,8 +1840,10 @@ export type FdaCode = {
 };
 
 /** The Feature that a Variant can belong to */
-export type Feature = EventSubject & Flaggable & {
+export type Feature = Commentable & EventSubject & Flaggable & MolecularProfileComponent & WithRevisions & {
   __typename: 'Feature';
+  /** List and filter comments. */
+  comments: CommentConnection;
   description: Scalars['String'];
   /** List and filter events for an object */
   events: EventConnection;
@@ -1852,14 +1854,33 @@ export type Feature = EventSubject & Flaggable & {
   flags: FlagConnection;
   fullName?: Maybe<Scalars['String']>;
   id: Scalars['Int'];
+  lastAcceptedRevisionEvent?: Maybe<Event>;
+  lastCommentEvent?: Maybe<Event>;
+  lastSubmittedRevisionEvent?: Maybe<Event>;
   link: Scalars['String'];
   name: Scalars['String'];
+  /** List and filter revisions. */
+  revisions: RevisionConnection;
   sources: Array<Source>;
   /** List and filter variants. */
   variants: VariantConnection;
 };
 
 
+/** The Feature that a Variant can belong to */
+export type FeatureCommentsArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  first?: InputMaybe<Scalars['Int']>;
+  last?: InputMaybe<Scalars['Int']>;
+  mentionedEntity?: InputMaybe<TaggableEntityInput>;
+  mentionedRole?: InputMaybe<UserRole>;
+  mentionedUserId?: InputMaybe<Scalars['Int']>;
+  originatingUserId?: InputMaybe<Scalars['Int']>;
+  sortBy?: InputMaybe<DateSort>;
+};
+
+
 /** The Feature that a Variant can belong to */
 export type FeatureEventsArgs = {
   after?: InputMaybe<Scalars['String']>;
@@ -1886,6 +1907,20 @@ export type FeatureFlagsArgs = {
 };
 
 
+/** The Feature that a Variant can belong to */
+export type FeatureRevisionsArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  fieldName?: InputMaybe<Scalars['String']>;
+  first?: InputMaybe<Scalars['Int']>;
+  last?: InputMaybe<Scalars['Int']>;
+  originatingUserId?: InputMaybe<Scalars['Int']>;
+  revisionSetId?: InputMaybe<Scalars['Int']>;
+  sortBy?: InputMaybe<DateSort>;
+  status?: InputMaybe<RevisionStatus>;
+};
+
+
 /** The Feature that a Variant can belong to */
 export type FeatureVariantsArgs = {
   after?: InputMaybe<Scalars['String']>;
@@ -6163,9 +6198,9 @@ export type CommentPopoverQueryVariables = Exact<{
 }>;
 
 
-export type CommentPopoverQuery = { __typename: 'Query', comment?: { __typename: 'Comment', id: number, name: string, createdAt: any, title?: string | undefined, comment: string, commenter: { __typename: 'User', id: number, displayName: string, role: UserRole }, commentable: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, name: string, link: string } | { __typename: 'Source', id: number, name: string, link: string } | { __typename: 'SourcePopover', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | { __typename: 'VariantGroup', id: number, name: string, link: string } } | undefined };
+export type CommentPopoverQuery = { __typename: 'Query', comment?: { __typename: 'Comment', id: number, name: string, createdAt: any, title?: string | undefined, comment: string, commenter: { __typename: 'User', id: number, displayName: string, role: UserRole }, commentable: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, name: string, link: string } | { __typename: 'Source', id: number, name: string, link: string } | { __typename: 'SourcePopover', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | { __typename: 'VariantGroup', id: number, name: string, link: string } } | undefined };
 
-export type CommentPopoverFragment = { __typename: 'Comment', id: number, name: string, createdAt: any, title?: string | undefined, comment: string, commenter: { __typename: 'User', id: number, displayName: string, role: UserRole }, commentable: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, name: string, link: string } | { __typename: 'Source', id: number, name: string, link: string } | { __typename: 'SourcePopover', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | { __typename: 'VariantGroup', id: number, name: string, link: string } };
+export type CommentPopoverFragment = { __typename: 'Comment', id: number, name: string, createdAt: any, title?: string | undefined, comment: string, commenter: { __typename: 'User', id: number, displayName: string, role: UserRole }, commentable: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, name: string, link: string } | { __typename: 'Source', id: number, name: string, link: string } | { __typename: 'SourcePopover', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | { __typename: 'VariantGroup', id: number, name: string, link: string } };
 
 export type DiseasePopoverQueryVariables = Exact<{
   diseaseId: Scalars['Int'];
@@ -7588,9 +7623,9 @@ export type FeatureDetailQueryVariables = Exact<{
 }>;
 
 
-export type FeatureDetailQuery = { __typename: 'Query', feature?: { __typename: 'Feature', id: number, name: string, fullName?: string | undefined, featureInstance: { __typename: 'Gene' }, flags: { __typename: 'FlagConnection', totalCount: number } } | undefined };
+export type FeatureDetailQuery = { __typename: 'Query', feature?: { __typename: 'Feature', id: number, name: string, fullName?: string | undefined, featureInstance: { __typename: 'Gene' }, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number } } | undefined };
 
-export type FeatureDetailFieldsFragment = { __typename: 'Feature', id: number, name: string, fullName?: string | undefined, featureInstance: { __typename: 'Gene' }, flags: { __typename: 'FlagConnection', totalCount: number } };
+export type FeatureDetailFieldsFragment = { __typename: 'Feature', id: number, name: string, fullName?: string | undefined, featureInstance: { __typename: 'Gene' }, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number } };
 
 export type FeaturesSummaryQueryVariables = Exact<{
   featureId: Scalars['Int'];
@@ -9832,6 +9867,12 @@ export const FeatureDetailFieldsFragmentDoc = gql`
   flags(state: OPEN) {
     totalCount
   }
+  revisions(status: NEW) {
+    totalCount
+  }
+  comments {
+    totalCount
+  }
 }
     `;
 export const FeatureSummaryFieldsFragmentDoc = gql`
diff --git a/client/src/app/generated/civic.possible-types.ts b/client/src/app/generated/civic.possible-types.ts
index 38586e564..96c8dd514 100644
--- a/client/src/app/generated/civic.possible-types.ts
+++ b/client/src/app/generated/civic.possible-types.ts
@@ -32,6 +32,7 @@
     "Commentable": [
       "Assertion",
       "EvidenceItem",
+      "Feature",
       "Flag",
       "Gene",
       "MolecularProfile",
@@ -89,6 +90,7 @@
       "ScalarFieldDiff"
     ],
     "MolecularProfileComponent": [
+      "Feature",
       "Gene",
       "Variant"
     ],
@@ -100,6 +102,7 @@
     "WithRevisions": [
       "Assertion",
       "EvidenceItem",
+      "Feature",
       "Gene",
       "MolecularProfile",
       "Variant",
diff --git a/client/src/app/generated/server.model.graphql b/client/src/app/generated/server.model.graphql
index 6b75e6da7..4658999ea 100644
--- a/client/src/app/generated/server.model.graphql
+++ b/client/src/app/generated/server.model.graphql
@@ -2914,7 +2914,56 @@ type FdaCode {
 """
 The Feature that a Variant can belong to
 """
-type Feature implements EventSubject & Flaggable {
+type Feature implements Commentable & EventSubject & Flaggable & MolecularProfileComponent & WithRevisions {
+  """
+  List and filter comments.
+  """
+  comments(
+    """
+    Returns the elements in the list that come after the specified cursor.
+    """
+    after: String
+
+    """
+    Returns the elements in the list that come before the specified cursor.
+    """
+    before: String
+
+    """
+    Returns the first _n_ elements from the list.
+    """
+    first: Int
+
+    """
+    Returns the last _n_ elements from the list.
+    """
+    last: Int
+
+    """
+    Limit to comments that mention a certain entity
+    """
+    mentionedEntity: TaggableEntityInput
+
+    """
+    Limit to comments that mention a certain user role
+    """
+    mentionedRole: UserRole
+
+    """
+    Limit to comments that mention a certain user
+    """
+    mentionedUserId: Int
+
+    """
+    Limit to comments by a certain user
+    """
+    originatingUserId: Int
+
+    """
+    Sort order for the comments. Defaults to most recent.
+    """
+    sortBy: DateSort
+  ): CommentConnection!
   description: String!
 
   """
@@ -2999,8 +3048,61 @@ type Feature implements EventSubject & Flaggable {
   ): FlagConnection!
   fullName: String
   id: Int!
+  lastAcceptedRevisionEvent: Event
+  lastCommentEvent: Event
+  lastSubmittedRevisionEvent: Event
   link: String!
   name: String!
+
+  """
+  List and filter revisions.
+  """
+  revisions(
+    """
+    Returns the elements in the list that come after the specified cursor.
+    """
+    after: String
+
+    """
+    Returns the elements in the list that come before the specified cursor.
+    """
+    before: String
+
+    """
+    Limit to revisions on a particular field.
+    """
+    fieldName: String
+
+    """
+    Returns the first _n_ elements from the list.
+    """
+    first: Int
+
+    """
+    Returns the last _n_ elements from the list.
+    """
+    last: Int
+
+    """
+    Limit to revisions by a certain user
+    """
+    originatingUserId: Int
+
+    """
+    Limit to revisions suggested as part of a single Revision Set.
+    """
+    revisionSetId: Int
+
+    """
+    Sort order for the comments. Defaults to most recent.
+    """
+    sortBy: DateSort
+
+    """
+    Limit to revisions with a certain status
+    """
+    status: RevisionStatus
+  ): RevisionConnection!
   sources: [Source!]!
 
   """
diff --git a/client/src/app/generated/server.schema.json b/client/src/app/generated/server.schema.json
index 8de573712..72fefa825 100644
--- a/client/src/app/generated/server.schema.json
+++ b/client/src/app/generated/server.schema.json
@@ -9083,6 +9083,11 @@
               "name": "EvidenceItem",
               "ofType": null
             },
+            {
+              "kind": "OBJECT",
+              "name": "Feature",
+              "ofType": null
+            },
             {
               "kind": "OBJECT",
               "name": "Flag",
@@ -14581,6 +14586,131 @@
           "name": "Feature",
           "description": "The Feature that a Variant can belong to",
           "fields": [
+            {
+              "name": "comments",
+              "description": "List and filter comments.",
+              "args": [
+                {
+                  "name": "originatingUserId",
+                  "description": "Limit to comments by a certain user",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "sortBy",
+                  "description": "Sort order for the comments. Defaults to most recent.",
+                  "type": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "DateSort",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "mentionedUserId",
+                  "description": "Limit to comments that mention a certain user",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "mentionedRole",
+                  "description": "Limit to comments that mention a certain user role",
+                  "type": {
+                    "kind": "ENUM",
+                    "name": "UserRole",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "mentionedEntity",
+                  "description": "Limit to comments that mention a certain entity",
+                  "type": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "TaggableEntityInput",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "after",
+                  "description": "Returns the elements in the list that come after the specified cursor.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "before",
+                  "description": "Returns the elements in the list that come before the specified cursor.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "first",
+                  "description": "Returns the first _n_ elements from the list.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "last",
+                  "description": "Returns the last _n_ elements from the list.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                }
+              ],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "CommentConnection",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "description",
               "description": null,
@@ -14907,6 +15037,42 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "lastAcceptedRevisionEvent",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Event",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "lastCommentEvent",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Event",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "lastSubmittedRevisionEvent",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Event",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "link",
               "description": null,
@@ -14939,6 +15105,131 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "revisions",
+              "description": "List and filter revisions.",
+              "args": [
+                {
+                  "name": "originatingUserId",
+                  "description": "Limit to revisions by a certain user",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "status",
+                  "description": "Limit to revisions with a certain status",
+                  "type": {
+                    "kind": "ENUM",
+                    "name": "RevisionStatus",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "sortBy",
+                  "description": "Sort order for the comments. Defaults to most recent.",
+                  "type": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "DateSort",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "fieldName",
+                  "description": "Limit to revisions on a particular field.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "revisionSetId",
+                  "description": "Limit to revisions suggested as part of a single Revision Set.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "after",
+                  "description": "Returns the elements in the list that come after the specified cursor.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "before",
+                  "description": "Returns the elements in the list that come before the specified cursor.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "first",
+                  "description": "Returns the first _n_ elements from the list.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "last",
+                  "description": "Returns the last _n_ elements from the list.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                }
+              ],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "RevisionConnection",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "sources",
               "description": null,
@@ -15052,6 +15343,21 @@
               "kind": "INTERFACE",
               "name": "EventSubject",
               "ofType": null
+            },
+            {
+              "kind": "INTERFACE",
+              "name": "MolecularProfileComponent",
+              "ofType": null
+            },
+            {
+              "kind": "INTERFACE",
+              "name": "Commentable",
+              "ofType": null
+            },
+            {
+              "kind": "INTERFACE",
+              "name": "WithRevisions",
+              "ofType": null
             }
           ],
           "enumValues": null,
@@ -17325,12 +17631,12 @@
           "interfaces": [
             {
               "kind": "INTERFACE",
-              "name": "Commentable",
+              "name": "Flaggable",
               "ofType": null
             },
             {
               "kind": "INTERFACE",
-              "name": "WithRevisions",
+              "name": "EventSubject",
               "ofType": null
             },
             {
@@ -17340,12 +17646,12 @@
             },
             {
               "kind": "INTERFACE",
-              "name": "Flaggable",
+              "name": "Commentable",
               "ofType": null
             },
             {
               "kind": "INTERFACE",
-              "name": "EventSubject",
+              "name": "WithRevisions",
               "ofType": null
             }
           ],
@@ -21436,6 +21742,11 @@
           "interfaces": null,
           "enumValues": null,
           "possibleTypes": [
+            {
+              "kind": "OBJECT",
+              "name": "Feature",
+              "ofType": null
+            },
             {
               "kind": "OBJECT",
               "name": "Gene",
@@ -44672,6 +44983,11 @@
               "name": "EvidenceItem",
               "ofType": null
             },
+            {
+              "kind": "OBJECT",
+              "name": "Feature",
+              "ofType": null
+            },
             {
               "kind": "OBJECT",
               "name": "Gene",
diff --git a/client/src/app/views/features/features-detail/features-detail.query.gql b/client/src/app/views/features/features-detail/features-detail.query.gql
index eae9a7674..9c98357b8 100644
--- a/client/src/app/views/features/features-detail/features-detail.query.gql
+++ b/client/src/app/views/features/features-detail/features-detail.query.gql
@@ -14,10 +14,10 @@ fragment FeatureDetailFields on Feature {
   flags(state: OPEN) {
     totalCount
   }
-  # revisions(status: NEW) {
-  #   totalCount
-  # }
-  # comments {
-  #   totalCount
-  # }
+   revisions(status: NEW) {
+     totalCount
+   }
+   comments {
+     totalCount
+   }
 }
diff --git a/client/src/app/views/features/features-detail/features-detail.view.ts b/client/src/app/views/features/features-detail/features-detail.view.ts
index ef2615c61..79b356b29 100644
--- a/client/src/app/views/features/features-detail/features-detail.view.ts
+++ b/client/src/app/views/features/features-detail/features-detail.view.ts
@@ -81,8 +81,7 @@ export class FeaturesDetailView implements OnDestroy {
               this.defaultTabs.map((tab) => {
                 if (tab.tabLabel === 'Revisions') {
                   return {
-                    // badgeCount: featureResp?.revisions.totalCount,
-                    badgeCount: 0,
+                    badgeCount: featureResp?.revisions.totalCount,
                     ...tab,
                   }
                 } else if (tab.tabLabel === 'Flags') {
@@ -92,8 +91,7 @@ export class FeaturesDetailView implements OnDestroy {
                   }
                 } else if (tab.tabLabel === 'Comments') {
                   return {
-                    //badgeCount: featureResp?.comments.totalCount,
-                    badgeCount: 0,
+                    badgeCount: featureResp?.comments.totalCount,
                     badgeColor: '#cccccc',
                     ...tab,
                   }
diff --git a/server/app/graphql/types/entities/feature_type.rb b/server/app/graphql/types/entities/feature_type.rb
index 0181e7290..6cbc9cf9c 100644
--- a/server/app/graphql/types/entities/feature_type.rb
+++ b/server/app/graphql/types/entities/feature_type.rb
@@ -2,6 +2,9 @@ module Types::Entities
   class FeatureType < Types::BaseObject
     implements Types::Interfaces::Flaggable
     implements Types::Interfaces::EventSubject
+    implements Types::Interfaces::MolecularProfileComponent
+    implements Types::Interfaces::Commentable
+    implements Types::Interfaces::WithRevisions
 
     description 'The Feature that a Variant can belong to'
 
diff --git a/server/app/graphql/types/entities/gene_type.rb b/server/app/graphql/types/entities/gene_type.rb
index 9bb0a04a5..d9a9be0ca 100644
--- a/server/app/graphql/types/entities/gene_type.rb
+++ b/server/app/graphql/types/entities/gene_type.rb
@@ -1,8 +1,5 @@
 module Types::Entities
   class GeneType < Types::Entities::FeatureType
-    implements Types::Interfaces::Commentable
-    implements Types::Interfaces::WithRevisions
-    implements Types::Interfaces::MolecularProfileComponent
 
     field :entrez_id, Int, null: false
     field :my_gene_info_details, GraphQL::Types::JSON, null: true

From f04418b36f8bf0dfc92d017a7de3ace3ebe5020e Mon Sep 17 00:00:00 2001
From: Adam Coffman <acoffman@wustl.edu>
Date: Wed, 20 Dec 2023 14:33:50 -0600
Subject: [PATCH 026/125] dont refresh views automatically in dev

---
 server/app/jobs/refresh_single_view.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/app/jobs/refresh_single_view.rb b/server/app/jobs/refresh_single_view.rb
index 68bee45cd..3c3fb803a 100644
--- a/server/app/jobs/refresh_single_view.rb
+++ b/server/app/jobs/refresh_single_view.rb
@@ -1,7 +1,7 @@
 class RefreshSingleView < ApplicationJob
   def perform(klass)
     if klass < MaterializedViews::MaterializedView
-      klass.refresh
+      klass.refresh if !Rails.env.development?
     end
   end
 end

From 932274070d2a879c1cea2b7e6feb81b9336e5bbe Mon Sep 17 00:00:00 2001
From: Adam Coffman <acoffman@wustl.edu>
Date: Wed, 20 Dec 2023 14:34:41 -0600
Subject: [PATCH 027/125] begin porting gene select to feature select. variant
 quick add also working with features

---
 .../entity-tag/entity-tag.queries.gql         |   8 ++
 .../variant-submit/variant-submit.form.ts     |  14 +--
 .../app/forms/models/evidence-fields.model.ts |   2 +-
 .../app/forms/models/evidence-revise.model.ts |   2 +-
 .../app/forms/models/evidence-submit.model.ts |   2 +-
 client/src/app/forms/states/evidence.state.ts |   4 +-
 .../layout-tests/layout-forms.config.ts       |   8 +-
 .../types/gene-select/gene-select.query.gql   |  21 ++--
 .../types/gene-select/gene-select.type.html   |   2 +-
 .../types/gene-select/gene-select.type.ts     |  60 ++++-----
 .../mp-finder/mp-finder.component.ts          |  16 +--
 .../variant-quick-add.form.ts                 |  44 +++----
 .../variant-quick-add.query.gql               |   4 +-
 .../variant-select/variant-select.query.gql   |   4 +-
 .../variant-select/variant-select.type.html   |  12 +-
 .../variant-select/variant-select.type.ts     |  82 ++++++-------
 .../src/app/generated/civic.apollo-helpers.ts |   4 +-
 client/src/app/generated/civic.apollo.ts      | 116 ++++++++++++------
 client/src/app/generated/server.model.graphql |  18 +--
 client/src/app/generated/server.schema.json   | 115 ++++++++++-------
 .../app/graphql/mutations/create_variant.rb   |  18 +--
 .../graphql/types/feature_instance_types.rb   |   5 +
 .../types/queries/typeahead_queries.rb        |  24 ++--
 server/app/lib/importer/entrez_symbols.rb     |   6 +-
 server/app/models/actions/create_variant.rb   |   5 +-
 .../app/models/activities/create_variant.rb   |   8 +-
 26 files changed, 353 insertions(+), 251 deletions(-)
 create mode 100644 server/app/graphql/types/feature_instance_types.rb

diff --git a/client/src/app/forms/components/entity-tag/entity-tag.queries.gql b/client/src/app/forms/components/entity-tag/entity-tag.queries.gql
index b7ca326bb..efb6ecdee 100644
--- a/client/src/app/forms/components/entity-tag/entity-tag.queries.gql
+++ b/client/src/app/forms/components/entity-tag/entity-tag.queries.gql
@@ -21,3 +21,11 @@ query LinkableTherapy($therapyId: Int!) {
     link
   }
 }
+
+query LinkableFeature($featureId: Int!) {
+  feature(id: $featureId) {
+    id
+    name
+    link
+  }
+}
diff --git a/client/src/app/forms/config/variant-submit/variant-submit.form.ts b/client/src/app/forms/config/variant-submit/variant-submit.form.ts
index ab69985c6..487a6ba1d 100644
--- a/client/src/app/forms/config/variant-submit/variant-submit.form.ts
+++ b/client/src/app/forms/config/variant-submit/variant-submit.form.ts
@@ -15,7 +15,7 @@ import { Apollo, gql } from 'apollo-angular'
 import { CvcFormRowWrapperProps } from '@app/forms/wrappers/form-row/form-row.wrapper'
 
 type VariantSubmitModel = {
-  geneId?: number
+  featureId?: number
   variantId?: number
 }
 
@@ -44,7 +44,7 @@ export class VariantSubmitForm {
   finderState: VariantSubmitState = {
     formLayout: this.layout,
     fields: {
-      geneId$: new BehaviorSubject<Maybe<number>>(undefined),
+      featureId$: new BehaviorSubject<Maybe<number>>(undefined),
       variantId$: new BehaviorSubject<Maybe<number>>(undefined),
     },
   }
@@ -52,7 +52,7 @@ export class VariantSubmitForm {
 
   constructor(private apollo: Apollo) {
     this.form = new UntypedFormGroup({})
-    this.model = { geneId: undefined, variantId: undefined }
+    this.model = { featureId: undefined, variantId: undefined }
     this.options = { formState: this.finderState }
 
     this.config = [
@@ -65,10 +65,10 @@ export class VariantSubmitForm {
         },
         fieldGroup: [
           {
-            key: 'geneId',
+            key: 'featureId',
             type: 'gene-select',
             props: {
-              placeholder: `Select New Variant's Gene`,
+              placeholder: `Select New Variant's Feature`,
               layout: {
                 showExtra: false,
               },
@@ -80,7 +80,7 @@ export class VariantSubmitForm {
             type: 'variant-select',
             props: {
               placeholder: 'Enter New Variant Name',
-              requireGene: true,
+              requireFeature: true,
               layout: {
                 showExtra: false,
               },
@@ -98,7 +98,7 @@ export class VariantSubmitForm {
     const variant = this.getSelectedVariant(model.variantId)
     if (variant) {
       this.model = {
-        geneId: undefined,
+        featureId: undefined,
         variantId: undefined,
       }
       this.onVariantSelected.next(variant)
diff --git a/client/src/app/forms/models/evidence-fields.model.ts b/client/src/app/forms/models/evidence-fields.model.ts
index 26d123c31..ccd0003ac 100644
--- a/client/src/app/forms/models/evidence-fields.model.ts
+++ b/client/src/app/forms/models/evidence-fields.model.ts
@@ -9,7 +9,7 @@ import {
 
 export type EvidenceItemFields = {
   // gene, variant included for initial input type development
-  geneId?: number
+  featureId?: number
   variantId?: number
   significance?: EvidenceSignificance
   description?: string
diff --git a/client/src/app/forms/models/evidence-revise.model.ts b/client/src/app/forms/models/evidence-revise.model.ts
index 5db05349f..41bdccf13 100644
--- a/client/src/app/forms/models/evidence-revise.model.ts
+++ b/client/src/app/forms/models/evidence-revise.model.ts
@@ -6,7 +6,7 @@ export interface EvidenceReviseModel extends FormReviseBaseModel {
 }
 export const evidenceItemReviseFieldsDefaults = <EvidenceItemFields>{
   // gene, variant included for initial input type development
-  geneId: undefined, // debug
+  featureId: undefined, // debug
   variantId: undefined, // debug
   significance: undefined,
   description: undefined,
diff --git a/client/src/app/forms/models/evidence-submit.model.ts b/client/src/app/forms/models/evidence-submit.model.ts
index 37a088985..0db18ed5a 100644
--- a/client/src/app/forms/models/evidence-submit.model.ts
+++ b/client/src/app/forms/models/evidence-submit.model.ts
@@ -7,7 +7,7 @@ export interface EvidenceSubmitModel extends FormSubmitBaseModel {
 
 export const evidenceItemSubmitFieldsDefaults = <EvidenceItemFields>{
   // gene, variant included for initial input type development
-  geneId: undefined,
+  featureId: undefined,
   variantId: undefined,
   significance: undefined,
   description: undefined,
diff --git a/client/src/app/forms/states/evidence.state.ts b/client/src/app/forms/states/evidence.state.ts
index d45c9e266..7c1a23bb5 100644
--- a/client/src/app/forms/states/evidence.state.ts
+++ b/client/src/app/forms/states/evidence.state.ts
@@ -17,7 +17,7 @@ import { EntityName, BaseState } from './base.state'
 
 export type EvidenceFields = {
   molecularProfileId$: BehaviorSubject<Maybe<number>>
-  geneId$: BehaviorSubject<Maybe<number>>
+  featureId$: BehaviorSubject<Maybe<number>>
   variantId$: BehaviorSubject<Maybe<number>>
   variantMolecularProfile$: BehaviorSubject<Maybe<MolecularProfile>>
   variantOrigin$: BehaviorSubject<Maybe<VariantOrigin>>
@@ -68,7 +68,7 @@ class EvidenceState extends BaseState {
       variantMolecularProfile$: new BehaviorSubject<Maybe<MolecularProfile>>(
         undefined
       ),
-      geneId$: new BehaviorSubject<Maybe<number>>(def.geneId),
+      featureId$: new BehaviorSubject<Maybe<number>>(def.featureId),
       evidenceType$: new BehaviorSubject<Maybe<EvidenceType>>(def.evidenceType),
       evidenceLevel$: new BehaviorSubject<Maybe<EvidenceLevel>>(
         def.evidenceLevel
diff --git a/client/src/app/forms/test-pages/layout-tests/layout-forms.config.ts b/client/src/app/forms/test-pages/layout-tests/layout-forms.config.ts
index 4a061d4f9..704475573 100644
--- a/client/src/app/forms/test-pages/layout-tests/layout-forms.config.ts
+++ b/client/src/app/forms/test-pages/layout-tests/layout-forms.config.ts
@@ -37,11 +37,11 @@ export const noStateFormsFieldConfig: FormlyFieldConfig[] = [
   },
 
   <CvcGeneSelectFieldConfig>{
-    key: 'geneId',
+    key: 'featureId',
     type: 'gene-select',
   },
   <CvcGeneSelectFieldConfig>{
-    key: 'geneIds',
+    key: 'featureIds',
     type: 'gene-multi-select',
     props: {},
   },
@@ -49,14 +49,14 @@ export const noStateFormsFieldConfig: FormlyFieldConfig[] = [
     key: 'variantId',
     type: 'variant-select',
     props: {
-      requireGene: false,
+      requireFeature: false,
     },
   },
   <CvcVariantSelectFieldConfig>{
     key: 'variantIds',
     type: 'variant-multi-select',
     props: {
-      requireGene: false,
+      requireFeature: false,
     },
   },
   <CvcSourceSelectFieldConfig>{
diff --git a/client/src/app/forms/types/gene-select/gene-select.query.gql b/client/src/app/forms/types/gene-select/gene-select.query.gql
index 99cccf77d..4fa7bc812 100644
--- a/client/src/app/forms/types/gene-select/gene-select.query.gql
+++ b/client/src/app/forms/types/gene-select/gene-select.query.gql
@@ -1,19 +1,24 @@
-query GeneSelectTypeahead($entrezSymbol: String!) {
-  geneTypeahead(queryTerm: $entrezSymbol) {
-    ...GeneSelectTypeaheadFields
+query FeatureSelectTypeahead($queryTerm: String!, $featureType: FeatureInstanceTypes) {
+  featureTypeahead(queryTerm: $queryTerm, featureType: $featureType) {
+    ...FeatureSelectTypeaheadFields
   }
 }
 
-query GeneSelectTag($geneId: Int!) {
-  gene(id: $geneId) {
-    ...GeneSelectTypeaheadFields
+query FeatureSelectTag($featureId: Int!) {
+  feature(id: $featureId) {
+    ...FeatureSelectTypeaheadFields
   }
 }
 
-fragment GeneSelectTypeaheadFields on Gene {
+fragment FeatureSelectTypeaheadFields on Feature {
   id
-  entrezId
   name
   featureAliases
   link
+  featureInstance {
+    __typename
+    ... on Gene {
+      entrezId
+    }
+  }
 }
diff --git a/client/src/app/forms/types/gene-select/gene-select.type.html b/client/src/app/forms/types/gene-select/gene-select.type.html
index f18ccf1da..974f9ea09 100644
--- a/client/src/app/forms/types/gene-select/gene-select.type.html
+++ b/client/src/app/forms/types/gene-select/gene-select.type.html
@@ -55,7 +55,7 @@
   let-selected>
   <div class="ant-select-selection-item-content">
     <cvc-entity-tag
-      [cvcCacheId]="'Gene:' + selected.nzValue"
+      [cvcCacheId]="'Feature:' + selected.nzValue"
       [cvcContext]="props.isMultiSelect ? 'multi-select-item' : 'select-item'"
       [cvcMode]="props.isMultiSelect ? 'default' : 'closeable'"
       (cvcOnClose)="onTagClose$.next(selected.nzValue)"></cvc-entity-tag>
diff --git a/client/src/app/forms/types/gene-select/gene-select.type.ts b/client/src/app/forms/types/gene-select/gene-select.type.ts
index 14563fb5c..0d6f8d9cb 100644
--- a/client/src/app/forms/types/gene-select/gene-select.type.ts
+++ b/client/src/app/forms/types/gene-select/gene-select.type.ts
@@ -17,13 +17,14 @@ import { BaseFieldType } from '@app/forms/mixins/base/base-field'
 import { EntitySelectField } from '@app/forms/mixins/entity-select-field.mixin'
 import { CvcFormFieldExtraType } from '@app/forms/wrappers/form-field/form-field.wrapper'
 import {
-  GeneSelectTagGQL,
-  GeneSelectTagQuery,
-  GeneSelectTagQueryVariables,
-  GeneSelectTypeaheadFieldsFragment,
-  GeneSelectTypeaheadGQL,
-  GeneSelectTypeaheadQuery,
-  GeneSelectTypeaheadQueryVariables,
+    FeatureInstanceTypes,
+  FeatureSelectTagGQL,
+  FeatureSelectTagQuery,
+  FeatureSelectTagQueryVariables,
+  FeatureSelectTypeaheadFieldsFragment,
+  FeatureSelectTypeaheadGQL,
+  FeatureSelectTypeaheadQuery,
+  FeatureSelectTypeaheadQueryVariables,
   Maybe,
 } from '@app/generated/civic.apollo'
 import { FieldTypeConfig, FormlyFieldConfig } from '@ngx-formly/core'
@@ -55,11 +56,11 @@ const GeneSelectMixin = mixin(
     Maybe<number | number[]>
   >(),
   EntitySelectField<
-    GeneSelectTypeaheadQuery,
-    GeneSelectTypeaheadQueryVariables,
-    GeneSelectTypeaheadFieldsFragment,
-    GeneSelectTagQuery,
-    GeneSelectTagQueryVariables,
+    FeatureSelectTypeaheadQuery,
+    FeatureSelectTypeaheadQueryVariables,
+    FeatureSelectTypeaheadFieldsFragment,
+    FeatureSelectTagQuery,
+    FeatureSelectTagQueryVariables,
     Maybe<number | number[]>
   >()
 )
@@ -84,14 +85,15 @@ export class CvcGeneSelectField
       description:
         'Entrez Gene Symbol',
     },
+    featureType: FeatureInstanceTypes.Gene
   }
 
   @ViewChildren('optionTemplates', { read: TemplateRef })
   optionTemplates?: QueryList<TemplateRef<any>>
 
   constructor(
-    private taq: GeneSelectTypeaheadGQL,
-    private tq: GeneSelectTagGQL,
+    private taq: FeatureSelectTypeaheadGQL,
+    private tq: FeatureSelectTagGQL,
     private changeDetectorRef: ChangeDetectorRef
   ) {
     super()
@@ -117,39 +119,39 @@ export class CvcGeneSelectField
     // this.onOpenChange$.pipe(tag('gene-select onOpenChange$')).subscribe()
   } // ngAfterViewInit()
 
-  getTypeaheadVarsFn(str: string): GeneSelectTypeaheadQueryVariables {
-    return { entrezSymbol: str }
+  getTypeaheadVarsFn(str: string): FeatureSelectTypeaheadQueryVariables {
+    return { queryTerm: str, featureType: this.props.featureType }
   }
 
-  getTypeaheadResultsFn(r: ApolloQueryResult<GeneSelectTypeaheadQuery>) {
-    return r.data.geneTypeahead
+  getTypeaheadResultsFn(r: ApolloQueryResult<FeatureSelectTypeaheadQuery>) {
+    return r.data.featureTypeahead
   }
 
-  getTagQueryVarsFn(id: number): GeneSelectTagQueryVariables {
-    return { geneId: id }
+  getTagQueryVarsFn(id: number): FeatureSelectTagQueryVariables {
+    return { featureId: id }
   }
 
   getTagQueryResultsFn(
-    r: ApolloQueryResult<GeneSelectTagQuery>
-  ): Maybe<GeneSelectTypeaheadFieldsFragment> {
-    return r.data.gene
+    r: ApolloQueryResult<FeatureSelectTagQuery>
+  ): Maybe<FeatureSelectTypeaheadFieldsFragment> {
+    return r.data.feature
   }
 
   getSelectedItemOptionFn(
-    gene: GeneSelectTypeaheadFieldsFragment
+    feature: FeatureSelectTypeaheadFieldsFragment
   ): NzSelectOptionInterface {
-    return { value: gene.id, label: gene.name }
+    return { value: feature.id, label: feature.name }
   }
 
   getSelectOptionsFn(
-    results: GeneSelectTypeaheadFieldsFragment[],
+    results: FeatureSelectTypeaheadFieldsFragment[],
     tplRefs: QueryList<TemplateRef<any>>
   ): NzSelectOptionInterface[] {
     return results.map(
-      (gene: GeneSelectTypeaheadFieldsFragment, index: number) => {
+      (feature: FeatureSelectTypeaheadFieldsFragment, index: number) => {
         return <NzSelectOptionInterface>{
-          label: tplRefs.get(index) || gene.name,
-          value: gene.id,
+          label: tplRefs.get(index) || feature.name,
+          value: feature.id,
         }
       }
     )
diff --git a/client/src/app/forms/types/molecular-profile-select/mp-finder/mp-finder.component.ts b/client/src/app/forms/types/molecular-profile-select/mp-finder/mp-finder.component.ts
index 72afbf806..c269e1aa1 100644
--- a/client/src/app/forms/types/molecular-profile-select/mp-finder/mp-finder.component.ts
+++ b/client/src/app/forms/types/molecular-profile-select/mp-finder/mp-finder.component.ts
@@ -17,7 +17,7 @@ import { tag } from 'rxjs-spy/operators'
 import { CvcVariantSelectFieldOption } from '../../variant-select/variant-select.type'
 
 type MpFinderModel = {
-  geneId?: number
+  featureId?: number
   variantId?: number
 }
 
@@ -44,7 +44,7 @@ export class MpFinderComponent {
   finderState: MpFinderState = {
     formLayout: 'horizontal',
     fields: {
-      geneId$: new BehaviorSubject<Maybe<number>>(undefined),
+      featureId$: new BehaviorSubject<Maybe<number>>(undefined),
       variantId$: new BehaviorSubject<Maybe<number>>(undefined),
       variantMolecularProfile$: new BehaviorSubject<Maybe<MolecularProfile>>(
         undefined
@@ -54,7 +54,7 @@ export class MpFinderComponent {
   options: FormlyFormOptions
   constructor(private apollo: Apollo) {
     this.form = new UntypedFormGroup({})
-    this.model = { geneId: undefined, variantId: undefined }
+    this.model = { featureId: undefined, variantId: undefined }
     this.options = { formState: this.finderState }
 
     this.config = [
@@ -62,16 +62,16 @@ export class MpFinderComponent {
         wrappers: ['form-row'],
         props: <CvcFormRowWrapperProps>{
           formRowOptions: {
-            gutter: [8, 0], // zero vertical margin ensures no top margins set on gene, variant select fields
+            gutter: [8, 0], // zero vertical margin ensures no top margins set on feature, variant select fields
             span: 12,
           },
         },
         fieldGroup: [
           {
-            key: 'geneId',
+            key: 'featureId',
             type: 'gene-select',
             props: {
-              placeholder: 'Select MP Gene',
+              placeholder: 'Select MP Feature',
               hideLabel: true,
               showExtra: false,
               showErrorTip: false,
@@ -87,7 +87,7 @@ export class MpFinderComponent {
               required: true,
               showExtra: false,
               showErrorTip: false,
-              requireGene: true,
+              requireFeature: true,
             },
           },
         ],
@@ -100,7 +100,7 @@ export class MpFinderComponent {
     const variant = this.getSelectedVariant(model.variantId)
     if (variant) {
       this.model = {
-        geneId: undefined,
+        featureId: undefined,
         variantId: undefined,
       }
       this.cvcOnSelect.next(variant.singleVariantMolecularProfile)
diff --git a/client/src/app/forms/types/variant-select/variant-quick-add/variant-quick-add.form.ts b/client/src/app/forms/types/variant-select/variant-quick-add/variant-quick-add.form.ts
index a8550e850..48d831fcf 100644
--- a/client/src/app/forms/types/variant-select/variant-quick-add/variant-quick-add.form.ts
+++ b/client/src/app/forms/types/variant-select/variant-quick-add/variant-quick-add.form.ts
@@ -28,7 +28,7 @@ import { VariantIdWithCreationStatus } from '../variant-select.type'
 
 type VariantQuickAddModel = {
   name?: string
-  geneId?: number
+  featureId?: number
   organizationId?: number
 }
 
@@ -44,14 +44,14 @@ type VariantQuickAddDisplay = {
 })
 export class CvcVariantQuickAddForm implements OnChanges {
   @Input()
-  set cvcGeneId(id: Maybe<number>) {
+  set cvcFeatureId(id: Maybe<number>) {
     if (!id) return
-    this.geneId$.next(id)
+    this.featureId$.next(id)
   }
   @Input()
-  set cvcGeneName(name: Maybe<string>) {
+  set cvcFeatureName(name: Maybe<string>) {
     if (!name) return
-    this.geneName$.next(name)
+    this.featureName$.next(name)
   }
 
   @Input()
@@ -76,11 +76,11 @@ export class CvcVariantQuickAddForm implements OnChanges {
 
   // SOURCE STREAMS
   onSubmit$: Subject<VariantQuickAddModel>
-  geneId$: BehaviorSubject<Maybe<number>>
+  featureId$: BehaviorSubject<Maybe<number>>
   searchString$: BehaviorSubject<Maybe<string>>
 
   // PRESENTATION STREAMS
-  geneName$: BehaviorSubject<Maybe<string>>
+  featureName$: BehaviorSubject<Maybe<string>>
   formMessageDisplay$: BehaviorSubject<VariantQuickAddDisplay>
 
   addVariantMutator: MutatorWithState<
@@ -106,8 +106,8 @@ export class CvcVariantQuickAddForm implements OnChanges {
     this.onSubmit$ = new Subject<VariantQuickAddModel>()
     this.searchString$ = new BehaviorSubject<Maybe<string>>(undefined)
 
-    this.geneName$ = new BehaviorSubject<Maybe<string>>(undefined)
-    this.geneId$ = new BehaviorSubject<Maybe<number>>(undefined)
+    this.featureName$ = new BehaviorSubject<Maybe<string>>(undefined)
+    this.featureId$ = new BehaviorSubject<Maybe<number>>(undefined)
     this.formMessageDisplay$ = new BehaviorSubject<VariantQuickAddDisplay>({
       message: 'Variant does not exist, create it?',
     })
@@ -119,7 +119,7 @@ export class CvcVariantQuickAddForm implements OnChanges {
 
     this.fields = [
       {
-        key: 'geneId',
+        key: 'featureId',
         hide: true,
         props: {
           required: true,
@@ -143,8 +143,8 @@ export class CvcVariantQuickAddForm implements OnChanges {
     ]
 
     // keep form module updated w/ Inputs
-    this.geneId$.pipe(untilDestroyed(this)).subscribe((id: Maybe<number>) => {
-      this.model.geneId = id
+    this.featureId$.pipe(untilDestroyed(this)).subscribe((id: Maybe<number>) => {
+      this.model.featureId = id
     })
 
     this.searchString$
@@ -173,9 +173,9 @@ export class CvcVariantQuickAddForm implements OnChanges {
   }
 
   submitVariant(model: VariantQuickAddModel) {
-    if (!(model.name && model.geneId)) {
+    if (!(model.name && model.featureId)) {
       console.error(
-        `variant-quick-add form submitVariant requires model with valid name and geneId.`
+        `variant-quick-add form submitVariant requires model with valid name and featureId.`
       )
       return
     }
@@ -183,7 +183,7 @@ export class CvcVariantQuickAddForm implements OnChanges {
       this.query,
       {
         name: model.name,
-        geneId: model.geneId,
+        featureId: model.featureId,
         organizationId: model.organizationId,
       },
       {},
@@ -202,14 +202,14 @@ export class CvcVariantQuickAddForm implements OnChanges {
   }
 
   ngOnChanges(changes: SimpleChanges): void {
-    if (changes.cvcGeneId) {
-      const st = changes.cvcGeneId.currentValue
-      this.geneId$.next(st)
-      this.model = { ...this.model, geneId: st }
+    if (changes.cvcFeatureId) {
+      const st = changes.cvcFeatureId.currentValue
+      this.featureId$.next(st)
+      this.model = { ...this.model, featureId: st }
     }
-    if (changes.cvcGeneName) {
-      const id = changes.cvcGeneName.currentValue
-      this.geneName$.next(id)
+    if (changes.cvcFeatureName) {
+      const id = changes.cvcFeatureName.currentValue
+      this.featureName$.next(id)
     }
     if (changes.cvcSearchString) {
       const name = changes.cvcSearchString.currentValue
diff --git a/client/src/app/forms/types/variant-select/variant-quick-add/variant-quick-add.query.gql b/client/src/app/forms/types/variant-select/variant-quick-add/variant-quick-add.query.gql
index 6c58eb87c..77289420e 100644
--- a/client/src/app/forms/types/variant-select/variant-quick-add/variant-quick-add.query.gql
+++ b/client/src/app/forms/types/variant-select/variant-quick-add/variant-quick-add.query.gql
@@ -1,5 +1,5 @@
-mutation QuickAddVariant($name: String!, $geneId: Int!, $organizationId: Int) {
-  createVariant(input: { name: $name, geneId: $geneId, organizationId: $organizationId }) {
+mutation QuickAddVariant($name: String!, $featureId: Int!, $organizationId: Int) {
+  createVariant(input: { name: $name, featureId: $featureId, organizationId: $organizationId }) {
     ...QuickAddVariantFields
   }
 }
diff --git a/client/src/app/forms/types/variant-select/variant-select.query.gql b/client/src/app/forms/types/variant-select/variant-select.query.gql
index a1b433353..7e3c2fae4 100644
--- a/client/src/app/forms/types/variant-select/variant-select.query.gql
+++ b/client/src/app/forms/types/variant-select/variant-select.query.gql
@@ -1,5 +1,5 @@
-query VariantSelectTypeahead($name: String!, $geneId: Int) {
-  variants(name: $name, geneId: $geneId, first: 50) {
+query VariantSelectTypeahead($name: String!, $featureId: Int) {
+  variants(name: $name, featureId: $featureId, first: 50) {
     totalCount
     edges {
       node {
diff --git a/client/src/app/forms/types/variant-select/variant-select.type.html b/client/src/app/forms/types/variant-select/variant-select.type.html
index 1d255236e..291e9446a 100644
--- a/client/src/app/forms/types/variant-select/variant-select.type.html
+++ b/client/src/app/forms/types/variant-select/variant-select.type.html
@@ -3,9 +3,9 @@
     <span
       nz-tooltip
       [nzTooltipTrigger]="
-        props.requireGene && !(onGeneId$ | ngrxPush) ? 'hover' : null
+        props.requireFeature && !(onFeatureId$ | ngrxPush) ? 'hover' : null
       "
-      nzTooltipTitle="Select a Gene to enable field.">
+      nzTooltipTitle="Select a Feature to enable field.">
       <cvc-entity-select
         [cvcAddEntity]="addVariant"
         [cvcAddEntityModel]="onModel$ | ngrxPush"
@@ -18,12 +18,12 @@
         [cvcEntityName]="props.entityName"
         [cvcPlaceholder]="props.placeholder"
         [cvcResults]="result$ | ngrxPush"
-        [cvcDisabled]="props.requireGene && !(onGeneId$ | ngrxPush)"
+        [cvcDisabled]="props.requireFeature && !(onFeatureId$ | ngrxPush)"
         [cvcOptions]="selectOption$ | ngrxPush"
         [cvcSelectOpen]="selectOpen$ | ngrxPush"
         [cvcShowError]="showError"
         [cvcLoading]="isLoading$ | ngrxPush"
-        [cvcParamName]="onGeneName$ | ngrxPush"
+        [cvcParamName]="onFeatureName$ | ngrxPush"
         (cvcOnSearch)="onSearch$.next($event)"
         (cvcOnOpenChange)="onOpenChange$.next($event)"
         (cvcOnModelChange)="props.change && props.change(field, $event)">
@@ -113,8 +113,8 @@
   let-model="model">
   <cvc-variant-quick-add-form
     [cvcSearchString]="searchStr"
-    [cvcGeneId]="onGeneId$ | ngrxPush"
-    [cvcGeneName]="onGeneName$ | ngrxPush"
+    [cvcFeatureId]="onFeatureId$ | ngrxPush"
+    [cvcFeatureName]="onFeatureName$ | ngrxPush"
     (cvcOnCreate)="onSelectOrCreate($event)">
   </cvc-variant-quick-add-form>
 </ng-template>
diff --git a/client/src/app/forms/types/variant-select/variant-select.type.ts b/client/src/app/forms/types/variant-select/variant-select.type.ts
index 93c4c4c4b..86eed9879 100644
--- a/client/src/app/forms/types/variant-select/variant-select.type.ts
+++ b/client/src/app/forms/types/variant-select/variant-select.type.ts
@@ -14,7 +14,7 @@ import { BaseFieldType } from '@app/forms/mixins/base/base-field'
 import { EntitySelectField } from '@app/forms/mixins/entity-select-field.mixin'
 import { CvcFormFieldExtraType } from '@app/forms/wrappers/form-field/form-field.wrapper'
 import {
-  LinkableGeneGQL,
+  LinkableFeatureGQL,
   Maybe,
   VariantSelectTagGQL,
   VariantSelectTagQuery,
@@ -60,9 +60,9 @@ export interface CvcVariantSelectFieldProps extends FormlyFieldProps {
   entityName: CvcSelectEntityName
   placeholder: string
   tooltip?: string
-  requireGene: boolean // if true, disables field if no geneId, and adjust placeholders, prompts
-  requireGenePlaceholderFn: (geneName: string) => string // returns placeholder that includes gene name
-  requireGenePrompt: string // prompt displayed if gene unspecified
+  requireFeature: boolean // if true, disables field if no featureId, and adjust placeholders, prompts
+  requireFeaturePlaceholderFn: (featureName: string) => string // returns placeholder that includes feature name
+  requireFeaturePrompt: string // prompt displayed if feature unspecified
   extraType?: CvcFormFieldExtraType // stores display type for msg beneath select component
   showManagerBtn?: boolean // show manager button
   minSearchStrLength: number
@@ -96,29 +96,29 @@ export class CvcVariantSelectField
   implements AfterViewInit
 {
   // STATE SOURCE STREAMS
-  onGeneId$!: BehaviorSubject<Maybe<number>>
+  onFeatureId$!: BehaviorSubject<Maybe<number>>
 
   // LOCAL SOURCE STREAMS
   onVid$: ReplaySubject<Maybe<number[]>>
   onShowMgrClick$: Subject<void>
-  onGeneName$: BehaviorSubject<Maybe<string>>
+  onFeatureName$: BehaviorSubject<Maybe<string>>
 
   // LOCAL PRESENTATION STREAMS
   showMgr$: Observable<boolean>
   onModel$ = new Observable<any>()
 
-  selectedGeneId?: number
+  selectedFeatureId?: number
 
   // FieldTypeConfig defaults
   defaultOptions = {
     props: {
       label: 'Variant',
       placeholder: 'Search Variants',
-      requireGene: true,
-      requireGenePlaceholderFn: (geneName: string) => {
-        return `Search ${geneName} Variants`
+      requireFeature: true,
+      requireFeaturePlaceholderFn: (featureName: string) => {
+        return `Search ${featureName} Variants`
       },
-      requireGenePrompt: 'Select a Gene to search its Variants',
+      requireFeaturePrompt: 'Select a Feature to search its Variants',
       isMultiSelect: false,
       entityName: { singular: 'Variant', plural: 'Variants' },
       showManagerBtn: false,
@@ -132,11 +132,11 @@ export class CvcVariantSelectField
   constructor(
     private taq: VariantSelectTypeaheadGQL,
     private tq: VariantSelectTagGQL,
-    private geneQuery: LinkableGeneGQL,
+    private featureQuery: LinkableFeatureGQL,
     private changeDetectorRef: ChangeDetectorRef
   ) {
     super()
-    this.onGeneName$ = new BehaviorSubject<Maybe<string>>(undefined)
+    this.onFeatureName$ = new BehaviorSubject<Maybe<string>>(undefined)
     this.onVid$ = new ReplaySubject<Maybe<number[]>>()
     this.onShowMgrClick$ = new Subject<void>()
     this.showMgr$ = this.onShowMgrClick$.pipe(scan((acc, _) => !acc, false))
@@ -185,9 +185,9 @@ export class CvcVariantSelectField
     this.onVid$.next(this.formControl.value)
 
     // update model provided to quick-add form when either sourceType or citationId changes
-    this.onModel$ = combineLatest([this.onGeneId$, this.onSearch$]).pipe(
-      map(([geneId, name]: [Maybe<number>, Maybe<string>]) => {
-        return { geneId: geneId, name: name }
+    this.onModel$ = combineLatest([this.onFeatureId$, this.onSearch$]).pipe(
+      map(([featureId, name]: [Maybe<number>, Maybe<string>]) => {
+        return { featureId: featureId, name: name }
       })
     )
 
@@ -201,17 +201,17 @@ export class CvcVariantSelectField
 
   private configureStateConnections() {
     if (!this.state) return
-    // attach state geneId$ to get gene field value updates
-    if (this.props.requireGene) {
-      if (!this.state?.fields.geneId$) {
+    // attach state featureId$ to get feature field value updates
+    if (this.props.requireFeature) {
+      if (!this.state?.fields.featureId$) {
         console.error(
-          `${this.field.id} requireGene is set, but no geneId$ subject found on state.`
+          `${this.field.id} requireFeature is set, but no featureId$ subject found on state.`
         )
         return
       }
-      this.onGeneId$ = this.state.fields.geneId$
-      this.onGeneId$.pipe(untilDestroyed(this)).subscribe((gid) => {
-        this.onGeneId(gid)
+      this.onFeatureId$ = this.state.fields.featureId$
+      this.onFeatureId$.pipe(untilDestroyed(this)).subscribe((fid) => {
+        this.onFeatureId(fid)
       })
     }
   }
@@ -219,7 +219,7 @@ export class CvcVariantSelectField
   getTypeaheadVarsFn(str: string) {
     return {
       name: str,
-      geneId: this.selectedGeneId,
+      featureId: this.selectedFeatureId,
     }
   }
 
@@ -274,39 +274,39 @@ export class CvcVariantSelectField
     }
   }
 
-  private onGeneId(gid: Maybe<number>): void {
-    this.selectedGeneId = gid
-    // if field config indicates that a geneId is required, and none is provided,
-    // set model to undefined (this resets the variant model if gene field is reset)
-    // and set placeholder to the 'requires gene' placeholder
-    if (!gid && this.props.requireGene) {
+  private onFeatureId(fid: Maybe<number>): void {
+    this.selectedFeatureId = fid
+    // if field config indicates that a featureId is required, and none is provided,
+    // set model to undefined (this resets the variant model if feature field is reset)
+    // and set placeholder to the 'requires feature' placeholder
+    if (!fid && this.props.requireFeature) {
       this.resetField()
-      this.props.description = this.props.requireGenePrompt
+      this.props.description = this.props.requireFeaturePrompt
       this.props.placeholder = 'Select a Variant'
       this.props.extraType = 'prompt'
-      this.onGeneName$.next(undefined)
-    } else if (gid) {
+      this.onFeatureName$.next(undefined)
+    } else if (fid) {
       this.props.description = undefined
       this.props.extraType = undefined
       // id provided, so fetch its name and update the placeholder string.
       // lastValueFrom is used b/c fetch could return 'loading' events
       lastValueFrom(
-        this.geneQuery.fetch({ geneId: gid }, { fetchPolicy: 'cache-first' })
+        this.featureQuery.fetch({ featureId: fid }, { fetchPolicy: 'cache-first' })
       ).then(({ data }) => {
-        if (!data?.gene?.name) {
+        if (!data?.feature?.name) {
           console.error(
-            `${this.field.id} could not fetch gene name for Gene:${gid}.`
+            `${this.field.id} could not fetch feature name for Feature:${fid}.`
           )
         } else {
-          if (this.props.requireGene) {
-            this.props.placeholder = this.props.requireGenePlaceholderFn(
-              data.gene.name
+          if (this.props.requireFeature) {
+            this.props.placeholder = this.props.requireFeaturePlaceholderFn(
+              data.feature.name
             )
           } else {
             this.props.placeholder = this.props.placeholder
           }
-          // emit gene name for quick-add form Input
-          this.onGeneName$.next(data.gene.name)
+          // emit feature name for quick-add form Input
+          this.onFeatureName$.next(data.feature.name)
         }
       })
     }
diff --git a/client/src/app/generated/civic.apollo-helpers.ts b/client/src/app/generated/civic.apollo-helpers.ts
index be0a63f44..17e7180df 100644
--- a/client/src/app/generated/civic.apollo-helpers.ts
+++ b/client/src/app/generated/civic.apollo-helpers.ts
@@ -1401,7 +1401,7 @@ export type PhenotypePopoverFieldPolicy = {
 	name?: FieldPolicy<any> | FieldReadFunction<any>,
 	url?: FieldPolicy<any> | FieldReadFunction<any>
 };
-export type QueryKeySpecifier = ('acmgCode' | 'acmgCodesTypeahead' | 'activities' | 'activity' | 'assertion' | 'assertions' | 'browseDiseases' | 'browseFeatures' | 'browseGenes' | 'browseMolecularProfiles' | 'browseSources' | 'browseVariantGroups' | 'browseVariants' | 'clingenCode' | 'clingenCodesTypeahead' | 'clinicalTrial' | 'clinicalTrials' | 'comment' | 'comments' | 'contributors' | 'countries' | 'dataReleases' | 'disease' | 'diseasePopover' | 'diseaseTypeahead' | 'entityTypeahead' | 'events' | 'evidenceItem' | 'evidenceItems' | 'feature' | 'flag' | 'flags' | 'gene' | 'geneTypeahead' | 'genes' | 'molecularProfile' | 'molecularProfiles' | 'nccnGuideline' | 'nccnGuidelinesTypeahead' | 'notifications' | 'organization' | 'organizationLeaderboards' | 'organizations' | 'phenotype' | 'phenotypePopover' | 'phenotypeTypeahead' | 'phenotypes' | 'previewCommentText' | 'previewMolecularProfileName' | 'remoteCitation' | 'revision' | 'revisions' | 'search' | 'searchByPermalink' | 'searchGenes' | 'source' | 'sourcePopover' | 'sourceSuggestionValues' | 'sourceSuggestions' | 'sourceTypeahead' | 'subscriptionForEntity' | 'therapies' | 'therapy' | 'therapyPopover' | 'therapyTypeahead' | 'timepointStats' | 'user' | 'userLeaderboards' | 'userTypeahead' | 'users' | 'validateRevisionsForAcceptance' | 'variant' | 'variantGroup' | 'variantGroups' | 'variantType' | 'variantTypePopover' | 'variantTypeTypeahead' | 'variantTypes' | 'variants' | 'viewer' | QueryKeySpecifier)[];
+export type QueryKeySpecifier = ('acmgCode' | 'acmgCodesTypeahead' | 'activities' | 'activity' | 'assertion' | 'assertions' | 'browseDiseases' | 'browseFeatures' | 'browseGenes' | 'browseMolecularProfiles' | 'browseSources' | 'browseVariantGroups' | 'browseVariants' | 'clingenCode' | 'clingenCodesTypeahead' | 'clinicalTrial' | 'clinicalTrials' | 'comment' | 'comments' | 'contributors' | 'countries' | 'dataReleases' | 'disease' | 'diseasePopover' | 'diseaseTypeahead' | 'entityTypeahead' | 'events' | 'evidenceItem' | 'evidenceItems' | 'feature' | 'featureTypeahead' | 'flag' | 'flags' | 'gene' | 'genes' | 'molecularProfile' | 'molecularProfiles' | 'nccnGuideline' | 'nccnGuidelinesTypeahead' | 'notifications' | 'organization' | 'organizationLeaderboards' | 'organizations' | 'phenotype' | 'phenotypePopover' | 'phenotypeTypeahead' | 'phenotypes' | 'previewCommentText' | 'previewMolecularProfileName' | 'remoteCitation' | 'revision' | 'revisions' | 'search' | 'searchByPermalink' | 'searchGenes' | 'source' | 'sourcePopover' | 'sourceSuggestionValues' | 'sourceSuggestions' | 'sourceTypeahead' | 'subscriptionForEntity' | 'therapies' | 'therapy' | 'therapyPopover' | 'therapyTypeahead' | 'timepointStats' | 'user' | 'userLeaderboards' | 'userTypeahead' | 'users' | 'validateRevisionsForAcceptance' | 'variant' | 'variantGroup' | 'variantGroups' | 'variantType' | 'variantTypePopover' | 'variantTypeTypeahead' | 'variantTypes' | 'variants' | 'viewer' | QueryKeySpecifier)[];
 export type QueryFieldPolicy = {
 	acmgCode?: FieldPolicy<any> | FieldReadFunction<any>,
 	acmgCodesTypeahead?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -1433,10 +1433,10 @@ export type QueryFieldPolicy = {
 	evidenceItem?: FieldPolicy<any> | FieldReadFunction<any>,
 	evidenceItems?: FieldPolicy<any> | FieldReadFunction<any>,
 	feature?: FieldPolicy<any> | FieldReadFunction<any>,
+	featureTypeahead?: FieldPolicy<any> | FieldReadFunction<any>,
 	flag?: FieldPolicy<any> | FieldReadFunction<any>,
 	flags?: FieldPolicy<any> | FieldReadFunction<any>,
 	gene?: FieldPolicy<any> | FieldReadFunction<any>,
-	geneTypeahead?: FieldPolicy<any> | FieldReadFunction<any>,
 	genes?: FieldPolicy<any> | FieldReadFunction<any>,
 	molecularProfile?: FieldPolicy<any> | FieldReadFunction<any>,
 	molecularProfiles?: FieldPolicy<any> | FieldReadFunction<any>,
diff --git a/client/src/app/generated/civic.apollo.ts b/client/src/app/generated/civic.apollo.ts
index c946f4abc..d40e9d35b 100644
--- a/client/src/app/generated/civic.apollo.ts
+++ b/client/src/app/generated/civic.apollo.ts
@@ -1235,8 +1235,8 @@ export type CreateVariantActivity = ActivityInterface & {
 export type CreateVariantInput = {
   /** A unique identifier for the client performing the mutation. */
   clientMutationId?: InputMaybe<Scalars['String']>;
-  /** The CIViC ID of the Gene to which the new variant belongs. */
-  geneId: Scalars['Int'];
+  /** The CIViC ID of the Feature to which the new variant belongs. */
+  featureId: Scalars['Int'];
   /** The name of the variant to create. */
   name: Scalars['String'];
   /**
@@ -1933,6 +1933,10 @@ export type FeatureVariantsArgs = {
 /** The specific type of a feature instance */
 export type FeatureInstance = Gene;
 
+export enum FeatureInstanceTypes {
+  Gene = 'GENE'
+}
+
 export type FeaturesSort = {
   /** Available columns for sorting */
   column: FeaturesSortColumns;
@@ -3574,14 +3578,14 @@ export type Query = {
   evidenceItems: EvidenceItemConnection;
   /** Find a single feature by CIViC ID */
   feature?: Maybe<Feature>;
+  /** Retrieve Features of a specific instance type for a search term. */
+  featureTypeahead: Array<Feature>;
   /** Find a flag by CIViC ID */
   flag?: Maybe<Flag>;
   /** List and filter flags. */
   flags: FlagConnection;
   /** Find a single gene by CIViC ID or Entrez symbol */
   gene?: Maybe<Gene>;
-  /** Retrieve gene typeahead fields for a search term. */
-  geneTypeahead: Array<Gene>;
   /** List and filter genes. */
   genes: GeneConnection;
   /** Find a molecular profile by CIViC ID */
@@ -3952,6 +3956,12 @@ export type QueryFeatureArgs = {
 };
 
 
+export type QueryFeatureTypeaheadArgs = {
+  featureType?: InputMaybe<FeatureInstanceTypes>;
+  queryTerm: Scalars['String'];
+};
+
+
 export type QueryFlagArgs = {
   id: Scalars['Int'];
 };
@@ -3976,11 +3986,6 @@ export type QueryGeneArgs = {
 };
 
 
-export type QueryGeneTypeaheadArgs = {
-  queryTerm: Scalars['String'];
-};
-
-
 export type QueryGenesArgs = {
   after?: InputMaybe<Scalars['String']>;
   before?: InputMaybe<Scalars['String']>;
@@ -6976,6 +6981,13 @@ export type LinkableTherapyQueryVariables = Exact<{
 
 export type LinkableTherapyQuery = { __typename: 'Query', therapy?: { __typename: 'Therapy', id: number, name: string, link: string } | undefined };
 
+export type LinkableFeatureQueryVariables = Exact<{
+  featureId: Scalars['Int'];
+}>;
+
+
+export type LinkableFeatureQuery = { __typename: 'Query', feature?: { __typename: 'Feature', id: number, name: string, link: string } | undefined };
+
 export type FlagEntityMutationVariables = Exact<{
   input: FlagEntityInput;
 }>;
@@ -7329,21 +7341,22 @@ export type EvidenceSelectTagQuery = { __typename: 'Query', evidenceItem?: { __t
 
 export type EvidenceSelectTypeaheadFieldsFragment = { __typename: 'EvidenceItem', id: number, name: string, link: string, evidenceType: EvidenceType, evidenceDirection: EvidenceDirection, evidenceLevel: EvidenceLevel, evidenceRating?: number | undefined, significance: EvidenceSignificance, variantOrigin: VariantOrigin, status: EvidenceStatus };
 
-export type GeneSelectTypeaheadQueryVariables = Exact<{
-  entrezSymbol: Scalars['String'];
+export type FeatureSelectTypeaheadQueryVariables = Exact<{
+  queryTerm: Scalars['String'];
+  featureType?: InputMaybe<FeatureInstanceTypes>;
 }>;
 
 
-export type GeneSelectTypeaheadQuery = { __typename: 'Query', geneTypeahead: Array<{ __typename: 'Gene', id: number, entrezId: number, name: string, featureAliases: Array<string>, link: string }> };
+export type FeatureSelectTypeaheadQuery = { __typename: 'Query', featureTypeahead: Array<{ __typename: 'Feature', id: number, name: string, featureAliases: Array<string>, link: string, featureInstance: { __typename: 'Gene', entrezId: number } }> };
 
-export type GeneSelectTagQueryVariables = Exact<{
-  geneId: Scalars['Int'];
+export type FeatureSelectTagQueryVariables = Exact<{
+  featureId: Scalars['Int'];
 }>;
 
 
-export type GeneSelectTagQuery = { __typename: 'Query', gene?: { __typename: 'Gene', id: number, entrezId: number, name: string, featureAliases: Array<string>, link: string } | undefined };
+export type FeatureSelectTagQuery = { __typename: 'Query', feature?: { __typename: 'Feature', id: number, name: string, featureAliases: Array<string>, link: string, featureInstance: { __typename: 'Gene', entrezId: number } } | undefined };
 
-export type GeneSelectTypeaheadFieldsFragment = { __typename: 'Gene', id: number, entrezId: number, name: string, featureAliases: Array<string>, link: string };
+export type FeatureSelectTypeaheadFieldsFragment = { __typename: 'Feature', id: number, name: string, featureAliases: Array<string>, link: string, featureInstance: { __typename: 'Gene', entrezId: number } };
 
 export type MolecularProfileSelectTypeaheadQueryVariables = Exact<{
   name: Scalars['String'];
@@ -7504,7 +7517,7 @@ export type VariantManagerFieldsFragment = { __typename: 'BrowseVariant', id: nu
 
 export type QuickAddVariantMutationVariables = Exact<{
   name: Scalars['String'];
-  geneId: Scalars['Int'];
+  featureId: Scalars['Int'];
   organizationId?: InputMaybe<Scalars['Int']>;
 }>;
 
@@ -7515,7 +7528,7 @@ export type QuickAddVariantFieldsFragment = { __typename: 'CreateVariantPayload'
 
 export type VariantSelectTypeaheadQueryVariables = Exact<{
   name: Scalars['String'];
-  geneId?: InputMaybe<Scalars['Int']>;
+  featureId?: InputMaybe<Scalars['Int']>;
 }>;
 
 
@@ -9446,13 +9459,18 @@ export const EvidenceSelectTypeaheadFieldsFragmentDoc = gql`
   status
 }
     `;
-export const GeneSelectTypeaheadFieldsFragmentDoc = gql`
-    fragment GeneSelectTypeaheadFields on Gene {
+export const FeatureSelectTypeaheadFieldsFragmentDoc = gql`
+    fragment FeatureSelectTypeaheadFields on Feature {
   id
-  entrezId
   name
   featureAliases
   link
+  featureInstance {
+    __typename
+    ... on Gene {
+      entrezId
+    }
+  }
 }
     `;
 export const PreviewMpName2FragmentDoc = gql`
@@ -12812,6 +12830,26 @@ export const LinkableTherapyDocument = gql`
   export class LinkableTherapyGQL extends Apollo.Query<LinkableTherapyQuery, LinkableTherapyQueryVariables> {
     document = LinkableTherapyDocument;
     
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
+export const LinkableFeatureDocument = gql`
+    query LinkableFeature($featureId: Int!) {
+  feature(id: $featureId) {
+    id
+    name
+    link
+  }
+}
+    `;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class LinkableFeatureGQL extends Apollo.Query<LinkableFeatureQuery, LinkableFeatureQueryVariables> {
+    document = LinkableFeatureDocument;
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -13734,37 +13772,37 @@ export const EvidenceSelectTagDocument = gql`
       super(apollo);
     }
   }
-export const GeneSelectTypeaheadDocument = gql`
-    query GeneSelectTypeahead($entrezSymbol: String!) {
-  geneTypeahead(queryTerm: $entrezSymbol) {
-    ...GeneSelectTypeaheadFields
+export const FeatureSelectTypeaheadDocument = gql`
+    query FeatureSelectTypeahead($queryTerm: String!, $featureType: FeatureInstanceTypes) {
+  featureTypeahead(queryTerm: $queryTerm, featureType: $featureType) {
+    ...FeatureSelectTypeaheadFields
   }
 }
-    ${GeneSelectTypeaheadFieldsFragmentDoc}`;
+    ${FeatureSelectTypeaheadFieldsFragmentDoc}`;
 
   @Injectable({
     providedIn: 'root'
   })
-  export class GeneSelectTypeaheadGQL extends Apollo.Query<GeneSelectTypeaheadQuery, GeneSelectTypeaheadQueryVariables> {
-    document = GeneSelectTypeaheadDocument;
+  export class FeatureSelectTypeaheadGQL extends Apollo.Query<FeatureSelectTypeaheadQuery, FeatureSelectTypeaheadQueryVariables> {
+    document = FeatureSelectTypeaheadDocument;
     
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
   }
-export const GeneSelectTagDocument = gql`
-    query GeneSelectTag($geneId: Int!) {
-  gene(id: $geneId) {
-    ...GeneSelectTypeaheadFields
+export const FeatureSelectTagDocument = gql`
+    query FeatureSelectTag($featureId: Int!) {
+  feature(id: $featureId) {
+    ...FeatureSelectTypeaheadFields
   }
 }
-    ${GeneSelectTypeaheadFieldsFragmentDoc}`;
+    ${FeatureSelectTypeaheadFieldsFragmentDoc}`;
 
   @Injectable({
     providedIn: 'root'
   })
-  export class GeneSelectTagGQL extends Apollo.Query<GeneSelectTagQuery, GeneSelectTagQueryVariables> {
-    document = GeneSelectTagDocument;
+  export class FeatureSelectTagGQL extends Apollo.Query<FeatureSelectTagQuery, FeatureSelectTagQueryVariables> {
+    document = FeatureSelectTagDocument;
     
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
@@ -14130,9 +14168,9 @@ export const VariantManagerDocument = gql`
     }
   }
 export const QuickAddVariantDocument = gql`
-    mutation QuickAddVariant($name: String!, $geneId: Int!, $organizationId: Int) {
+    mutation QuickAddVariant($name: String!, $featureId: Int!, $organizationId: Int) {
   createVariant(
-    input: {name: $name, geneId: $geneId, organizationId: $organizationId}
+    input: {name: $name, featureId: $featureId, organizationId: $organizationId}
   ) {
     ...QuickAddVariantFields
   }
@@ -14150,8 +14188,8 @@ export const QuickAddVariantDocument = gql`
     }
   }
 export const VariantSelectTypeaheadDocument = gql`
-    query VariantSelectTypeahead($name: String!, $geneId: Int) {
-  variants(name: $name, geneId: $geneId, first: 50) {
+    query VariantSelectTypeahead($name: String!, $featureId: Int) {
+  variants(name: $name, featureId: $featureId, first: 50) {
     totalCount
     edges {
       node {
diff --git a/client/src/app/generated/server.model.graphql b/client/src/app/generated/server.model.graphql
index 4658999ea..e03104f9d 100644
--- a/client/src/app/generated/server.model.graphql
+++ b/client/src/app/generated/server.model.graphql
@@ -1975,9 +1975,9 @@ input CreateVariantInput {
   clientMutationId: String
 
   """
-  The CIViC ID of the Gene to which the new variant belongs.
+  The CIViC ID of the Feature to which the new variant belongs.
   """
-  geneId: Int!
+  featureId: Int!
 
   """
   The name of the variant to create.
@@ -3141,6 +3141,10 @@ The specific type of a feature instance
 """
 union FeatureInstance = Gene
 
+enum FeatureInstanceTypes {
+  GENE
+}
+
 input FeaturesSort {
   """
   Available columns for sorting
@@ -6374,6 +6378,11 @@ type Query {
   """
   feature(id: Int): Feature
 
+  """
+  Retrieve Features of a specific instance type for a search term.
+  """
+  featureTypeahead(featureType: FeatureInstanceTypes, queryTerm: String!): [Feature!]!
+
   """
   Find a flag by CIViC ID
   """
@@ -6430,11 +6439,6 @@ type Query {
   """
   gene(entrezSymbol: String, id: Int): Gene
 
-  """
-  Retrieve gene typeahead fields for a search term.
-  """
-  geneTypeahead(queryTerm: String!): [Gene!]!
-
   """
   List and filter genes.
   """
diff --git a/client/src/app/generated/server.schema.json b/client/src/app/generated/server.schema.json
index 72fefa825..e03c9a855 100644
--- a/client/src/app/generated/server.schema.json
+++ b/client/src/app/generated/server.schema.json
@@ -10067,8 +10067,8 @@
               "deprecationReason": null
             },
             {
-              "name": "geneId",
-              "description": "The CIViC ID of the Gene to which the new variant belongs.",
+              "name": "featureId",
+              "description": "The CIViC ID of the Feature to which the new variant belongs.",
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
@@ -15379,6 +15379,23 @@
             }
           ]
         },
+        {
+          "kind": "ENUM",
+          "name": "FeatureInstanceTypes",
+          "description": null,
+          "fields": null,
+          "inputFields": null,
+          "interfaces": null,
+          "enumValues": [
+            {
+              "name": "GENE",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "possibleTypes": null
+        },
         {
           "kind": "INPUT_OBJECT",
           "name": "FeaturesSort",
@@ -29667,6 +29684,59 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "featureTypeahead",
+              "description": "Retrieve Features of a specific instance type for a search term.",
+              "args": [
+                {
+                  "name": "queryTerm",
+                  "description": null,
+                  "type": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "SCALAR",
+                      "name": "String",
+                      "ofType": null
+                    }
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "featureType",
+                  "description": null,
+                  "type": {
+                    "kind": "ENUM",
+                    "name": "FeatureInstanceTypes",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                }
+              ],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "Feature",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "flag",
               "description": "Find a flag by CIViC ID",
@@ -29858,47 +29928,6 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
-            {
-              "name": "geneTypeahead",
-              "description": "Retrieve gene typeahead fields for a search term.",
-              "args": [
-                {
-                  "name": "queryTerm",
-                  "description": null,
-                  "type": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "SCALAR",
-                      "name": "String",
-                      "ofType": null
-                    }
-                  },
-                  "defaultValue": null,
-                  "isDeprecated": false,
-                  "deprecationReason": null
-                }
-              ],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "OBJECT",
-                      "name": "Gene",
-                      "ofType": null
-                    }
-                  }
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
             {
               "name": "genes",
               "description": "List and filter genes.",
diff --git a/server/app/graphql/mutations/create_variant.rb b/server/app/graphql/mutations/create_variant.rb
index a91b28ff4..5b63ade21 100644
--- a/server/app/graphql/mutations/create_variant.rb
+++ b/server/app/graphql/mutations/create_variant.rb
@@ -5,8 +5,8 @@ class Mutations::CreateVariant < Mutations::MutationWithOrg
     description: 'The name of the variant to create.',
     validates: { allow_blank: false }
 
-  argument :gene_id, Int, required: true,
-    description: 'The CIViC ID of the Gene to which the new variant belongs.'
+  argument :feature_id, Int, required: true,
+    description: 'The CIViC ID of the Feature to which the new variant belongs.'
 
   field :variant, Types::Entities::VariantType, null: false,
     description: 'The newly created Variant.'
@@ -17,12 +17,12 @@ class Mutations::CreateVariant < Mutations::MutationWithOrg
   field :new, Boolean, null: false,
     description: 'True if the variant was newly created. False if the returned variant was already in the database.'
 
-  def ready?(gene_id:, organization_id: nil, **kwargs)
+  def ready?(feature_id:, organization_id: nil, **kwargs)
     validate_user_logged_in
     validate_user_org(organization_id)
 
-    if Gene.find_by(id: gene_id).blank?
-      raise GraphQL::ExecutionError, "Gene with id #{gene_id} doesn't exist."
+    if Feature.find_by(id: feature_id).blank?
+      raise GraphQL::ExecutionError, "Feature with id #{feature_id} doesn't exist."
     end
 
     return true
@@ -33,10 +33,10 @@ def authorized?(organization_id: nil, **kwargs)
     return true
   end
 
-  def resolve(name:, gene_id:, organization_id: nil)
-    existing_variant = Variant.joins(:variant_aliases).where(gene_id: gene_id)
+  def resolve(name:, feature_id:, organization_id: nil)
+    existing_variant = Variant.joins(:variant_aliases).where(feature_id: feature_id)
       .where('variants.name ILIKE ?', name)
-      .or(Variant.joins(:variant_aliases).where(gene_id: gene_id).where('variant_aliases.name ILIKE ?', name))
+      .or(Variant.joins(:variant_aliases).where(feature_id: feature_id).where('variant_aliases.name ILIKE ?', name))
       .first
 
     if existing_variant.present?
@@ -49,7 +49,7 @@ def resolve(name:, gene_id:, organization_id: nil)
     else
       cmd = Activities::CreateVariant.new(
         variant_name: name,
-        gene_id: gene_id,
+        feature_id: feature_id,
         originating_user: context[:current_user],
         organization_id: organization_id,
       )
diff --git a/server/app/graphql/types/feature_instance_types.rb b/server/app/graphql/types/feature_instance_types.rb
new file mode 100644
index 000000000..6de09d93e
--- /dev/null
+++ b/server/app/graphql/types/feature_instance_types.rb
@@ -0,0 +1,5 @@
+module Types
+  class FeatureInstanceTypes < Types::BaseEnum
+    value 'GENE', value: 'Features::Gene'
+  end
+end
diff --git a/server/app/graphql/types/queries/typeahead_queries.rb b/server/app/graphql/types/queries/typeahead_queries.rb
index 4d0a00a90..1d1a69d23 100644
--- a/server/app/graphql/types/queries/typeahead_queries.rb
+++ b/server/app/graphql/types/queries/typeahead_queries.rb
@@ -11,9 +11,10 @@ def self.included(klass)
         argument :query_term, GraphQL::Types::String, required: true
       end
 
-      klass.field :gene_typeahead, [Types::Entities::GeneType], null: false do
-        description "Retrieve gene typeahead fields for a search term."
+      klass.field :feature_typeahead, [Types::Entities::FeatureType], null: false do
+        description "Retrieve Features of a specific instance type for a search term."
         argument :query_term, GraphQL::Types::String, required: true
+        argument :feature_type, Types::FeatureInstanceTypes, required: false
       end
 
       klass.field :phenotype_typeahead, [Types::Entities::PhenotypeType], null: false do
@@ -101,15 +102,22 @@ def therapy_typeahead(query_term:)
         end
       end
 
-      def gene_typeahead(query_term:)
-        results = Features::Gene.where('genes.name ILIKE ?', "#{query_term}%")
-          .order("LENGTH(genes.name) ASC")
+      def feature_typeahead(query_term:, feature_type: nil)
+        base_query = if feature_type
+                       Feature.where(feature_instance_type: feature_type)
+                     else
+                      Feature
+                     end
+
+        results = base_query.where('features.name ILIKE ?', "#{query_term}%")
+          .order("LENGTH(features.name) ASC")
           .limit(10)
+
         if results.size < 10
-          secondary_results = Features::Gene.eager_load(:gene_aliases)
-            .where("gene_aliases.name ILIKE ?", "#{query_term}%")
+          secondary_results = base_query.eager_load(:feature_aliases)
+            .where("feature_aliases.name ILIKE ?", "#{query_term}%")
             .where.not(id: results.select('id'))
-            .order("LENGTH(genes.name) ASC")
+            .order("LENGTH(features.name) ASC")
             .limit(10 - results.size)
           return (results + secondary_results).uniq
         else
diff --git a/server/app/lib/importer/entrez_symbols.rb b/server/app/lib/importer/entrez_symbols.rb
index d9b6f8978..cef20eeb2 100644
--- a/server/app/lib/importer/entrez_symbols.rb
+++ b/server/app/lib/importer/entrez_symbols.rb
@@ -38,9 +38,11 @@ def process_line(line)
         feature = Feature.create!(
           name: line['Symbol_from_nomenclature_authority'],
           full_name: line['description'],
-          description: ''
+          description: '',
+          feature_instance: gene
         )
-        gene.feature = feature
+        #TODO delete when we remove this column
+        gene.name = line['Symbol_from_nomenclature_authority']
         gene.save!
       else
         feature = gene.feature
diff --git a/server/app/models/actions/create_variant.rb b/server/app/models/actions/create_variant.rb
index 650c53363..d39f98baa 100644
--- a/server/app/models/actions/create_variant.rb
+++ b/server/app/models/actions/create_variant.rb
@@ -4,8 +4,9 @@ class CreateVariant
 
     attr_reader :variant, :molecular_profile, :originating_user, :organization_id
 
-    def initialize(variant_name:, gene_id:, originating_user:, organization_id: nil)
-      @variant = Variant.new(name: variant_name, gene_id: gene_id)
+    def initialize(variant_name:, feature_id:, originating_user:, organization_id: nil)
+      #TODO - REMOVE gene_id
+      @variant = Variant.new(name: variant_name, feature_id: feature_id, gene_id: 999)
       @originating_user = originating_user
       @organization_id = organization_id
     end
diff --git a/server/app/models/activities/create_variant.rb b/server/app/models/activities/create_variant.rb
index 125aedc00..2a1cd1a1f 100644
--- a/server/app/models/activities/create_variant.rb
+++ b/server/app/models/activities/create_variant.rb
@@ -1,11 +1,11 @@
 module Activities
   class CreateVariant < Base
-    attr_reader :variant_name, :gene_id, :variant, :molecular_profile
+    attr_reader :variant_name, :feature_id, :variant, :molecular_profile
 
-    def initialize(originating_user:, organization_id:, variant_name:, gene_id:)
+    def initialize(originating_user:, organization_id:, variant_name:, feature_id:)
       super(organization_id: organization_id, user: originating_user)
       @variant_name = variant_name
-      @gene_id = gene_id
+      @feature_id = feature_id
     end
 
     private
@@ -19,7 +19,7 @@ def create_activity
     def call_actions
       cmd = Actions::CreateVariant.new(
         variant_name: variant_name,
-        gene_id: gene_id,
+        feature_id: feature_id,
         originating_user: user,
         organization_id: organization&.id
       )

From 36bcc3f5d9511599d368b3d2ad05122ea45d01b7 Mon Sep 17 00:00:00 2001
From: Adam Coffman <acoffman@wustl.edu>
Date: Thu, 21 Dec 2023 11:47:15 -0600
Subject: [PATCH 028/125] moving variants between features is working

---
 .../revision-list.component.html              | 27 ++++++++++---------
 .../revision-list/revision-list.module.ts     |  4 +--
 .../variant-revise.form.config.ts             |  2 +-
 .../variant-revise/variant-revise.query.gql   |  2 +-
 .../app/forms/models/variant-fields.model.ts  |  4 +--
 .../app/forms/models/variant-revise.model.ts  |  4 +--
 .../utilities/variant-to-model-fields.ts      |  6 ++---
 client/src/app/generated/civic.apollo.ts      | 10 +++----
 client/src/app/generated/server.model.graphql |  4 +--
 client/src/app/generated/server.schema.json   |  4 +--
 .../mutations/suggest_variant_revision.rb     |  4 +--
 .../graphql/types/revisions/variant_fields.rb |  4 +--
 .../input_adaptors/variant_input_adaptor.rb   |  2 +-
 server/app/models/variant.rb                  |  8 +++---
 14 files changed, 44 insertions(+), 41 deletions(-)

diff --git a/client/src/app/components/revisions/revision-list/revision-list.component.html b/client/src/app/components/revisions/revision-list/revision-list.component.html
index 1c5370bdb..9dc5725f3 100644
--- a/client/src/app/components/revisions/revision-list/revision-list.component.html
+++ b/client/src/app/components/revisions/revision-list/revision-list.component.html
@@ -26,19 +26,19 @@
         [nzExtra]="revCardHeaderExtra"
         [nzActive]="true">
         <ng-container [ngSwitch]="revision.fieldName">
-          <ng-container *ngSwitchCase="'gene_id'">
+          <ng-container *ngSwitchCase="'feature_id'">
             <cvc-revision-list-diff
               [diffObject]="revision.linkoutData.diffValue"
-              entityType="Gene">
+              entityType="Feature">
               <ng-template
                 #itemTemplate
                 let-item>
-                <cvc-gene-tag
-                  [gene]="{
+                <cvc-feature-tag
+                  [feature]="{
                     id: item.id,
                     name: item.displayName,
                     link: item.link
-                  }"></cvc-gene-tag>
+                  }"></cvc-feature-tag>
               </ng-template>
             </cvc-revision-list-diff>
           </ng-container>
@@ -319,7 +319,9 @@
             <nz-col nzSpan="16">
               <ng-container *ngIf="revision.resolutionActivity?.parsedNote">
                 <cvc-comment-body
-                  [commentBodySegments]="revision.resolutionActivity!.parsedNote"></cvc-comment-body>
+                  [commentBodySegments]="
+                    revision.resolutionActivity!.parsedNote
+                  "></cvc-comment-body>
               </ng-container>
             </nz-col>
             <nz-col
@@ -358,9 +360,7 @@
                 *nzSpaceItem></i>
               <ng-template #creationCommentTemplate>
                 <cvc-comment-body
-                  [commentBodySegments]="
-                    revision.creationActivity!.parsedNote
-                  ">
+                  [commentBodySegments]="revision.creationActivity!.parsedNote">
                 </cvc-comment-body>
               </ng-template>
             </ng-container>
@@ -373,13 +373,15 @@
             nzSize="small"
             (click)="$event.stopPropagation()">
             <span *nzSpaceItem>
-              <ng-container *ngIf="revision.creationActivity?.user; else noRevisor">
+              <ng-container
+                *ngIf="revision.creationActivity?.user; else noRevisor">
                 <span
                   nz-typography
                   nzType="secondary"
                   >Submitted By</span
                 >
-                <cvc-user-tag [user]="revision.creationActivity!.user"></cvc-user-tag>
+                <cvc-user-tag
+                  [user]="revision.creationActivity!.user"></cvc-user-tag>
               </ng-container>
               <ng-template #noRevisor>
                 <span
@@ -421,7 +423,8 @@
                 <ng-template #loggedIn>
                   <label
                     *ngIf="
-                      viewer.isCurator && viewer.id != revision.creationActivity?.user.id;
+                      viewer.isCurator &&
+                        viewer.id != revision.creationActivity?.user.id;
                       else canRevise
                     "
                     nz-checkbox
diff --git a/client/src/app/components/revisions/revision-list/revision-list.module.ts b/client/src/app/components/revisions/revision-list/revision-list.module.ts
index 5a7327c4f..302f58701 100644
--- a/client/src/app/components/revisions/revision-list/revision-list.module.ts
+++ b/client/src/app/components/revisions/revision-list/revision-list.module.ts
@@ -36,7 +36,7 @@ import { CvcCommentBodyModule } from '@app/components/comments/comment-body/comm
 import { CvcEvidenceTagModule } from '@app/components/evidence/evidence-tag/evidence-tag.module'
 import { CvcTherapyTagModule } from '@app/components/therapies/cvc-therapy-tag/cvc-therapy-tag.module'
 import { CvcMolecularProfileTagModule } from '@app/components/molecular-profiles/molecular-profile-tag/molecular-profile-tag.module'
-import { CvcGeneTagModule } from '@app/components/genes/gene-tag/gene-tag.module'
+import { CvcFeatureTagModule } from '@app/components/features/feature-tag/feature-tag.module'
 
 @NgModule({
   declarations: [RevisionListComponent],
@@ -61,7 +61,7 @@ import { CvcGeneTagModule } from '@app/components/genes/gene-tag/gene-tag.module
     NzDividerModule,
     FormsModule,
     RevisionListDiffModule,
-    CvcGeneTagModule,
+    CvcFeatureTagModule,
     CvcSourceTagModule,
     CvcRevisionValueDiffModule,
     CvcUserTagModule,
diff --git a/client/src/app/forms/config/variant-revise/variant-revise.form.config.ts b/client/src/app/forms/config/variant-revise/variant-revise.form.config.ts
index 8a99f1b38..74be5a0e8 100644
--- a/client/src/app/forms/config/variant-revise/variant-revise.form.config.ts
+++ b/client/src/app/forms/config/variant-revise/variant-revise.form.config.ts
@@ -41,7 +41,7 @@ const formFieldConfig: FormlyFieldConfig[] = [
             },
             fieldGroup: [
               {
-                key: 'geneId',
+                key: 'featureId',
                 type: 'gene-select',
                 props: {
                   description: 'Enter an Entrez Gene for this Variant',
diff --git a/client/src/app/forms/config/variant-revise/variant-revise.query.gql b/client/src/app/forms/config/variant-revise/variant-revise.query.gql
index cfbc72818..2258f00cd 100644
--- a/client/src/app/forms/config/variant-revise/variant-revise.query.gql
+++ b/client/src/app/forms/config/variant-revise/variant-revise.query.gql
@@ -7,7 +7,7 @@ query VariantRevisableFields($variantId: Int!) {
 fragment RevisableVariantFields on Variant {
   id
   name
-  gene {
+  feature {
     id
     name
   }
diff --git a/client/src/app/forms/models/variant-fields.model.ts b/client/src/app/forms/models/variant-fields.model.ts
index 57b937057..150e7572f 100644
--- a/client/src/app/forms/models/variant-fields.model.ts
+++ b/client/src/app/forms/models/variant-fields.model.ts
@@ -16,7 +16,7 @@ export type VariantFields = {
   start2?: number
   stop2?: number
   representativeTranscript2?: string
-  geneId?: number
+  featureId?: number
   referenceBases?: string
   variantBases?: string
-}
\ No newline at end of file
+}
diff --git a/client/src/app/forms/models/variant-revise.model.ts b/client/src/app/forms/models/variant-revise.model.ts
index 8d5b6403a..3da747aaa 100644
--- a/client/src/app/forms/models/variant-revise.model.ts
+++ b/client/src/app/forms/models/variant-revise.model.ts
@@ -21,7 +21,7 @@ export const variantReviseFieldsDefaults: VariantFields = {
   start2: undefined,
   stop2: undefined,
   representativeTranscript2: undefined,
-  geneId: undefined,
+  featureId: undefined,
   referenceBases: undefined,
   variantBases: undefined
 }
@@ -32,4 +32,4 @@ export const variantReviseFormInitialModel: VariantReviseModel = {
   fields: variantReviseFieldsDefaults,
   comment: undefined,
   organizationId: undefined
-}
\ No newline at end of file
+}
diff --git a/client/src/app/forms/utilities/variant-to-model-fields.ts b/client/src/app/forms/utilities/variant-to-model-fields.ts
index 0419eab43..4126d71f2 100644
--- a/client/src/app/forms/utilities/variant-to-model-fields.ts
+++ b/client/src/app/forms/utilities/variant-to-model-fields.ts
@@ -29,7 +29,7 @@ export function variantToModelFields(
     stop2: variant.secondaryCoordinates?.stop,
     representativeTranscript2:
       variant.secondaryCoordinates?.representativeTranscript,
-    geneId: variant.gene.id,
+    featureId: variant.feature.id,
     referenceBases: variant.referenceBases,
     variantBases: variant.variantBases,
   }
@@ -40,7 +40,7 @@ export function variantFormModelToReviseInput(
   model: VariantReviseModel
 ): Maybe<SuggestVariantRevisionInput> {
   const fields = model.fields
-  if (!model.comment || !fields.name || !fields.geneId) {
+  if (!model.comment || !fields.name || !fields.featureId) {
     return undefined
   }
 
@@ -68,7 +68,7 @@ export function variantFormModelToReviseInput(
         stop: fields.stop2 ? +fields.stop2 : undefined,
         representativeTranscript: fields.representativeTranscript2,
       },
-      geneId: fields.geneId,
+      featureId: fields.featureId,
       referenceBases: fmt.toNullableString(fields.referenceBases),
       variantBases: fmt.toNullableString(fields.variantBases),
     },
diff --git a/client/src/app/generated/civic.apollo.ts b/client/src/app/generated/civic.apollo.ts
index d40e9d35b..6f8eb1fba 100644
--- a/client/src/app/generated/civic.apollo.ts
+++ b/client/src/app/generated/civic.apollo.ts
@@ -5775,8 +5775,8 @@ export type VariantFields = {
   clinvarIds: ClinvarInput;
   /** The Ensembl database version. */
   ensemblVersion: NullableIntInput;
-  /** The ID of the Gene this Variant corresponds to. */
-  geneId: Scalars['Int'];
+  /** The ID of the Feature this Variant corresponds to. */
+  featureId: Scalars['Int'];
   /** List of HGVS descriptions for the Variant. */
   hgvsDescriptions: Array<Scalars['String']>;
   /** The Variant's name. */
@@ -7175,9 +7175,9 @@ export type VariantRevisableFieldsQueryVariables = Exact<{
 }>;
 
 
-export type VariantRevisableFieldsQuery = { __typename: 'Query', variant?: { __typename: 'Variant', id: number, name: string, variantAliases: Array<string>, alleleRegistryId?: string | undefined, clinvarIds: Array<string>, ensemblVersion?: number | undefined, hgvsDescriptions: Array<string>, referenceBuild?: ReferenceBuild | undefined, referenceBases?: string | undefined, variantBases?: string | undefined, gene: { __typename: 'Gene', id: number, name: string }, variantTypes: Array<{ __typename: 'VariantType', id: number, name: string, soid: string }>, primaryCoordinates?: { __typename: 'Coordinate', chromosome?: string | undefined, representativeTranscript?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, secondaryCoordinates?: { __typename: 'Coordinate', chromosome?: string | undefined, representativeTranscript?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined } | undefined };
+export type VariantRevisableFieldsQuery = { __typename: 'Query', variant?: { __typename: 'Variant', id: number, name: string, variantAliases: Array<string>, alleleRegistryId?: string | undefined, clinvarIds: Array<string>, ensemblVersion?: number | undefined, hgvsDescriptions: Array<string>, referenceBuild?: ReferenceBuild | undefined, referenceBases?: string | undefined, variantBases?: string | undefined, feature: { __typename: 'Feature', id: number, name: string }, variantTypes: Array<{ __typename: 'VariantType', id: number, name: string, soid: string }>, primaryCoordinates?: { __typename: 'Coordinate', chromosome?: string | undefined, representativeTranscript?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, secondaryCoordinates?: { __typename: 'Coordinate', chromosome?: string | undefined, representativeTranscript?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined } | undefined };
 
-export type RevisableVariantFieldsFragment = { __typename: 'Variant', id: number, name: string, variantAliases: Array<string>, alleleRegistryId?: string | undefined, clinvarIds: Array<string>, ensemblVersion?: number | undefined, hgvsDescriptions: Array<string>, referenceBuild?: ReferenceBuild | undefined, referenceBases?: string | undefined, variantBases?: string | undefined, gene: { __typename: 'Gene', id: number, name: string }, variantTypes: Array<{ __typename: 'VariantType', id: number, name: string, soid: string }>, primaryCoordinates?: { __typename: 'Coordinate', chromosome?: string | undefined, representativeTranscript?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, secondaryCoordinates?: { __typename: 'Coordinate', chromosome?: string | undefined, representativeTranscript?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined };
+export type RevisableVariantFieldsFragment = { __typename: 'Variant', id: number, name: string, variantAliases: Array<string>, alleleRegistryId?: string | undefined, clinvarIds: Array<string>, ensemblVersion?: number | undefined, hgvsDescriptions: Array<string>, referenceBuild?: ReferenceBuild | undefined, referenceBases?: string | undefined, variantBases?: string | undefined, feature: { __typename: 'Feature', id: number, name: string }, variantTypes: Array<{ __typename: 'VariantType', id: number, name: string, soid: string }>, primaryCoordinates?: { __typename: 'Coordinate', chromosome?: string | undefined, representativeTranscript?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, secondaryCoordinates?: { __typename: 'Coordinate', chromosome?: string | undefined, representativeTranscript?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined };
 
 export type CoordinateFieldsFragment = { __typename: 'Coordinate', chromosome?: string | undefined, representativeTranscript?: string | undefined, start?: number | undefined, stop?: number | undefined };
 
@@ -9305,7 +9305,7 @@ export const RevisableVariantFieldsFragmentDoc = gql`
     fragment RevisableVariantFields on Variant {
   id
   name
-  gene {
+  feature {
     id
     name
   }
diff --git a/client/src/app/generated/server.model.graphql b/client/src/app/generated/server.model.graphql
index e03104f9d..39f99b13e 100644
--- a/client/src/app/generated/server.model.graphql
+++ b/client/src/app/generated/server.model.graphql
@@ -9463,9 +9463,9 @@ input VariantFields {
   ensemblVersion: NullableIntInput!
 
   """
-  The ID of the Gene this Variant corresponds to.
+  The ID of the Feature this Variant corresponds to.
   """
-  geneId: Int!
+  featureId: Int!
 
   """
   List of HGVS descriptions for the Variant.
diff --git a/client/src/app/generated/server.schema.json b/client/src/app/generated/server.schema.json
index e03c9a855..cb319f12b 100644
--- a/client/src/app/generated/server.schema.json
+++ b/client/src/app/generated/server.schema.json
@@ -43254,8 +43254,8 @@
               "deprecationReason": null
             },
             {
-              "name": "geneId",
-              "description": "The ID of the Gene this Variant corresponds to.",
+              "name": "featureId",
+              "description": "The ID of the Feature this Variant corresponds to.",
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
diff --git a/server/app/graphql/mutations/suggest_variant_revision.rb b/server/app/graphql/mutations/suggest_variant_revision.rb
index 8ceec2730..28ed51836 100644
--- a/server/app/graphql/mutations/suggest_variant_revision.rb
+++ b/server/app/graphql/mutations/suggest_variant_revision.rb
@@ -38,8 +38,8 @@ def ready?(organization_id: nil, id:, fields:, **kwargs)
 
     @variant = variant
 
-    if !Gene.find(fields.gene_id)
-      raise GraphQL::ExecutionError, "Provided gene id: #{fields.gene_id} is not found."
+    if !Feature.find_by(id: fields.feature_id)
+      raise GraphQL::ExecutionError, "Provided feature id: #{fields.feature_id} is not found."
     end
 
     existing_variant_type_ids = VariantType.where(id: fields.variant_type_ids).pluck(:id)
diff --git a/server/app/graphql/types/revisions/variant_fields.rb b/server/app/graphql/types/revisions/variant_fields.rb
index 52a7aa38f..c2c1347ff 100644
--- a/server/app/graphql/types/revisions/variant_fields.rb
+++ b/server/app/graphql/types/revisions/variant_fields.rb
@@ -19,8 +19,8 @@ class VariantFields < Types::BaseInputObject
       description:  "In the case of Fusions these will be the coordinates of the 3' partner, otherwise set the values to null."
     argument :primary_coordinates, Types::Revisions::CoordinateInputType, required: true,
       description:  "The primary coordinates for this Variant. In the case of Fusions this will be the coordinates of the 5' partner."
-    argument :gene_id, Int, required: true,
-      description: 'The ID of the Gene this Variant corresponds to.'
+    argument :feature_id, Int, required: true,
+      description: 'The ID of the Feature this Variant corresponds to.'
     argument :reference_bases, Types::NullableValueInputType.for(GraphQL::Types::String), required: true,
       description: 'Reference bases for this variant'
     argument :variant_bases, Types::NullableValueInputType.for(GraphQL::Types::String), required: true,
diff --git a/server/app/models/input_adaptors/variant_input_adaptor.rb b/server/app/models/input_adaptors/variant_input_adaptor.rb
index 24c053fb5..2fbe47bc1 100644
--- a/server/app/models/input_adaptors/variant_input_adaptor.rb
+++ b/server/app/models/input_adaptors/variant_input_adaptor.rb
@@ -8,7 +8,7 @@ def initialize(variant_input_object: )
 
   def perform
     Variant.new(
-      gene_id: input.gene_id,
+      feature_id: input.feature_id,
       name: input.name,
       variant_type_ids: input.variant_type_ids,
       reference_build: input.reference_build,
diff --git a/server/app/models/variant.rb b/server/app/models/variant.rb
index 79590780a..604a0927f 100644
--- a/server/app/models/variant.rb
+++ b/server/app/models/variant.rb
@@ -6,7 +6,7 @@ class Variant < ApplicationRecord
   include WithTimepointCounts
 
   belongs_to :feature
-  belongs_to :gene, class_name: 'Features::Gene'
+  belongs_to :gene, class_name: 'Features::Gene', optional: true
   belongs_to :secondary_gene, class_name: 'Features::Gene', optional: true
 
   has_and_belongs_to_many :molecular_profiles
@@ -119,7 +119,7 @@ def update_single_variant_mp_aliases
   def unique_name_in_context
     base_query = self.class.where(
       deprecated: false,
-      gene_id: gene_id,
+      feature_id: feature_id,
       name: name
     )
 
@@ -139,13 +139,13 @@ def unique_name_in_context
                      end
 
     if duplicate_name
-      errors.add(:name, 'must be unique within a Gene')
+      errors.add(:name, 'must be unique within a Feature')
     end
   end
 
   def editable_fields
     [
-      :gene_id,
+      :feature_id,
       :name,
       :variant_alias_ids,
       :hgvs_description_ids,

From a0401de736286aaf2c2c42ac71556ea9daadce88 Mon Sep 17 00:00:00 2001
From: Susanna Kiwala <susanna.kiwala@wustl.edu>
Date: Wed, 27 Dec 2023 10:04:13 -0600
Subject: [PATCH 029/125] Fix Feature event feed

---
 client/src/app/generated/civic.apollo.ts                    | 1 +
 client/src/app/generated/server.model.graphql               | 1 +
 client/src/app/generated/server.schema.json                 | 6 ++++++
 .../features-detail/features-events/features-events.page.ts | 2 +-
 .../types/subscribable/subscribable_entities_type.rb        | 1 +
 5 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/client/src/app/generated/civic.apollo.ts b/client/src/app/generated/civic.apollo.ts
index 6f8eb1fba..512d24dcb 100644
--- a/client/src/app/generated/civic.apollo.ts
+++ b/client/src/app/generated/civic.apollo.ts
@@ -4940,6 +4940,7 @@ export type Subscribable = {
 export enum SubscribableEntities {
   Assertion = 'ASSERTION',
   EvidenceItem = 'EVIDENCE_ITEM',
+  Feature = 'FEATURE',
   Gene = 'GENE',
   MolecularProfile = 'MOLECULAR_PROFILE',
   Revision = 'REVISION',
diff --git a/client/src/app/generated/server.model.graphql b/client/src/app/generated/server.model.graphql
index 39f99b13e..6bdfdb987 100644
--- a/client/src/app/generated/server.model.graphql
+++ b/client/src/app/generated/server.model.graphql
@@ -8114,6 +8114,7 @@ Enumeration of all subscribable CIViC entities.
 enum SubscribableEntities {
   ASSERTION
   EVIDENCE_ITEM
+  FEATURE
   GENE
   MOLECULAR_PROFILE
   REVISION
diff --git a/client/src/app/generated/server.schema.json b/client/src/app/generated/server.schema.json
index cb319f12b..c4c143601 100644
--- a/client/src/app/generated/server.schema.json
+++ b/client/src/app/generated/server.schema.json
@@ -37692,6 +37692,12 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "FEATURE",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "VARIANT",
               "description": null,
diff --git a/client/src/app/views/features/features-detail/features-events/features-events.page.ts b/client/src/app/views/features/features-detail/features-events/features-events.page.ts
index 0f816105f..d5af658e1 100644
--- a/client/src/app/views/features/features-detail/features-events/features-events.page.ts
+++ b/client/src/app/views/features/features-detail/features-events/features-events.page.ts
@@ -17,7 +17,7 @@ export class FeaturesEventsPage {
     const geneId: number = +this.route.snapshot.params['featureId']
     this.subscribable = {
       id: geneId,
-      entityType: SubscribableEntities.Gene,
+      entityType: SubscribableEntities.Feature,
     }
   }
 }
diff --git a/server/app/graphql/types/subscribable/subscribable_entities_type.rb b/server/app/graphql/types/subscribable/subscribable_entities_type.rb
index a55c29e51..cca32811b 100644
--- a/server/app/graphql/types/subscribable/subscribable_entities_type.rb
+++ b/server/app/graphql/types/subscribable/subscribable_entities_type.rb
@@ -2,6 +2,7 @@ module Types::Subscribable
   class SubscribableEntitiesType < Types::BaseEnum
     description 'Enumeration of all subscribable CIViC entities.'
     value 'GENE', value: 'Features::Gene'
+    value 'FEATURE', value: 'Feature'
     value 'VARIANT', value: 'Variant'
     value 'EVIDENCE_ITEM', value: 'EvidenceItem'
     value 'ASSERTION', value: 'Assertion'

From 06326f8f4d75ae807f139adc22ce4a913aa0dee7 Mon Sep 17 00:00:00 2001
From: Susanna Kiwala <susanna.kiwala@wustl.edu>
Date: Wed, 27 Dec 2023 10:53:48 -0600
Subject: [PATCH 030/125] Clean up codebase

---
 .../activity-feed.component.html              |   6 +-
 .../activity-feed/activity-feed.module.ts     |   4 +-
 .../comment-popover.component.html            |   6 +-
 .../comment-popover/comment-popover.module.ts |   4 +-
 .../event-timeline/event-timeline.module.ts   |   4 +-
 .../flag-popover/flag-popover.component.html  |   6 +-
 .../flags/flag-popover/flag-popover.module.ts |   4 +-
 .../gene-popover/gene-popover.component.html  |  73 --
 .../gene-popover/gene-popover.component.less  |   1 -
 .../gene-popover/gene-popover.component.ts    |  32 -
 .../genes/gene-popover/gene-popover.module.ts |  31 -
 .../genes/gene-popover/gene-popover.query.gql |  24 -
 .../genes/gene-tag/gene-tag.component.html    |  43 -
 .../genes/gene-tag/gene-tag.component.ts      |  47 -
 .../genes/gene-tag/gene-tag.module.ts         |  28 -
 .../genes-summary/genes-summary.module.ts     |   0
 .../genes-summary/genes-summary.page.html     |   0
 .../genes-summary/genes-summary.page.less     |   0
 .../genes-summary/genes-summary.page.ts       |   2 +-
 .../genes-table/genes-table.component.html    | 237 -----
 .../genes-table/genes-table.component.less    |   5 -
 .../genes-table/genes-table.component.ts      | 208 -----
 .../genes/genes-table/genes-table.module.ts   |  57 --
 .../genes/genes-table/genes-table.query.gql   |  63 --
 .../molecular-profile-popover.module.ts       |   4 +-
 .../revision-popover.component.html           |   6 +-
 .../revision-popover.module.ts                |   4 +-
 .../revisions-list-and-filter.component.ts    |  18 +-
 .../tag-overflow/tag-overflow.component.html  |   5 -
 .../tag-overflow/tag-overflow.module.ts       |   2 -
 .../variants/variants-menu/variants-menu.gql  |   2 -
 .../icon-name-for-subscribable-entity.ts      |   6 +-
 .../entity-tag-popover.component.html         |   2 +-
 .../entity-tag-popover.module.ts              |   4 +-
 .../variant-revise.form.config.ts             |   2 +-
 .../variant-submit/variant-submit.form.ts     |   2 +-
 .../layout-tests/layout-forms.config.ts       |  10 +-
 .../feature-select.module.ts}                 |  26 +-
 .../feature-select.query.gql}                 |   0
 .../feature-select.type.html}                 |   0
 .../feature-select.type.less}                 |   0
 .../feature-select.type.ts}                   |  36 +-
 .../src/app/forms/types/form-types.module.ts  |   4 +-
 .../molecular-profile-builder.type.ts         |   6 +-
 .../mp-finder/mp-finder.component.ts          |   2 +-
 .../src/app/generated/civic.apollo-helpers.ts |  50 +-
 client/src/app/generated/civic.apollo.ts      | 360 +-------
 .../src/app/generated/civic.possible-types.ts |   1 -
 client/src/app/generated/server.model.graphql | 179 ----
 client/src/app/generated/server.schema.json   | 818 ------------------
 .../src/app/layout/layout-routing.module.ts   |   5 +-
 .../evidence-home/evidence-home.module.ts     |   2 -
 .../features-detail/features-detail.view.ts   |   2 +-
 .../features-summary.module.ts                |   2 +-
 .../features-summary.query.gql                |  32 +-
 .../features-revise/features-revise.view.html |   8 +-
 .../features-revise/features-revise.view.ts   |  18 +-
 .../features-suggest.page.html                |   4 +-
 .../genes-comments/genes-comments.module.ts   |  11 -
 .../genes-comments/genes-comments.page.html   |   1 -
 .../genes-comments/genes-comments.page.less   |   3 -
 .../genes-comments/genes-comments.page.ts     |  23 -
 .../genes-detail-routing.module.ts            |  74 --
 .../genes/genes-detail/genes-detail.module.ts |  42 -
 .../genes/genes-detail/genes-detail.query.gql |  21 -
 .../genes/genes-detail/genes-detail.view.html |  83 --
 .../genes/genes-detail/genes-detail.view.less |   1 -
 .../genes/genes-detail/genes-detail.view.ts   | 120 ---
 .../genes-events/genes-events.module.ts       |  11 -
 .../genes-events/genes-events.page.html       |   3 -
 .../genes-events/genes-events.page.less       |   3 -
 .../genes-events/genes-events.page.ts         |  23 -
 .../genes-flags/genes-flags.module.ts         |  21 -
 .../genes-flags/genes-flags.page.html         |   1 -
 .../genes-flags/genes-flags.page.less         |   3 -
 .../genes-flags/genes-flags.page.ts           |  23 -
 .../genes-revisions/genes-revisions.module.ts |  35 -
 .../genes-revisions/genes-revisions.page.html |   3 -
 .../genes-revisions/genes-revisions.page.less |   3 -
 .../genes-revisions/genes-revisions.page.ts   |  27 -
 .../genes-summary/genes-summary.query.gql     |  22 -
 .../genes/genes-home/genes-home.component.ts  |  12 -
 .../genes/genes-home/genes-home.module.ts     |  30 -
 .../genes/genes-home/genes-home.page.html     |  72 --
 .../genes/genes-home/genes-home.page.less     |   1 -
 .../views/genes/genes-home/genes-home.page.ts |  12 -
 .../genes-revise-routing.module.ts            |  28 -
 .../genes/genes-revise/genes-revise.module.ts |  32 -
 .../genes/genes-revise/genes-revise.view.html |  38 -
 .../genes/genes-revise/genes-revise.view.less |   1 -
 .../genes/genes-revise/genes-revise.view.ts   |  54 --
 .../genes-suggest/genes-suggest.module.ts     |  28 -
 .../genes-suggest/genes-suggest.page.html     |   3 -
 .../genes-suggest/genes-suggest.page.less     |   1 -
 .../genes-suggest/genes-suggest.page.ts       |  23 -
 .../app/views/genes/genes-routing.module.ts   |  49 --
 client/src/app/views/genes/genes.module.ts    |  11 -
 client/src/app/views/genes/genes.view.html    |   1 -
 client/src/app/views/genes/genes.view.ts      |   9 -
 .../molecular-profiles-detail.module.ts       |   2 -
 .../molecular-profiles-summary.module.ts      |   2 -
 .../molecular-profiles-home.module.ts         |   2 -
 .../variants-home/variants-home.module.ts     |   2 -
 server/app/graphql/resolvers/browse_genes.rb  |  48 -
 .../resolvers/top_level_variant_groups.rb     |   5 -
 .../graphql/resolvers/top_level_variants.rb   |   4 -
 .../types/browse_tables/browse_gene_type.rb   |  39 -
 .../types/browse_tables/genes_sort_columns.rb |  12 -
 .../types/browse_tables/genes_sort_type.rb    |   6 -
 .../commentable/taggable_entity_input_type.rb |   4 +-
 .../graphql/types/entities/feature_type.rb    |  11 -
 .../graphql/types/entities/variant_type.rb    |   5 -
 .../flaggable/flaggable_entities_type.rb      |   1 -
 .../types/flaggable/flaggable_input.rb        |   2 -
 .../graphql/types/interfaces/commentable.rb   |   2 -
 .../graphql/types/interfaces/event_subject.rb |   2 -
 .../app/graphql/types/interfaces/flaggable.rb |   2 -
 server/app/graphql/types/query_type.rb        |   1 -
 .../revisions/moderated_entities_type.rb      |   1 -
 .../subscribable_entities_type.rb             |   1 -
 120 files changed, 150 insertions(+), 3473 deletions(-)
 delete mode 100644 client/src/app/components/genes/gene-popover/gene-popover.component.html
 delete mode 100644 client/src/app/components/genes/gene-popover/gene-popover.component.less
 delete mode 100644 client/src/app/components/genes/gene-popover/gene-popover.component.ts
 delete mode 100644 client/src/app/components/genes/gene-popover/gene-popover.module.ts
 delete mode 100644 client/src/app/components/genes/gene-popover/gene-popover.query.gql
 delete mode 100644 client/src/app/components/genes/gene-tag/gene-tag.component.html
 delete mode 100644 client/src/app/components/genes/gene-tag/gene-tag.component.ts
 delete mode 100644 client/src/app/components/genes/gene-tag/gene-tag.module.ts
 rename client/src/app/{views/genes/genes-detail => components/genes}/genes-summary/genes-summary.module.ts (100%)
 rename client/src/app/{views/genes/genes-detail => components/genes}/genes-summary/genes-summary.page.html (100%)
 rename client/src/app/{views/genes/genes-detail => components/genes}/genes-summary/genes-summary.page.less (100%)
 rename client/src/app/{views/genes/genes-detail => components/genes}/genes-summary/genes-summary.page.ts (92%)
 delete mode 100644 client/src/app/components/genes/genes-table/genes-table.component.html
 delete mode 100644 client/src/app/components/genes/genes-table/genes-table.component.less
 delete mode 100644 client/src/app/components/genes/genes-table/genes-table.component.ts
 delete mode 100644 client/src/app/components/genes/genes-table/genes-table.module.ts
 delete mode 100644 client/src/app/components/genes/genes-table/genes-table.query.gql
 rename client/src/app/forms/types/{gene-select/gene-select.module.ts => feature-select/feature-select.module.ts} (79%)
 rename client/src/app/forms/types/{gene-select/gene-select.query.gql => feature-select/feature-select.query.gql} (100%)
 rename client/src/app/forms/types/{gene-select/gene-select.type.html => feature-select/feature-select.type.html} (100%)
 rename client/src/app/forms/types/{gene-select/gene-select.type.less => feature-select/feature-select.type.less} (100%)
 rename client/src/app/forms/types/{gene-select/gene-select.type.ts => feature-select/feature-select.type.ts} (82%)
 delete mode 100644 client/src/app/views/genes/genes-detail/genes-comments/genes-comments.module.ts
 delete mode 100644 client/src/app/views/genes/genes-detail/genes-comments/genes-comments.page.html
 delete mode 100644 client/src/app/views/genes/genes-detail/genes-comments/genes-comments.page.less
 delete mode 100644 client/src/app/views/genes/genes-detail/genes-comments/genes-comments.page.ts
 delete mode 100644 client/src/app/views/genes/genes-detail/genes-detail-routing.module.ts
 delete mode 100644 client/src/app/views/genes/genes-detail/genes-detail.module.ts
 delete mode 100644 client/src/app/views/genes/genes-detail/genes-detail.query.gql
 delete mode 100644 client/src/app/views/genes/genes-detail/genes-detail.view.html
 delete mode 100644 client/src/app/views/genes/genes-detail/genes-detail.view.less
 delete mode 100644 client/src/app/views/genes/genes-detail/genes-detail.view.ts
 delete mode 100644 client/src/app/views/genes/genes-detail/genes-events/genes-events.module.ts
 delete mode 100644 client/src/app/views/genes/genes-detail/genes-events/genes-events.page.html
 delete mode 100644 client/src/app/views/genes/genes-detail/genes-events/genes-events.page.less
 delete mode 100644 client/src/app/views/genes/genes-detail/genes-events/genes-events.page.ts
 delete mode 100644 client/src/app/views/genes/genes-detail/genes-flags/genes-flags.module.ts
 delete mode 100644 client/src/app/views/genes/genes-detail/genes-flags/genes-flags.page.html
 delete mode 100644 client/src/app/views/genes/genes-detail/genes-flags/genes-flags.page.less
 delete mode 100644 client/src/app/views/genes/genes-detail/genes-flags/genes-flags.page.ts
 delete mode 100644 client/src/app/views/genes/genes-detail/genes-revisions/genes-revisions.module.ts
 delete mode 100644 client/src/app/views/genes/genes-detail/genes-revisions/genes-revisions.page.html
 delete mode 100644 client/src/app/views/genes/genes-detail/genes-revisions/genes-revisions.page.less
 delete mode 100644 client/src/app/views/genes/genes-detail/genes-revisions/genes-revisions.page.ts
 delete mode 100644 client/src/app/views/genes/genes-detail/genes-summary/genes-summary.query.gql
 delete mode 100644 client/src/app/views/genes/genes-home/genes-home.component.ts
 delete mode 100644 client/src/app/views/genes/genes-home/genes-home.module.ts
 delete mode 100644 client/src/app/views/genes/genes-home/genes-home.page.html
 delete mode 100644 client/src/app/views/genes/genes-home/genes-home.page.less
 delete mode 100644 client/src/app/views/genes/genes-home/genes-home.page.ts
 delete mode 100644 client/src/app/views/genes/genes-revise/genes-revise-routing.module.ts
 delete mode 100644 client/src/app/views/genes/genes-revise/genes-revise.module.ts
 delete mode 100644 client/src/app/views/genes/genes-revise/genes-revise.view.html
 delete mode 100644 client/src/app/views/genes/genes-revise/genes-revise.view.less
 delete mode 100644 client/src/app/views/genes/genes-revise/genes-revise.view.ts
 delete mode 100644 client/src/app/views/genes/genes-revise/genes-suggest/genes-suggest.module.ts
 delete mode 100644 client/src/app/views/genes/genes-revise/genes-suggest/genes-suggest.page.html
 delete mode 100644 client/src/app/views/genes/genes-revise/genes-suggest/genes-suggest.page.less
 delete mode 100644 client/src/app/views/genes/genes-revise/genes-suggest/genes-suggest.page.ts
 delete mode 100644 client/src/app/views/genes/genes-routing.module.ts
 delete mode 100644 client/src/app/views/genes/genes.module.ts
 delete mode 100644 client/src/app/views/genes/genes.view.html
 delete mode 100644 client/src/app/views/genes/genes.view.ts
 delete mode 100644 server/app/graphql/resolvers/browse_genes.rb
 delete mode 100644 server/app/graphql/types/browse_tables/browse_gene_type.rb
 delete mode 100644 server/app/graphql/types/browse_tables/genes_sort_columns.rb
 delete mode 100644 server/app/graphql/types/browse_tables/genes_sort_type.rb

diff --git a/client/src/app/components/activities/activity-feed/activity-feed.component.html b/client/src/app/components/activities/activity-feed/activity-feed.component.html
index cb9d132ba..888d35f10 100644
--- a/client/src/app/components/activities/activity-feed/activity-feed.component.html
+++ b/client/src/app/components/activities/activity-feed/activity-feed.component.html
@@ -26,9 +26,9 @@
           {{ activity.verbiage }}
           <ng-container
             [ngSwitch]="activity.subject.__typename">
-            <cvc-gene-tag
-              *ngSwitchCase="'Gene'"
-              [gene]="activity.subject"></cvc-gene-tag>
+            <cvc-feature-tag
+              *ngSwitchCase="'Feature'"
+              [feature]="activity.subject"></cvc-feature-tag>
             <cvc-assertion-tag
               *ngSwitchCase="'Assertion'"
               [assertion]="activity.subject"></cvc-assertion-tag>
diff --git a/client/src/app/components/activities/activity-feed/activity-feed.module.ts b/client/src/app/components/activities/activity-feed/activity-feed.module.ts
index 990dd8e92..3a5b036ea 100644
--- a/client/src/app/components/activities/activity-feed/activity-feed.module.ts
+++ b/client/src/app/components/activities/activity-feed/activity-feed.module.ts
@@ -21,7 +21,6 @@ import { NzBadgeModule } from 'ng-zorro-antd/badge'
 import { NzToolTipModule } from 'ng-zorro-antd/tooltip'
 import { NzTimelineModule } from 'ng-zorro-antd/timeline'
 import { CvcUserTagModule } from '@app/components/users/user-tag/user-tag.module'
-import { CvcGeneTagModule } from '@app/components/genes/gene-tag/gene-tag.module'
 import { CvcAssertionsTagModule } from '@app/components/assertions/assertions-tag/assertions-tag.module'
 import { CvcEvidenceTagModule } from '@app/components/evidence/evidence-tag/evidence-tag.module'
 import { CvcVariantTagModule } from '@app/components/variants/variant-tag/variant-tag.module'
@@ -32,6 +31,7 @@ import { CvcRevisionTagModule } from '@app/components/revisions/revision-tag/rev
 import { NzCollapseModule } from 'ng-zorro-antd/collapse'
 import { CvcActivityCardModule } from '../activity-card/activity-card.module'
 import { CvcCollapsibleCardModule } from '../collapsible-card/collapsible-card.module'
+import { CvcFeatureTagModule } from '@app/components/features/feature-tag/feature-tag.module'
 
 @NgModule({
   declarations: [CvcActivityFeedComponent],
@@ -60,7 +60,7 @@ import { CvcCollapsibleCardModule } from '../collapsible-card/collapsible-card.m
     CvcParticipantListModule,
     CvcPipesModule,
     CvcUserTagModule,
-    CvcGeneTagModule,
+    CvcFeatureTagModule,
     CvcAssertionsTagModule,
     CvcEvidenceTagModule,
     CvcVariantTagModule,
diff --git a/client/src/app/components/comments/comment-popover/comment-popover.component.html b/client/src/app/components/comments/comment-popover/comment-popover.component.html
index 28bbe956b..0d1caf79e 100644
--- a/client/src/app/components/comments/comment-popover/comment-popover.component.html
+++ b/client/src/app/components/comments/comment-popover/comment-popover.component.html
@@ -11,10 +11,10 @@
             [user]="c.commenter"></cvc-user-tag
           >commented on
           <ng-container [ngSwitch]="c.commentable.__typename">
-            <cvc-gene-tag
-              *ngSwitchCase="'Gene'"
+            <cvc-feature-tag
+              *ngSwitchCase="'Feature'"
               [enablePopover]="false"
-              [gene]="c.commentable"></cvc-gene-tag>
+              [feature]="c.commentable"></cvc-feature-tag>
             <cvc-assertion-tag
               *ngSwitchCase="'Assertion'"
               [enablePopover]="false"
diff --git a/client/src/app/components/comments/comment-popover/comment-popover.module.ts b/client/src/app/components/comments/comment-popover/comment-popover.module.ts
index 4aec0952f..b7f5b8dfc 100644
--- a/client/src/app/components/comments/comment-popover/comment-popover.module.ts
+++ b/client/src/app/components/comments/comment-popover/comment-popover.module.ts
@@ -8,10 +8,10 @@ import { CvcEvidenceTagModule } from '@app/components/evidence/evidence-tag/evid
 import { CvcVariantTagModule } from '@app/components/variants/variant-tag/variant-tag.module'
 import { NzCardModule } from 'ng-zorro-antd/card'
 import { NzGridModule } from 'ng-zorro-antd/grid'
-import { CvcGeneTagModule } from '@app/components/genes/gene-tag/gene-tag.module'
 import { CvcRevisionTagModule } from '@app/components/revisions/revision-tag/revision-tag.module'
 import { CvcSourceTagModule } from '@app/components/sources/source-tag/source-tag.module'
 import { CvcPipesModule } from '@app/core/pipes/pipes.module'
+import { CvcFeatureTagModule } from '@app/components/features/feature-tag/feature-tag.module'
 
 @NgModule({
   declarations: [CvcCommentPopoverComponent],
@@ -21,7 +21,7 @@ import { CvcPipesModule } from '@app/core/pipes/pipes.module'
     PushPipe,
     NzCardModule,
     NzGridModule,
-    CvcGeneTagModule,
+    CvcFeatureTagModule,
     CvcUserTagModule,
     CvcAssertionsTagModule,
     CvcEvidenceTagModule,
diff --git a/client/src/app/components/events/event-timeline/event-timeline.module.ts b/client/src/app/components/events/event-timeline/event-timeline.module.ts
index 3b04bf8cb..9cb09c5d6 100644
--- a/client/src/app/components/events/event-timeline/event-timeline.module.ts
+++ b/client/src/app/components/events/event-timeline/event-timeline.module.ts
@@ -7,7 +7,6 @@ import { NzTypographyModule } from 'ng-zorro-antd/typography'
 import { CvcPipesModule } from '@app/core/pipes/pipes.module'
 import { CvcCommentTagModule } from '@app/components/comments/comment-tag/comment-tag.module'
 import { CvcFlagTagModule } from '@app/components/flags/flag-tag/flag-tag.module'
-import { CvcGeneTagModule } from '@app/components/genes/gene-tag/gene-tag.module'
 import { CvcAssertionsTagModule } from '@app/components/assertions/assertions-tag/assertions-tag.module'
 import { CvcEvidenceTagModule } from '@app/components/evidence/evidence-tag/evidence-tag.module'
 import { CvcVariantTagModule } from '@app/components/variants/variant-tag/variant-tag.module'
@@ -19,6 +18,7 @@ import { CvcRevisionTagModule } from '@app/components/revisions/revision-tag/rev
 import { NzButtonModule } from 'ng-zorro-antd/button'
 import { CvcSourceTagModule } from '@app/components/sources/source-tag/source-tag.module'
 import { CvcEventTimelineItemModule } from '../event-timeline-item/event-timeline-item-module'
+import { CvcFeatureTagModule } from '@app/components/features/feature-tag/feature-tag.module'
 
 @NgModule({
   declarations: [CvcEventTimelineComponent],
@@ -35,7 +35,7 @@ import { CvcEventTimelineItemModule } from '../event-timeline-item/event-timelin
     CvcPipesModule,
     CvcCommentTagModule,
     CvcFlagTagModule,
-    CvcGeneTagModule,
+    CvcFeatureTagModule,
     CvcAssertionsTagModule,
     CvcEvidenceTagModule,
     CvcVariantTagModule,
diff --git a/client/src/app/components/flags/flag-popover/flag-popover.component.html b/client/src/app/components/flags/flag-popover/flag-popover.component.html
index 62964c253..1a4c98d82 100644
--- a/client/src/app/components/flags/flag-popover/flag-popover.component.html
+++ b/client/src/app/components/flags/flag-popover/flag-popover.component.html
@@ -23,10 +23,10 @@
 
       <ng-template #subject>
         <ng-container [ngSwitch]="f.flaggable.__typename">
-          <cvc-gene-tag
-            *ngSwitchCase="'Gene'"
+          <cvc-feature-tag
+            *ngSwitchCase="'Feature'"
             [enablePopover]="false"
-            [gene]="f.flaggable"></cvc-gene-tag>
+            [feature]="f.flaggable"></cvc-feature-tag>
           <cvc-assertion-tag
             *ngSwitchCase="'Assertion'"
             [enablePopover]="false"
diff --git a/client/src/app/components/flags/flag-popover/flag-popover.module.ts b/client/src/app/components/flags/flag-popover/flag-popover.module.ts
index c0804b59f..fc517e5bb 100644
--- a/client/src/app/components/flags/flag-popover/flag-popover.module.ts
+++ b/client/src/app/components/flags/flag-popover/flag-popover.module.ts
@@ -7,7 +7,6 @@ import { CvcEvidenceTagModule } from '@app/components/evidence/evidence-tag/evid
 import { CvcVariantTagModule } from '@app/components/variants/variant-tag/variant-tag.module'
 import { NzCardModule } from 'ng-zorro-antd/card'
 import { NzGridModule } from 'ng-zorro-antd/grid'
-import { CvcGeneTagModule } from '@app/components/genes/gene-tag/gene-tag.module'
 import { CvcVariantGroupTagModule } from '@app/components/variant-groups/variant-group-tag/variant-group-tag.module'
 import { CvcStatusTagModule } from '@app/components/shared/status-tag/status-tag.module'
 import { NzIconModule } from 'ng-zorro-antd/icon'
@@ -16,6 +15,7 @@ import { NzDescriptionsModule } from 'ng-zorro-antd/descriptions'
 import { CvcFlagPopoverComponent } from './flag-popover.component'
 import { CvcPipesModule } from '@app/core/pipes/pipes.module'
 import { CvcCommentBodyModule } from '@app/components/comments/comment-body/comment-body.module'
+import { CvcFeatureTagModule } from '@app/components/features/feature-tag/feature-tag.module'
 
 @NgModule({
   declarations: [CvcFlagPopoverComponent],
@@ -29,7 +29,7 @@ import { CvcCommentBodyModule } from '@app/components/comments/comment-body/comm
     NzSpaceModule,
     NzDescriptionsModule,
     CvcPipesModule,
-    CvcGeneTagModule,
+    CvcFeatureTagModule,
     CvcUserTagModule,
     CvcAssertionsTagModule,
     CvcEvidenceTagModule,
diff --git a/client/src/app/components/genes/gene-popover/gene-popover.component.html b/client/src/app/components/genes/gene-popover/gene-popover.component.html
deleted file mode 100644
index 54628b964..000000000
--- a/client/src/app/components/genes/gene-popover/gene-popover.component.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<div id="popover-content">
-  <ng-container *ngIf="gene$ | ngrxPush as gene">
-    <nz-card
-      [nzTitle]="cardTitle"
-      nzBordered="false"
-      id="card-content">
-      <ng-template #cardTitle>
-        <i
-          nz-icon
-          nzTheme="twotone"
-          [nzTwotoneColor]="'Gene' | entityColor"
-          nzType="civic-gene"></i>
-        {{ gene.fullName }}
-      </ng-template>
-
-      <nz-descriptions
-        nzSize="small"
-        [nzColumn]="2"
-        nzBordered="true">
-        <!-- aliases -->
-        <nz-descriptions-item
-          nzTitle="Aliases"
-          nzSpan="2"
-          *ngIf="gene.featureAliases.length > 0">
-          <nz-tag *ngFor="let alias of gene.featureAliases">{{ alias }}</nz-tag>
-        </nz-descriptions-item>
-
-        <!-- variant count-->
-        <nz-descriptions-item nzTitle="Variants">
-          {{ gene.variants.totalCount }}
-        </nz-descriptions-item>
-      </nz-descriptions>
-
-      <!-- entity comment, flags, etc. tags -->
-      <nz-row id="entity-child-counts">
-        <nz-col nzSpan="24">
-          <nz-space nzSize="small">
-            <a
-              routerLink="/genes/{{ gene.id }}/flags"
-              *nzSpaceItem>
-              <nz-tag nzColor="red">
-                <i
-                  nz-icon
-                  nzType="civic-flag"></i>
-                Flags ({{ gene.flags.totalCount }})
-              </nz-tag>
-            </a>
-            <a
-              routerLink="/genes/{{ gene.id }}/revisions"
-              *nzSpaceItem>
-              <nz-tag nzColor="orange">
-                <i
-                  nz-icon
-                  nzType="civic-revision"></i>
-                Revisions ({{ gene.revisions.totalCount }})
-              </nz-tag>
-            </a>
-            <a
-              routerLink="/genes/{{ gene.id }}/comments"
-              *nzSpaceItem>
-              <nz-tag nzColor="blue">
-                <i
-                  nz-icon
-                  nzType="civic-comment"></i>
-                Comments ({{ gene.comments.totalCount }})
-              </nz-tag>
-            </a>
-          </nz-space>
-        </nz-col>
-      </nz-row>
-    </nz-card>
-  </ng-container>
-</div>
diff --git a/client/src/app/components/genes/gene-popover/gene-popover.component.less b/client/src/app/components/genes/gene-popover/gene-popover.component.less
deleted file mode 100644
index 08b626e98..000000000
--- a/client/src/app/components/genes/gene-popover/gene-popover.component.less
+++ /dev/null
@@ -1 +0,0 @@
-@import "themes/overrides/entity-popover.overrides.less";
diff --git a/client/src/app/components/genes/gene-popover/gene-popover.component.ts b/client/src/app/components/genes/gene-popover/gene-popover.component.ts
deleted file mode 100644
index 4a2a34ae1..000000000
--- a/client/src/app/components/genes/gene-popover/gene-popover.component.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { Component, Input, OnInit } from '@angular/core'
-import {
-  GenePopoverFragment,
-  GenePopoverGQL,
-  Maybe,
-} from '@app/generated/civic.apollo'
-import { Observable } from 'rxjs'
-import { isNonNulled } from 'rxjs-etc'
-import { filter, map } from 'rxjs/operators'
-
-@Component({
-  selector: 'cvc-gene-popover',
-  templateUrl: './gene-popover.component.html',
-  styleUrls: ['./gene-popover.component.less'],
-})
-export class CvcGenePopoverComponent implements OnInit {
-  @Input() geneId!: number
-
-  gene$?: Observable<Maybe<GenePopoverFragment>>
-
-  constructor(private gql: GenePopoverGQL) {}
-
-  ngOnInit() {
-    if (this.geneId == undefined) {
-      throw new Error('cvc-gene-popover requires valid geneId input.')
-    }
-    this.gene$ = this.gql.watch({ geneId: this.geneId }).valueChanges.pipe(
-      map(({ data }) => data?.gene),
-      filter(isNonNulled)
-    )
-  }
-}
diff --git a/client/src/app/components/genes/gene-popover/gene-popover.module.ts b/client/src/app/components/genes/gene-popover/gene-popover.module.ts
deleted file mode 100644
index 262159f74..000000000
--- a/client/src/app/components/genes/gene-popover/gene-popover.module.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { CommonModule } from '@angular/common'
-import { NgModule } from '@angular/core'
-import { RouterModule } from '@angular/router'
-import { CvcPipesModule } from '@app/core/pipes/pipes.module'
-import { LetDirective, PushPipe } from '@ngrx/component'
-import { NzCardModule } from 'ng-zorro-antd/card'
-import { NzDescriptionsModule } from 'ng-zorro-antd/descriptions'
-import { NzGridModule } from 'ng-zorro-antd/grid'
-import { NzIconModule } from 'ng-zorro-antd/icon'
-import { NzSpaceModule } from 'ng-zorro-antd/space'
-import { NzTagModule } from 'ng-zorro-antd/tag'
-import { CvcGenePopoverComponent } from './gene-popover.component'
-
-@NgModule({
-  declarations: [CvcGenePopoverComponent],
-  imports: [
-    CommonModule,
-    RouterModule,
-    LetDirective,
-    PushPipe,
-    NzCardModule,
-    NzGridModule,
-    NzDescriptionsModule,
-    NzTagModule,
-    NzIconModule,
-    NzSpaceModule,
-    CvcPipesModule,
-  ],
-  exports: [CvcGenePopoverComponent],
-})
-export class CvcGenePopoverModule {}
diff --git a/client/src/app/components/genes/gene-popover/gene-popover.query.gql b/client/src/app/components/genes/gene-popover/gene-popover.query.gql
deleted file mode 100644
index c573d3f7e..000000000
--- a/client/src/app/components/genes/gene-popover/gene-popover.query.gql
+++ /dev/null
@@ -1,24 +0,0 @@
-query GenePopover($geneId: Int!) {
-  gene(id: $geneId) {
-    ...genePopover
-  }
-}
-
-fragment genePopover on Gene {
-  id
-  name
-  fullName
-  featureAliases
-  variants {
-    totalCount
-  }
-  revisions(status: NEW) {
-    totalCount
-  }
-  comments {
-    totalCount
-  }
-  flags(state: OPEN) {
-    totalCount
-  }
-}
diff --git a/client/src/app/components/genes/gene-tag/gene-tag.component.html b/client/src/app/components/genes/gene-tag/gene-tag.component.html
deleted file mode 100644
index 174e0fcdc..000000000
--- a/client/src/app/components/genes/gene-tag/gene-tag.component.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<ng-container *ngIf="linked; else unlinked">
-  <a [routerLink]="gene.link">
-    <ng-template [ngTemplateOutlet]="tag"></ng-template>
-  </a>
-</ng-container>
-
-<ng-template #tag>
-  <nz-tag
-    nz-popover
-    [nzPopoverMouseEnterDelay]="this.onCloseClicked ? 0 : 0.5"
-    [nzPopoverContent]="genePopover"
-    [nzPopoverTrigger]="enablePopover ? 'hover' : null"
-    [nzMode]="this.onCloseClicked ? 'closeable' : 'default'"
-    (nzOnClose)="itemClosed($event)">
-    <ng-template [ngTemplateOutlet]="tagContent"></ng-template>
-  </nz-tag>
-  <ng-template #genePopover>
-    <cvc-gene-popover [geneId]="gene.id"></cvc-gene-popover>
-  </ng-template>
-</ng-template>
-
-<ng-template #unlinked>
-  <ng-template [ngTemplateOutlet]="tag"></ng-template>
-</ng-template>
-
-<ng-template #tagContent>
-  <cvc-icon-badges
-    [flagged]="gene.flagged"
-    [entityColor]="iconColor">
-    <i
-      nz-icon
-      nzType="civic-gene"
-      nzTheme="twotone"
-      [nzTwotoneColor]="'Gene' | entityColor"></i>
-  </cvc-icon-badges>
-  <!-- gene name length mean: 8; mode: 12 (15306); max: 25 -->
-  <ng-container *ngIf="this.truncateLongName; else fullName">
-    {{ gene.name | truncate : 12 }}
-  </ng-container>
-  <ng-template #fullName>
-    {{ gene.name }}
-  </ng-template>
-</ng-template>
diff --git a/client/src/app/components/genes/gene-tag/gene-tag.component.ts b/client/src/app/components/genes/gene-tag/gene-tag.component.ts
deleted file mode 100644
index 0d54f8969..000000000
--- a/client/src/app/components/genes/gene-tag/gene-tag.component.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import {
-  ChangeDetectionStrategy,
-  Component,
-  Input,
-  OnInit,
-} from '@angular/core'
-import { BaseCloseableTag } from '@app/core/utilities/closeable-tag-base'
-import { getEntityColor } from '@app/core/utilities/get-entity-color'
-import { Maybe } from '@app/generated/civic.apollo'
-
-export interface LinkableGene {
-  id: number
-  name: string
-  link: string
-  flagged?: boolean
-}
-
-@Component({
-  selector: 'cvc-gene-tag',
-  templateUrl: './gene-tag.component.html',
-  changeDetection: ChangeDetectionStrategy.OnPush,
-})
-export class CvcGeneTagComponent extends BaseCloseableTag implements OnInit {
-  @Input() gene!: LinkableGene
-  @Input() enablePopover: Maybe<boolean> = true
-  @Input() truncateLongName: Maybe<boolean> = false
-
-  iconColor: string
-
-  constructor() {
-    super()
-    this.iconColor = getEntityColor('Gene')
-  }
-
-  idFunction(): number {
-    return this.gene.id
-  }
-
-  ngOnInit() {
-    super.ngOnInit()
-    if (this.gene === undefined) {
-      throw new Error(
-        'cvc-gene-tag requires LinkableGene input, none supplied.'
-      )
-    }
-  }
-}
diff --git a/client/src/app/components/genes/gene-tag/gene-tag.module.ts b/client/src/app/components/genes/gene-tag/gene-tag.module.ts
deleted file mode 100644
index 0dfe43231..000000000
--- a/client/src/app/components/genes/gene-tag/gene-tag.module.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { NgModule } from '@angular/core'
-import { CommonModule } from '@angular/common'
-import { CvcGeneTagComponent } from './gene-tag.component'
-import { RouterModule } from '@angular/router'
-import { NzTagModule } from 'ng-zorro-antd/tag'
-import { NzIconModule } from 'ng-zorro-antd/icon'
-import { NzPopoverModule } from 'ng-zorro-antd/popover'
-import { CvcGenePopoverModule } from '../gene-popover/gene-popover.module'
-import { CvcPipesModule } from '@app/core/pipes/pipes.module'
-import { NzBadgeModule } from 'ng-zorro-antd/badge'
-import { CvcIconBadgesModule } from '@app/components/shared/icon-badges/icon-badges.module'
-
-@NgModule({
-  declarations: [CvcGeneTagComponent],
-  imports: [
-    CommonModule,
-    RouterModule,
-    NzTagModule,
-    NzPopoverModule,
-    NzIconModule,
-    NzBadgeModule,
-    CvcPipesModule,
-    CvcGenePopoverModule,
-    CvcIconBadgesModule,
-  ],
-  exports: [CvcGeneTagComponent],
-})
-export class CvcGeneTagModule {}
diff --git a/client/src/app/views/genes/genes-detail/genes-summary/genes-summary.module.ts b/client/src/app/components/genes/genes-summary/genes-summary.module.ts
similarity index 100%
rename from client/src/app/views/genes/genes-detail/genes-summary/genes-summary.module.ts
rename to client/src/app/components/genes/genes-summary/genes-summary.module.ts
diff --git a/client/src/app/views/genes/genes-detail/genes-summary/genes-summary.page.html b/client/src/app/components/genes/genes-summary/genes-summary.page.html
similarity index 100%
rename from client/src/app/views/genes/genes-detail/genes-summary/genes-summary.page.html
rename to client/src/app/components/genes/genes-summary/genes-summary.page.html
diff --git a/client/src/app/views/genes/genes-detail/genes-summary/genes-summary.page.less b/client/src/app/components/genes/genes-summary/genes-summary.page.less
similarity index 100%
rename from client/src/app/views/genes/genes-detail/genes-summary/genes-summary.page.less
rename to client/src/app/components/genes/genes-summary/genes-summary.page.less
diff --git a/client/src/app/views/genes/genes-detail/genes-summary/genes-summary.page.ts b/client/src/app/components/genes/genes-summary/genes-summary.page.ts
similarity index 92%
rename from client/src/app/views/genes/genes-detail/genes-summary/genes-summary.page.ts
rename to client/src/app/components/genes/genes-summary/genes-summary.page.ts
index ce741730f..557ac7746 100644
--- a/client/src/app/views/genes/genes-detail/genes-summary/genes-summary.page.ts
+++ b/client/src/app/components/genes/genes-summary/genes-summary.page.ts
@@ -23,7 +23,7 @@ export class GenesSummaryPage implements OnInit {
     else {
       this.subscribableEntity = {
         id: this.gene.id,
-        entityType: SubscribableEntities.Gene,
+        entityType: SubscribableEntities.Feature,
       }
     }
   }
diff --git a/client/src/app/components/genes/genes-table/genes-table.component.html b/client/src/app/components/genes/genes-table/genes-table.component.html
deleted file mode 100644
index 02b615b73..000000000
--- a/client/src/app/components/genes/genes-table/genes-table.component.html
+++ /dev/null
@@ -1,237 +0,0 @@
-<!-- if cvcHeight not specified, render table without card height container & viewport target -->
-<ng-container *ngIf="!cvcHeight; else setHeightCard">
-  <!-- adjust nz-card's cvcAutoHeightCard to equalize padding around this table's container e.g. entity-home's nz-page-header components -->
-  <nz-card
-    [nzTitle]="titleTemplate"
-    [nzExtra]="extraTemplate"
-    nzSize="small"
-    cvcAutoHeightCard
-    cvcAutoHeightTarget="viewport">
-    <ng-template [ngTemplateOutlet]="table"> </ng-template>
-  </nz-card>
-</ng-container>
-
-<!-- if cvcHeight is specified, render table in container w/ specified height-->
-<ng-template #setHeightCard>
-  <div
-    class="card-container"
-    [ngStyle]="{ height: cvcHeight }">
-    <nz-card
-      [nzTitle]="titleTemplate"
-      [nzExtra]="extraTemplate"
-      cvcAutoHeightCard
-      nzSize="small">
-      <ng-template [ngTemplateOutlet]="table"> </ng-template>
-    </nz-card>
-  </div>
-</ng-template>
-
-<ng-template #table>
-  <!-- nzVirtualItemSize can be determined by inspecting the row element in Dev tools, and noting the height calculated in its Styles tab. this probably shouldn't change much, if at all. -->
-  <nz-table
-    #virtualTable
-    nzSize="small"
-    [nzData]="(row$ | ngrxPush) || []"
-    [nzLoading]="!(row$ | ngrxPush)"
-    [cvcAutoHeightTable]="25"
-    [nzVirtualItemSize]="29"
-    cvcTableScroll
-    (cvcTableScrollOnScroll)="scrollEvent$.next($event)"
-    [cvcTableScrollQueryRef]="queryRef"
-    [cvcTableScrollPageInfo]="pageInfo$ | ngrxPush"
-    [cvcTableScrollToIndex]="(scrollIndex$ | ngrxPush)!"
-    [nzVirtualForTrackBy]="trackByIndex"
-    [nzScroll]="{ x: '680px', y: '800px' }"
-    [nzFrontPagination]="false"
-    [nzShowPagination]="false">
-    <thead (nzSortOrderChange)="sortChange$.next($event)">
-      <tr class="col-header-row">
-        <th
-          nzWidth="150px"
-          nzLeft
-          [nzColumnKey]="sortColumns.EntrezSymbol"
-          [nzSortFn]="true">
-          Name
-        </th>
-        <th
-          nzLeft
-          nzWidth="200px">
-          Aliases
-        </th>
-        <th nzWidth="250px">Diseases</th>
-        <th nzWidth="225px">Therapies</th>
-        <th
-          nzWidth="75px"
-          nzRight
-          nzAlign="right"
-          [nzColumnKey]="sortColumns.MolecularProfileCount"
-          [nzSortFn]="true"
-          [nzSortDirections]="['descend', 'ascend', null]"
-          nz-tooltip
-          nzTooltipTitle="Molecular Profile Count">
-          <i
-            nz-icon
-            nzType="civic-molecularprofile"></i>
-          Count
-        </th>
-        <th
-          nzWidth="75px"
-          nzRight
-          nzAlign="right"
-          [nzColumnKey]="sortColumns.VariantCount"
-          [nzSortFn]="true"
-          [nzSortDirections]="['descend', 'ascend', null]"
-          nz-tooltip
-          nzTooltipTitle="Variant Count">
-          <i
-            nz-icon
-            nzType="civic-variant"></i>
-          Count
-        </th>
-        <th
-          nzWidth="75px"
-          nzRight
-          nzAlign="right"
-          [nzColumnKey]="sortColumns.EvidenceItemCount"
-          [nzSortFn]="true"
-          [nzSortDirections]="['descend', 'ascend', null]"
-          nz-tooltip
-          nzTooltipTitle="Evidence Count">
-          <i
-            nz-icon
-            nzType="civic-evidence"></i>
-          Count
-        </th>
-        <th
-          nzWidth="75px"
-          nzRight
-          nzAlign="right"
-          [nzColumnKey]="sortColumns.AssertionCount"
-          [nzSortFn]="true"
-          [nzSortDirections]="['descend', 'ascend', null]"
-          nz-tooltip
-          nzTooltipTitle="Assertion Count">
-          <i
-            nz-icon
-            nzType="civic-assertion"></i>
-          Count
-        </th>
-      </tr>
-      <tr class="filter-row">
-        <th nzLeft>
-          <cvc-clearable-input-filter
-            [(inputModel)]="nameInput"
-            (inputModelChange)="
-              filterChange$.next()
-            "></cvc-clearable-input-filter>
-        </th>
-        <th nzLeft>
-          <cvc-clearable-input-filter
-            [(inputModel)]="aliasInput"
-            (inputModelChange)="
-              filterChange$.next()
-            "></cvc-clearable-input-filter>
-        </th>
-        <th>
-          <cvc-clearable-input-filter
-            [(inputModel)]="diseaseInput"
-            (inputModelChange)="
-              filterChange$.next()
-            "></cvc-clearable-input-filter>
-        </th>
-        <th>
-          <cvc-clearable-input-filter
-            [(inputModel)]="therapyInput"
-            (inputModelChange)="
-              filterChange$.next()
-            "></cvc-clearable-input-filter>
-        </th>
-        <th nzRight></th>
-        <th nzRight></th>
-        <th nzRight></th>
-        <th nzRight></th>
-      </tr>
-    </thead>
-    <tbody>
-      <ng-template
-        nz-virtual-scroll
-        let-gene
-        let-index="index">
-        <tr class="data-row">
-          <td nzLeft>
-            <cvc-gene-tag [gene]="gene"></cvc-gene-tag>
-          </td>
-          <td nzLeft>
-            <cvc-plain-tag-overflow
-              [tags]="gene.geneAliases"
-              [matchingText]="aliasInput"></cvc-plain-tag-overflow>
-          </td>
-          <td>
-            <cvc-tag-overflow
-              tagType="disease"
-              [maxDisplayCount]="1"
-              [tags]="gene.diseases"
-              [matchingText]="diseaseInput">
-            </cvc-tag-overflow>
-          </td>
-          <td>
-            <cvc-tag-overflow
-              tagType="therapy"
-              [maxDisplayCount]="1"
-              [tags]="gene.therapies"
-              [matchingText]="therapyInput">
-            </cvc-tag-overflow>
-          </td>
-          <td
-            nzRight
-            nzAlign="right">
-            {{ gene.molecularProfileCount }}
-          </td>
-          <td
-            nzRight
-            nzAlign="right">
-            {{ gene.variantCount }}
-          </td>
-          <td
-            nzRight
-            nzAlign="right">
-            {{ gene.evidenceItemCount }}
-          </td>
-          <td
-            nzRight
-            nzAlign="right">
-            {{ gene.assertionCount }}
-          </td>
-        </tr>
-      </ng-template>
-    </tbody>
-  </nz-table>
-</ng-template>
-
-<!-- card's title template -->
-<ng-template #titleTemplate>
-  <ng-container *ngIf="this.cvcTitleTemplate">
-    <ng-template [ngTemplateOutlet]="cvcTitleTemplate"></ng-template>
-  </ng-container>
-  <ng-container *ngIf="this.cvcTitle">
-    {{ this.cvcTitle }}
-  </ng-container>
-  <span class="table-info">
-    <cvc-table-counts
-      [cvcTableCountsConnection]="connection$"></cvc-table-counts>
-  </span>
-</ng-template>
-
-<!-- card's extra template -->
-<ng-template #extraTemplate>
-  <nz-tag
-    *ngIf="moreLoading$ | ngrxPush"
-    nzColor="processing">
-    <i
-      nz-icon
-      nzType="sync"
-      nzSpin></i>
-    <span>Loading…</span>
-  </nz-tag>
-  <cvc-no-more-rows [cvcShowTag]="noMoreRows$ | ngrxPush"></cvc-no-more-rows>
-</ng-template>
diff --git a/client/src/app/components/genes/genes-table/genes-table.component.less b/client/src/app/components/genes/genes-table/genes-table.component.less
deleted file mode 100644
index cf33193fb..000000000
--- a/client/src/app/components/genes/genes-table/genes-table.component.less
+++ /dev/null
@@ -1,5 +0,0 @@
-@import "themes/overrides/card-table.overrides.less";
-
-:host {
-  display: block;
-}
diff --git a/client/src/app/components/genes/genes-table/genes-table.component.ts b/client/src/app/components/genes/genes-table/genes-table.component.ts
deleted file mode 100644
index d4151450c..000000000
--- a/client/src/app/components/genes/genes-table/genes-table.component.ts
+++ /dev/null
@@ -1,208 +0,0 @@
-import {
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  Input,
-  OnInit,
-  TemplateRef,
-} from '@angular/core'
-import { ApolloQueryResult } from '@apollo/client/core'
-import {
-  buildSortParams,
-  SortDirectionEvent,
-} from '@app/core/utilities/datatable-helpers'
-import { ScrollEvent } from '@app/directives/table-scroll/table-scroll.directive'
-import {
-  BrowseGeneConnection,
-  BrowseGenesFieldsFragment,
-  BrowseGenesGQL,
-  BrowseGenesQuery,
-  BrowseGenesQueryVariables,
-  GenesSortColumns,
-  Maybe,
-  PageInfo,
-} from '@app/generated/civic.apollo'
-import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy'
-import { QueryRef } from 'apollo-angular'
-import { BehaviorSubject, Observable, Subject } from 'rxjs'
-import { isNonNulled } from 'rxjs-etc'
-import {
-  takeWhile,
-  debounceTime,
-  distinctUntilChanged,
-  filter,
-  map,
-  skip,
-  take,
-  withLatestFrom,
-} from 'rxjs/operators'
-import { pluck } from 'rxjs-etc/operators'
-
-export interface BrowseGenesTableUserFilters {
-  diseaseInput?: Maybe<string>
-  therapyInput?: Maybe<string>
-  nameInput?: Maybe<string>
-  aliasInput?: Maybe<string>
-}
-
-@UntilDestroy()
-@Component({
-  selector: 'cvc-genes-table',
-  templateUrl: './genes-table.component.html',
-  styleUrls: ['./genes-table.component.less'],
-  changeDetection: ChangeDetectionStrategy.OnPush,
-})
-export class CvcGenesTableComponent implements OnInit {
-  @Input() cvcHeight?: number
-  @Input() cvcTitleTemplate: Maybe<TemplateRef<void>>
-  @Input() cvcTitle: Maybe<string>
-  @Input() initialPageSize: number = 35
-  @Input()
-  set initialUserFilters(f: Maybe<BrowseGenesTableUserFilters>) {
-    // assign any attributes in filters object to this class
-    if (f) Object.assign(this, f)
-  }
-
-  // SOURCE STREAMS
-  scrollEvent$: BehaviorSubject<ScrollEvent>
-  sortChange$: Subject<SortDirectionEvent>
-  filterChange$: Subject<void>
-
-  // INTERMEDIATE STREAMS
-  queryRef!: QueryRef<BrowseGenesQuery, BrowseGenesQueryVariables>
-  result$!: Observable<ApolloQueryResult<BrowseGenesQuery>>
-  connection$!: Observable<BrowseGeneConnection>
-  pageInfo$!: Observable<PageInfo>
-
-  // PRESENTATION STREAMS
-  initialLoading$!: Observable<boolean>
-  moreLoading$!: Observable<boolean>
-  row$!: Observable<Maybe<BrowseGenesFieldsFragment>[]>
-  scrollIndex$: Subject<number>
-  noMoreRows$: BehaviorSubject<boolean>
-
-  // need a static var for scrolling state b/c sub/unsub in
-  // virtual scroll rows degrades performance
-  isScrolling: boolean = false
-
-  // filters
-  diseaseInput: Maybe<string>
-  therapyInput: Maybe<string>
-  nameInput: Maybe<string>
-  aliasInput: Maybe<string>
-
-  sortColumns: typeof GenesSortColumns = GenesSortColumns
-
-  private debouncedQuery = new Subject<void>()
-  constructor(private query: BrowseGenesGQL, private cdr: ChangeDetectorRef) {
-    this.noMoreRows$ = new BehaviorSubject<boolean>(false)
-    this.scrollEvent$ = new BehaviorSubject<ScrollEvent>('stop')
-    this.sortChange$ = new Subject<SortDirectionEvent>()
-    this.filterChange$ = new Subject<void>()
-    this.scrollIndex$ = new Subject<number>()
-  }
-
-  ngOnInit() {
-    this.queryRef = this.query.watch({ first: this.initialPageSize })
-
-    this.result$ = this.queryRef.valueChanges
-
-    // toggles table overlay 'Loading...' spinner
-    this.initialLoading$ = this.result$.pipe(
-      pluck('loading'),
-      distinctUntilChanged(),
-      takeWhile((l) => l !== false, true)
-    ) // only activate on 1st true/false sequence
-
-    // toggles table header 'Loading...' tag
-    this.moreLoading$ = this.result$.pipe(
-      pluck('loading'),
-      distinctUntilChanged(),
-      skip(2)
-    ) // skip 1st true/false sequence
-
-    this.connection$ = this.result$.pipe(
-      pluck('data', 'browseGenes'),
-      filter(isNonNulled)
-    ) as Observable<BrowseGeneConnection>
-
-    this.row$ = this.connection$.pipe(
-      pluck('edges'),
-      filter(isNonNulled),
-      map((edges) => edges.map((e) => e.node))
-    )
-
-    // provided to table-scroll directive for fetchMore queries
-    this.pageInfo$ = this.connection$.pipe(
-      pluck('pageInfo'),
-      filter(isNonNulled)
-    )
-
-    // refetch when column sort changes
-    this.sortChange$
-      .pipe(untilDestroyed(this))
-      .subscribe((e: SortDirectionEvent) => {
-        this.queryRef.refetch({ sortBy: buildSortParams(e) })
-      })
-
-    // refresh when filters change
-    this.filterChange$
-      .pipe(debounceTime(500), untilDestroyed(this))
-      .subscribe(() => {
-        this.refresh()
-      })
-
-    // for every onScrolled event, convert to bool & set isScrolling
-    this.scrollEvent$
-      .pipe(
-        map((e: ScrollEvent) => (e === 'stop' ? false : true)),
-        distinctUntilChanged(),
-        untilDestroyed(this)
-      )
-      .subscribe((e) => {
-        this.isScrolling = e
-        this.cdr.detectChanges()
-      })
-
-    // emit event from noMoreRow$ if hasNextPage false
-    this.scrollEvent$
-      .pipe(
-        filter((e) => e === 'bottom'),
-        withLatestFrom(this.pageInfo$),
-        map(([_, pageInfo]: [ScrollEvent, PageInfo]) => pageInfo),
-        untilDestroyed(this)
-      )
-      .subscribe((pageInfo: PageInfo) => {
-        if (!pageInfo.hasNextPage) {
-          this.noMoreRows$.next(true)
-          this.cdr.detectChanges()
-
-          // need to send a followup 'false' here or else
-          // ng won't interpret subsequent 'true' events as changes
-          setInterval(() => this.noMoreRows$.next(false))
-        }
-      })
-  } // ngOnInit()
-
-  refresh() {
-    this.queryRef
-      .refetch({
-        entrezSymbol: this.nameInput,
-        geneAlias: this.aliasInput,
-        diseaseName: this.diseaseInput,
-        therapyName: this.therapyInput,
-      })
-      .then(() => this.scrollIndex$.next(0))
-
-    this.cdr.detectChanges()
-  }
-
-  onModelUpdated(_: Maybe<string>) {
-    this.debouncedQuery.next()
-  }
-
-  // virtual scroll helpers
-  trackByIndex(_: number, data: Maybe<BrowseGenesFieldsFragment>): Maybe<number> {
-    return data?.id
-  }
-}
diff --git a/client/src/app/components/genes/genes-table/genes-table.module.ts b/client/src/app/components/genes/genes-table/genes-table.module.ts
deleted file mode 100644
index 0649073a1..000000000
--- a/client/src/app/components/genes/genes-table/genes-table.module.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import { CommonModule } from '@angular/common'
-import { NgModule } from '@angular/core'
-import { FormsModule } from '@angular/forms'
-import { CvcGeneTagModule } from '@app/components/genes/gene-tag/gene-tag.module'
-import { CvcClearableInputFilterModule } from '@app/components/shared/clearable-input-filter/clearable-input-filter.module'
-import { CvcNoMoreRowsModule } from '@app/components/shared/no-more-rows/no-more-rows.module'
-import { CvcPlainTagOverflowModule } from '@app/components/shared/plain-tag-overflow/plain-tag-overflow.module'
-import { CvcTableCountsModule } from '@app/components/shared/table-counts/table-counts.module'
-import { CvcTagOverflowModule } from '@app/components/shared/tag-overflow/tag-overflow.module'
-import { CvcPipesModule } from '@app/core/pipes/pipes.module'
-import { CvcAutoHeightCardModule } from '@app/directives/auto-height-card/auto-height-card.module'
-import { CvcAutoHeightTableModule } from '@app/directives/auto-height-table/auto-height-table.module'
-import { CvcTableScrollModule } from '@app/directives/table-scroll/table-scroll.module'
-import { LetDirective, PushPipe } from '@ngrx/component'
-import { NzButtonModule } from 'ng-zorro-antd/button'
-import { NzCardModule } from 'ng-zorro-antd/card'
-import { NzFormModule } from 'ng-zorro-antd/form'
-import { NzIconModule } from 'ng-zorro-antd/icon'
-import { NzInputModule } from 'ng-zorro-antd/input'
-import { NzTableModule } from 'ng-zorro-antd/table'
-import { NzTagModule } from 'ng-zorro-antd/tag'
-import { NzToolTipModule } from 'ng-zorro-antd/tooltip'
-import { NzTypographyModule } from 'ng-zorro-antd/typography'
-import { CvcGenesTableComponent } from './genes-table.component'
-
-@NgModule({
-  declarations: [CvcGenesTableComponent],
-  imports: [
-    CommonModule,
-    FormsModule,
-    LetDirective,
-    PushPipe,
-
-    NzButtonModule,
-    NzCardModule,
-    NzFormModule,
-    NzIconModule,
-    NzInputModule,
-    NzTableModule,
-    NzTagModule,
-    NzToolTipModule,
-    NzTypographyModule,
-
-    CvcAutoHeightCardModule,
-    CvcAutoHeightTableModule,
-    CvcClearableInputFilterModule,
-    CvcGeneTagModule,
-    CvcNoMoreRowsModule,
-    CvcPlainTagOverflowModule,
-    CvcPipesModule,
-    CvcTableCountsModule,
-    CvcTableScrollModule,
-    CvcTagOverflowModule,
-  ],
-  exports: [CvcGenesTableComponent],
-})
-export class CvcGenesTableModule {}
diff --git a/client/src/app/components/genes/genes-table/genes-table.query.gql b/client/src/app/components/genes/genes-table/genes-table.query.gql
deleted file mode 100644
index fcafc1880..000000000
--- a/client/src/app/components/genes/genes-table/genes-table.query.gql
+++ /dev/null
@@ -1,63 +0,0 @@
-query BrowseGenes(
-  $entrezSymbol: String
-  $therapyName: String
-  $geneAlias: String
-  $diseaseName: String
-  $sortBy: GenesSort
-  $first: Int
-  $last: Int
-  $before: String
-  $after: String
-) {
-  browseGenes(
-    entrezSymbol: $entrezSymbol
-    therapyName: $therapyName
-    geneAlias: $geneAlias
-    diseaseName: $diseaseName
-    sortBy: $sortBy
-    first: $first
-    last: $last
-    before: $before
-    after: $after
-  ) {
-    edges {
-      cursor
-      node {
-        ...BrowseGenesFields
-      }
-    }
-    pageInfo {
-      startCursor
-      endCursor
-      hasPreviousPage
-      hasNextPage
-    }
-    lastUpdated
-    totalCount
-    filteredCount
-    pageCount
-  }
-}
-
-fragment BrowseGenesFields on BrowseGene {
-  id
-  entrezId
-  name
-  link
-  flagged
-  geneAliases
-  diseases {
-    name
-    id
-    link
-  }
-  therapies {
-    name
-    id
-    link
-  }
-  variantCount
-  evidenceItemCount
-  assertionCount
-  molecularProfileCount
-}
diff --git a/client/src/app/components/molecular-profiles/molecular-profile-popover/molecular-profile-popover.module.ts b/client/src/app/components/molecular-profiles/molecular-profile-popover/molecular-profile-popover.module.ts
index 6a4e73247..6f97e2ebc 100644
--- a/client/src/app/components/molecular-profiles/molecular-profile-popover/molecular-profile-popover.module.ts
+++ b/client/src/app/components/molecular-profiles/molecular-profile-popover/molecular-profile-popover.module.ts
@@ -9,10 +9,10 @@ import { NzDescriptionsModule } from 'ng-zorro-antd/descriptions'
 import { NzTagModule } from 'ng-zorro-antd/tag'
 import { NzIconModule } from 'ng-zorro-antd/icon'
 import { NzSpaceModule } from 'ng-zorro-antd/space'
-import { CvcGeneTagModule } from '@app/components/genes/gene-tag/gene-tag.module'
 import { CvcLinkTagModule } from '@app/components/shared/link-tag/link-tag.module'
 import { CvcMolecularProfileTagNameModule } from '../molecular-profile-tag-name/molecular-profile-tag-name.module'
 import { CvcTagListModule } from '@app/components/shared/tag-list/tag-list.module'
+import { CvcFeatureTagModule } from '@app/components/features/feature-tag/feature-tag.module'
 
 @NgModule({
   declarations: [CvcMolecularProfilePopoverComponent],
@@ -27,7 +27,7 @@ import { CvcTagListModule } from '@app/components/shared/tag-list/tag-list.modul
     NzTagModule,
     NzIconModule,
     NzSpaceModule,
-    CvcGeneTagModule,
+    CvcFeatureTagModule,
     CvcLinkTagModule,
     CvcTagListModule,
     CvcMolecularProfileTagNameModule,
diff --git a/client/src/app/components/revisions/revision-popover/revision-popover.component.html b/client/src/app/components/revisions/revision-popover/revision-popover.component.html
index 305d13448..586c58e06 100644
--- a/client/src/app/components/revisions/revision-popover/revision-popover.component.html
+++ b/client/src/app/components/revisions/revision-popover/revision-popover.component.html
@@ -23,10 +23,10 @@
 
       <ng-template #subject>
         <ng-container [ngSwitch]="r.subject.__typename">
-          <cvc-gene-tag
-            *ngSwitchCase="'Gene'"
+          <cvc-feature-tag
+            *ngSwitchCase="'Feature'"
             [enablePopover]="false"
-            [gene]="r.subject"></cvc-gene-tag>
+            [feature]="r.subject"></cvc-feature-tag>
           <cvc-assertion-tag
             *ngSwitchCase="'Assertion'"
             [enablePopover]="false"
diff --git a/client/src/app/components/revisions/revision-popover/revision-popover.module.ts b/client/src/app/components/revisions/revision-popover/revision-popover.module.ts
index 26c9d0cd8..5eea118cb 100644
--- a/client/src/app/components/revisions/revision-popover/revision-popover.module.ts
+++ b/client/src/app/components/revisions/revision-popover/revision-popover.module.ts
@@ -8,7 +8,6 @@ import { CvcEvidenceTagModule } from '@app/components/evidence/evidence-tag/evid
 import { CvcVariantTagModule } from '@app/components/variants/variant-tag/variant-tag.module'
 import { NzCardModule } from 'ng-zorro-antd/card'
 import { NzGridModule } from 'ng-zorro-antd/grid'
-import { CvcGeneTagModule } from '@app/components/genes/gene-tag/gene-tag.module'
 import { CvcVariantGroupTagModule } from '@app/components/variant-groups/variant-group-tag/variant-group-tag.module'
 import { CvcStatusTagModule } from '@app/components/shared/status-tag/status-tag.module'
 import { NzIconModule } from 'ng-zorro-antd/icon'
@@ -17,6 +16,7 @@ import { NzDescriptionsModule } from 'ng-zorro-antd/descriptions'
 import { RevisionListDiffModule } from '../revision-list-diff/revision-list-diff.module'
 import { CvcPipesModule } from '@app/core/pipes/pipes.module'
 import { CvcCommentBodyModule } from '@app/components/comments/comment-body/comment-body.module'
+import { CvcFeatureTagModule } from '@app/components/features/feature-tag/feature-tag.module'
 
 @NgModule({
   declarations: [CvcRevisionPopoverComponent],
@@ -30,7 +30,7 @@ import { CvcCommentBodyModule } from '@app/components/comments/comment-body/comm
     NzSpaceModule,
     NzDescriptionsModule,
     CvcPipesModule,
-    CvcGeneTagModule,
+    CvcFeatureTagModule,
     CvcUserTagModule,
     CvcAssertionsTagModule,
     CvcEvidenceTagModule,
diff --git a/client/src/app/components/revisions/revisions-list-and-filter/revisions-list-and-filter.component.ts b/client/src/app/components/revisions/revisions-list-and-filter/revisions-list-and-filter.component.ts
index 7319959e8..4310e3a35 100644
--- a/client/src/app/components/revisions/revisions-list-and-filter/revisions-list-and-filter.component.ts
+++ b/client/src/app/components/revisions/revisions-list-and-filter/revisions-list-and-filter.component.ts
@@ -15,17 +15,17 @@ import {
   PageInfo,
   VariantDetailGQL,
   AssertionDetailGQL,
-  GeneDetailGQL,
   EvidenceDetailGQL,
   VariantGroupDetailGQL,
   VariantSummaryGQL,
   VariantGroupsSummaryGQL,
   AssertionSummaryGQL,
-  GenesSummaryGQL,
   EvidenceSummaryGQL,
   MolecularProfileDetailGQL,
   MolecularProfileSummaryGQL,
   Revision,
+  FeatureDetailGQL,
+  FeaturesSummaryGQL,
 } from '@app/generated/civic.apollo'
 import { Observable, Subscription } from 'rxjs'
 import { QueryRef } from 'apollo-angular'
@@ -98,8 +98,8 @@ export class RevisionsListAndFilterComponent implements OnDestroy, OnInit {
     private variantGroupSummaryGql: VariantGroupsSummaryGQL,
     private assertionDetailGql: AssertionDetailGQL,
     private assertionSummaryGql: AssertionSummaryGQL,
-    private geneDetailGql: GeneDetailGQL,
-    private geneSummaryGql: GenesSummaryGQL,
+    private featureDetailGql: FeatureDetailGQL,
+    private featureSummaryGql: FeaturesSummaryGQL,
     private evidenceDetailGql: EvidenceDetailGQL,
     private evidenceSummaryGql: EvidenceSummaryGQL,
     private molecularProfileDetailGql: MolecularProfileDetailGQL,
@@ -201,14 +201,14 @@ export class RevisionsListAndFilterComponent implements OnDestroy, OnInit {
           variables: { evidenceId: this.id },
         })
         return
-      case ModeratedEntities.Gene:
+      case ModeratedEntities.Feature:
         this.refetchQueries.push({
-          query: this.geneDetailGql.document,
-          variables: { geneId: this.id },
+          query: this.featureDetailGql.document,
+          variables: { featureId: this.id },
         })
         this.refetchQueries.push({
-          query: this.geneSummaryGql.document,
-          variables: { geneId: this.id },
+          query: this.featureSummaryGql.document,
+          variables: { featureId: this.id },
         })
         return
       case ModeratedEntities.VariantGroup:
diff --git a/client/src/app/components/shared/tag-overflow/tag-overflow.component.html b/client/src/app/components/shared/tag-overflow/tag-overflow.component.html
index 016e895b1..578146cdc 100644
--- a/client/src/app/components/shared/tag-overflow/tag-overflow.component.html
+++ b/client/src/app/components/shared/tag-overflow/tag-overflow.component.html
@@ -60,11 +60,6 @@
         [disease]="tag"
         [truncateLongName]="true"></cvc-disease-tag>
     </ng-container>
-    <ng-container *ngSwitchCase="'gene'">
-      <cvc-gene-tag
-        [gene]="tag"
-        [truncateLongName]="true"></cvc-gene-tag>
-    </ng-container>
     <ng-container *ngSwitchCase="'feature'">
       <cvc-feature-tag
         [feature]="tag"
diff --git a/client/src/app/components/shared/tag-overflow/tag-overflow.module.ts b/client/src/app/components/shared/tag-overflow/tag-overflow.module.ts
index aead22e79..b584cb302 100644
--- a/client/src/app/components/shared/tag-overflow/tag-overflow.module.ts
+++ b/client/src/app/components/shared/tag-overflow/tag-overflow.module.ts
@@ -6,7 +6,6 @@ import { NzTagModule } from 'ng-zorro-antd/tag'
 import { NzPopoverModule } from 'ng-zorro-antd/popover'
 import { CvcDiseaseTagModule } from '@app/components/diseases/cvc-disease-tag/cvc-disease-tag.module'
 import { CvcOrganizationTagModule } from '@app/components/organizations/organization-tag/organization-tag.module'
-import { CvcGeneTagModule } from '@app/components/genes/gene-tag/gene-tag.module'
 import { CvcVariantTagModule } from '@app/components/variants/variant-tag/variant-tag.module'
 import { CvcTherapyTagModule } from '@app/components/therapies/cvc-therapy-tag/cvc-therapy-tag.module'
 import { CvcVariantTypeTagModule } from '@app/components/variant-types/variant-type-tag/variant-type-tag.module'
@@ -22,7 +21,6 @@ import { CvcFeatureTagModule } from '@app/components/features/feature-tag/featur
     CvcTherapyTagModule,
     CvcDiseaseTagModule,
     CvcOrganizationTagModule,
-    CvcGeneTagModule,
     CvcFeatureTagModule,
     CvcVariantTagModule,
     CvcVariantTypeTagModule,
diff --git a/client/src/app/components/variants/variants-menu/variants-menu.gql b/client/src/app/components/variants/variants-menu/variants-menu.gql
index 0972d045e..6c1ce9292 100644
--- a/client/src/app/components/variants/variants-menu/variants-menu.gql
+++ b/client/src/app/components/variants/variants-menu/variants-menu.gql
@@ -1,5 +1,4 @@
 query VariantsMenu(
-  $geneId: Int,
   $featureId: Int,
   $variantName: String,
   $variantTypeIds: [Int!],
@@ -11,7 +10,6 @@ query VariantsMenu(
   $sortBy: VariantMenuSort
 ) {
   variants(
-    geneId: $geneId,
     featureId: $featureId,
     name: $variantName,
     variantTypeIds: $variantTypeIds,
diff --git a/client/src/app/core/pipes/icon-name-for-subscribable-entity.ts b/client/src/app/core/pipes/icon-name-for-subscribable-entity.ts
index 86dfb6967..3ca909fba 100644
--- a/client/src/app/core/pipes/icon-name-for-subscribable-entity.ts
+++ b/client/src/app/core/pipes/icon-name-for-subscribable-entity.ts
@@ -16,9 +16,9 @@ export class IconNameForSubscribableEntity implements PipeTransform {
       case 'EvidenceItem':
       case SubscribableEntities.EvidenceItem:
         return 'civic-evidence'
-      case 'GENE':
-      case 'Gene':
-      case SubscribableEntities.Gene:
+      case 'FEATURE':
+      case 'Feature':
+      case SubscribableEntities.Feature:
         return 'civic-gene'
       case SubscribableEntities.Revision:
       case 'REVISION':
diff --git a/client/src/app/forms/components/entity-tag-popover/entity-tag-popover.component.html b/client/src/app/forms/components/entity-tag-popover/entity-tag-popover.component.html
index 8de3de87b..29a6c6201 100644
--- a/client/src/app/forms/components/entity-tag-popover/entity-tag-popover.component.html
+++ b/client/src/app/forms/components/entity-tag-popover/entity-tag-popover.component.html
@@ -5,6 +5,6 @@
     <cvc-source-popover *ngSwitchCase="'Source'" [sourceId]="this.entity.entityId"></cvc-source-popover>
     <cvc-phenotype-popover *ngSwitchCase="'Phenotype'" [phenotypeId]="this.entity.entityId"></cvc-phenotype-popover>
     <cvc-evidence-popover *ngSwitchCase="'EvidenceItem'" [evidenceId]="this.entity.entityId"></cvc-evidence-popover>
-    <cvc-gene-popover *ngSwitchCase="'Gene'" [geneId]="this.entity.entityId"></cvc-gene-popover>
+    <cvc-feature-popover *ngSwitchCase="'Feature'" [featureId]="this.entity.entityId"></cvc-feature-popover>
     <cvc-variant-popover *ngSwitchCase="'Variant'" [variantId]="this.entity.entityId"></cvc-variant-popover>
 </ng-container>
diff --git a/client/src/app/forms/components/entity-tag-popover/entity-tag-popover.module.ts b/client/src/app/forms/components/entity-tag-popover/entity-tag-popover.module.ts
index 7f96e1190..fbde9149e 100644
--- a/client/src/app/forms/components/entity-tag-popover/entity-tag-popover.module.ts
+++ b/client/src/app/forms/components/entity-tag-popover/entity-tag-popover.module.ts
@@ -2,7 +2,7 @@ import { CommonModule } from "@angular/common";
 import { NgModule } from "@angular/core";
 import { CvcDiseasePopoverModule } from "@app/components/diseases/cvc-disease-popover/cvc-disease-popover.module";
 import { CvcEvidencePopoverModule } from "@app/components/evidence/evidence-popover/evidence-popover.module";
-import { CvcGenePopoverModule } from "@app/components/genes/gene-popover/gene-popover.module";
+import { CvcFeaturePopoverModule } from "@app/components/features/feature-popover/feature-popover.module";
 import { CvcMolecularProfilePopoverModule } from "@app/components/molecular-profiles/molecular-profile-popover/molecular-profile-popover.module";
 import { CvcPhenotypePopoverModule } from "@app/components/phenotypes/phenotype-popover/phenotype-popover.module";
 import { CvcSourcePopoverModule } from "@app/components/sources/source-popover/source-popover.module";
@@ -20,7 +20,7 @@ import { CvcEntityTagPopoverComponent } from "./entity-tag-popover.component";
     CvcTherapyPopoverModule,
     CvcPhenotypePopoverModule,
     CvcEvidencePopoverModule,
-    CvcGenePopoverModule,
+    CvcFeaturePopoverModule,
     CvcVariantPopoverModule,
   ],
   exports: [CvcEntityTagPopoverComponent],
diff --git a/client/src/app/forms/config/variant-revise/variant-revise.form.config.ts b/client/src/app/forms/config/variant-revise/variant-revise.form.config.ts
index 74be5a0e8..773576b3b 100644
--- a/client/src/app/forms/config/variant-revise/variant-revise.form.config.ts
+++ b/client/src/app/forms/config/variant-revise/variant-revise.form.config.ts
@@ -42,7 +42,7 @@ const formFieldConfig: FormlyFieldConfig[] = [
             fieldGroup: [
               {
                 key: 'featureId',
-                type: 'gene-select',
+                type: 'feature-select',
                 props: {
                   description: 'Enter an Entrez Gene for this Variant',
                   required: true,
diff --git a/client/src/app/forms/config/variant-submit/variant-submit.form.ts b/client/src/app/forms/config/variant-submit/variant-submit.form.ts
index 487a6ba1d..8d1299c11 100644
--- a/client/src/app/forms/config/variant-submit/variant-submit.form.ts
+++ b/client/src/app/forms/config/variant-submit/variant-submit.form.ts
@@ -66,7 +66,7 @@ export class VariantSubmitForm {
         fieldGroup: [
           {
             key: 'featureId',
-            type: 'gene-select',
+            type: 'feature-select',
             props: {
               placeholder: `Select New Variant's Feature`,
               layout: {
diff --git a/client/src/app/forms/test-pages/layout-tests/layout-forms.config.ts b/client/src/app/forms/test-pages/layout-tests/layout-forms.config.ts
index 704475573..37ffe41da 100644
--- a/client/src/app/forms/test-pages/layout-tests/layout-forms.config.ts
+++ b/client/src/app/forms/test-pages/layout-tests/layout-forms.config.ts
@@ -1,6 +1,6 @@
 import { FormlyFieldConfig } from '@ngx-formly/core'
 import { CvcTherapySelectFieldOptions } from '../../types/therapy-select/therapy-select.type'
-import { CvcGeneSelectFieldConfig } from '../../types/gene-select/gene-select.type'
+import { CvcFeatureSelectFieldConfig } from '../../types/feature-select/feature-select.type'
 import { CvcLevelSelectFieldOptions } from '../../types/level-select/level-select.type'
 import { CvcOriginSelectFieldOptions } from '../../types/origin-select/origin-select.type'
 import { CvcSourceSelectFieldConfig } from '../../types/source-select/source-select.type'
@@ -36,13 +36,13 @@ export const noStateFormsFieldConfig: FormlyFieldConfig[] = [
     props: {},
   },
 
-  <CvcGeneSelectFieldConfig>{
+  <CvcFeatureSelectFieldConfig>{
     key: 'featureId',
-    type: 'gene-select',
+    type: 'feature-select',
   },
-  <CvcGeneSelectFieldConfig>{
+  <CvcFeatureSelectFieldConfig>{
     key: 'featureIds',
-    type: 'gene-multi-select',
+    type: 'feature-multi-select',
     props: {},
   },
   <CvcVariantSelectFieldConfig>{
diff --git a/client/src/app/forms/types/gene-select/gene-select.module.ts b/client/src/app/forms/types/feature-select/feature-select.module.ts
similarity index 79%
rename from client/src/app/forms/types/gene-select/gene-select.module.ts
rename to client/src/app/forms/types/feature-select/feature-select.module.ts
index 5847b75e5..fa7fbdea3 100644
--- a/client/src/app/forms/types/gene-select/gene-select.module.ts
+++ b/client/src/app/forms/types/feature-select/feature-select.module.ts
@@ -18,25 +18,25 @@ import { NzTagModule } from 'ng-zorro-antd/tag'
 import { NzToolTipModule } from 'ng-zorro-antd/tooltip'
 import { NzTypographyModule } from 'ng-zorro-antd/typography'
 import {
-  CvcGeneSelectField,
-  CvcGeneSelectFieldConfig,
-  CvcGeneSelectFieldProps,
-} from './gene-select.type'
+  CvcFeatureSelectField,
+  CvcFeatureSelectFieldConfig,
+  CvcFeatureSelectFieldProps,
+} from './feature-select.type'
 
 const typeConfig: ConfigOption = {
   types: [
     {
-      name: 'gene-select',
+      name: 'feature-select',
       wrappers: ['form-field'],
-      component: CvcGeneSelectField,
+      component: CvcFeatureSelectField,
     },
     {
-      name: 'gene-multi-select',
+      name: 'feature-multi-select',
       wrappers: ['form-field'],
-      component: CvcGeneSelectField,
-      defaultOptions: <CvcGeneSelectFieldConfig>{
+      component: CvcFeatureSelectField,
+      defaultOptions: <CvcFeatureSelectFieldConfig>{
         props: {
-          label: 'Genes',
+          label: 'Features',
           isMultiSelect: true,
         },
       },
@@ -45,7 +45,7 @@ const typeConfig: ConfigOption = {
 }
 
 @NgModule({
-  declarations: [CvcGeneSelectField],
+  declarations: [CvcFeatureSelectField],
   imports: [
     CommonModule,
     ReactiveFormsModule,
@@ -67,6 +67,6 @@ const typeConfig: ConfigOption = {
     CvcPipesModule,
     CvcEntityTagModule,
   ],
-  exports: [CvcGeneSelectField],
+  exports: [CvcFeatureSelectField],
 })
-export class CvcGeneSelectModule {}
+export class CvcFeatureSelectModule {}
diff --git a/client/src/app/forms/types/gene-select/gene-select.query.gql b/client/src/app/forms/types/feature-select/feature-select.query.gql
similarity index 100%
rename from client/src/app/forms/types/gene-select/gene-select.query.gql
rename to client/src/app/forms/types/feature-select/feature-select.query.gql
diff --git a/client/src/app/forms/types/gene-select/gene-select.type.html b/client/src/app/forms/types/feature-select/feature-select.type.html
similarity index 100%
rename from client/src/app/forms/types/gene-select/gene-select.type.html
rename to client/src/app/forms/types/feature-select/feature-select.type.html
diff --git a/client/src/app/forms/types/gene-select/gene-select.type.less b/client/src/app/forms/types/feature-select/feature-select.type.less
similarity index 100%
rename from client/src/app/forms/types/gene-select/gene-select.type.less
rename to client/src/app/forms/types/feature-select/feature-select.type.less
diff --git a/client/src/app/forms/types/gene-select/gene-select.type.ts b/client/src/app/forms/types/feature-select/feature-select.type.ts
similarity index 82%
rename from client/src/app/forms/types/gene-select/gene-select.type.ts
rename to client/src/app/forms/types/feature-select/feature-select.type.ts
index 0d6f8d9cb..71f3e7208 100644
--- a/client/src/app/forms/types/gene-select/gene-select.type.ts
+++ b/client/src/app/forms/types/feature-select/feature-select.type.ts
@@ -32,11 +32,11 @@ import { FormlyFieldProps } from '@ngx-formly/ng-zorro-antd/form-field'
 import { NzSelectOptionInterface } from 'ng-zorro-antd/select'
 import mixin from 'ts-mixin-extended'
 
-export type CvcGeneSelectFieldOption = Partial<
-  FieldTypeConfig<Partial<CvcGeneSelectFieldProps>>
+export type CvcFeatureSelectFieldOption = Partial<
+  FieldTypeConfig<Partial<CvcFeatureSelectFieldProps>>
 >
 
-export interface CvcGeneSelectFieldProps extends FormlyFieldProps {
+export interface CvcFeatureSelectFieldProps extends FormlyFieldProps {
   placeholder: string
   isMultiSelect: boolean
   selectMessages?: CvcEntitySelectMessageOptions
@@ -45,14 +45,14 @@ export interface CvcGeneSelectFieldProps extends FormlyFieldProps {
   extraType?: CvcFormFieldExtraType
 }
 
-export interface CvcGeneSelectFieldConfig
-  extends FormlyFieldConfig<CvcGeneSelectFieldProps> {
-  type: 'gene-select' | 'gene-multi-select' | Type<CvcGeneSelectField>
+export interface CvcFeatureSelectFieldConfig
+  extends FormlyFieldConfig<CvcFeatureSelectFieldProps> {
+  type: 'feature-select' | 'feature-multi-select' | Type<CvcFeatureSelectField>
 }
 
-const GeneSelectMixin = mixin(
+const FeatureSelectMixin = mixin(
   BaseFieldType<
-    FieldTypeConfig<CvcGeneSelectFieldProps>,
+    FieldTypeConfig<CvcFeatureSelectFieldProps>,
     Maybe<number | number[]>
   >(),
   EntitySelectField<
@@ -66,24 +66,24 @@ const GeneSelectMixin = mixin(
 )
 
 @Component({
-  selector: 'cvc-gene-select',
-  templateUrl: './gene-select.type.html',
-  styleUrls: ['./gene-select.type.less'],
+  selector: 'cvc-feature-select',
+  templateUrl: './feature-select.type.html',
+  styleUrls: ['./feature-select.type.less'],
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class CvcGeneSelectField
-  extends GeneSelectMixin
+export class CvcFeatureSelectField
+  extends FeatureSelectMixin
   implements AfterViewInit
 {
   // FieldTypeConfig defaults
   defaultOptions = {
     props: {
-      label: 'Gene',
-      placeholder: 'Search Genes',
+      label: 'Feature',
+      placeholder: 'Search Features',
       isMultiSelect: false,
-      entityName: { singular: 'Gene', plural: 'Genes' },
+      entityName: { singular: 'Feature', plural: 'Features' },
       description:
-        'Entrez Gene Symbol',
+        'Feature Name',
     },
     featureType: FeatureInstanceTypes.Gene
   }
@@ -116,7 +116,7 @@ export class CvcGeneSelectField
       selectOpen$: this.selectOpen$,
       selectComponent: this.selectComponent,
     })
-    // this.onOpenChange$.pipe(tag('gene-select onOpenChange$')).subscribe()
+    // this.onOpenChange$.pipe(tag('feature-select onOpenChange$')).subscribe()
   } // ngAfterViewInit()
 
   getTypeaheadVarsFn(str: string): FeatureSelectTypeaheadQueryVariables {
diff --git a/client/src/app/forms/types/form-types.module.ts b/client/src/app/forms/types/form-types.module.ts
index d95e56dd7..f1ae85e2b 100644
--- a/client/src/app/forms/types/form-types.module.ts
+++ b/client/src/app/forms/types/form-types.module.ts
@@ -15,7 +15,7 @@ import { CvcDirectionSelectModule } from './direction-select/direction-select.mo
 import { CvcDiseaseSelectModule } from './disease-select/disease-select.module'
 import { CvcEntityTypeSelectModule } from './type-select/type-select.module'
 import { CvcEvidenceSelectFieldModule } from './evidence-select/evidence-select.module'
-import { CvcGeneSelectModule } from './gene-select/gene-select.module'
+import { CvcFeatureSelectModule } from './feature-select/feature-select.module'
 import { CvcInteractionSelectModule } from './interaction-select/interaction-select.module'
 import { CvcLevelSelectModule } from './level-select/level-select.module'
 import { CvcMolecularProfileSelectModule } from './molecular-profile-select/molecular-profile-select.module'
@@ -51,7 +51,7 @@ import { CvcVariantTypeSelectModule } from './variant-type-select/variant-type-s
     CvcDiseaseSelectModule,
     CvcEntityTypeSelectModule,
     CvcEvidenceSelectFieldModule,
-    CvcGeneSelectModule,
+    CvcFeatureSelectModule,
     CvcInteractionSelectModule,
     CvcLevelSelectModule,
     CvcMolecularProfileSelectModule,
diff --git a/client/src/app/forms/types/molecular-profile-builder/molecular-profile-builder.type.ts b/client/src/app/forms/types/molecular-profile-builder/molecular-profile-builder.type.ts
index 267b86a2d..a58c5b36d 100644
--- a/client/src/app/forms/types/molecular-profile-builder/molecular-profile-builder.type.ts
+++ b/client/src/app/forms/types/molecular-profile-builder/molecular-profile-builder.type.ts
@@ -23,8 +23,8 @@ export class CvcMolecularProfileBuilderType
     },
     fieldGroup: [
       {
-        key: 'geneId',
-        type: 'gene-select',
+        key: 'featureId',
+        type: 'feature-select',
         props: {
           required: true,
           formLayout: 'inline',
@@ -46,7 +46,7 @@ export class CvcMolecularProfileBuilderType
         type: 'variant-select',
         props: {
           required: true,
-          requireGene: true,
+          requireFeature: true,
           emitMolecularProfileId: true,
           formLayout: 'inline',
           hideLabel: true,
diff --git a/client/src/app/forms/types/molecular-profile-select/mp-finder/mp-finder.component.ts b/client/src/app/forms/types/molecular-profile-select/mp-finder/mp-finder.component.ts
index c269e1aa1..61caeb843 100644
--- a/client/src/app/forms/types/molecular-profile-select/mp-finder/mp-finder.component.ts
+++ b/client/src/app/forms/types/molecular-profile-select/mp-finder/mp-finder.component.ts
@@ -69,7 +69,7 @@ export class MpFinderComponent {
         fieldGroup: [
           {
             key: 'featureId',
-            type: 'gene-select',
+            type: 'feature-select',
             props: {
               placeholder: 'Select MP Feature',
               hideLabel: true,
diff --git a/client/src/app/generated/civic.apollo-helpers.ts b/client/src/app/generated/civic.apollo-helpers.ts
index 17e7180df..01383a7bd 100644
--- a/client/src/app/generated/civic.apollo-helpers.ts
+++ b/client/src/app/generated/civic.apollo-helpers.ts
@@ -219,38 +219,6 @@ export type BrowseFeatureEdgeFieldPolicy = {
 	cursor?: FieldPolicy<any> | FieldReadFunction<any>,
 	node?: FieldPolicy<any> | FieldReadFunction<any>
 };
-export type BrowseGeneKeySpecifier = ('assertionCount' | 'description' | 'diseases' | 'entrezId' | 'evidenceItemCount' | 'flagged' | 'flags' | 'geneAliases' | 'id' | 'link' | 'molecularProfileCount' | 'name' | 'therapies' | 'variantCount' | BrowseGeneKeySpecifier)[];
-export type BrowseGeneFieldPolicy = {
-	assertionCount?: FieldPolicy<any> | FieldReadFunction<any>,
-	description?: FieldPolicy<any> | FieldReadFunction<any>,
-	diseases?: FieldPolicy<any> | FieldReadFunction<any>,
-	entrezId?: FieldPolicy<any> | FieldReadFunction<any>,
-	evidenceItemCount?: FieldPolicy<any> | FieldReadFunction<any>,
-	flagged?: FieldPolicy<any> | FieldReadFunction<any>,
-	flags?: FieldPolicy<any> | FieldReadFunction<any>,
-	geneAliases?: FieldPolicy<any> | FieldReadFunction<any>,
-	id?: FieldPolicy<any> | FieldReadFunction<any>,
-	link?: FieldPolicy<any> | FieldReadFunction<any>,
-	molecularProfileCount?: FieldPolicy<any> | FieldReadFunction<any>,
-	name?: FieldPolicy<any> | FieldReadFunction<any>,
-	therapies?: FieldPolicy<any> | FieldReadFunction<any>,
-	variantCount?: FieldPolicy<any> | FieldReadFunction<any>
-};
-export type BrowseGeneConnectionKeySpecifier = ('edges' | 'filteredCount' | 'lastUpdated' | 'nodes' | 'pageCount' | 'pageInfo' | 'totalCount' | BrowseGeneConnectionKeySpecifier)[];
-export type BrowseGeneConnectionFieldPolicy = {
-	edges?: FieldPolicy<any> | FieldReadFunction<any>,
-	filteredCount?: FieldPolicy<any> | FieldReadFunction<any>,
-	lastUpdated?: FieldPolicy<any> | FieldReadFunction<any>,
-	nodes?: FieldPolicy<any> | FieldReadFunction<any>,
-	pageCount?: FieldPolicy<any> | FieldReadFunction<any>,
-	pageInfo?: FieldPolicy<any> | FieldReadFunction<any>,
-	totalCount?: FieldPolicy<any> | FieldReadFunction<any>
-};
-export type BrowseGeneEdgeKeySpecifier = ('cursor' | 'node' | BrowseGeneEdgeKeySpecifier)[];
-export type BrowseGeneEdgeFieldPolicy = {
-	cursor?: FieldPolicy<any> | FieldReadFunction<any>,
-	node?: FieldPolicy<any> | FieldReadFunction<any>
-};
 export type BrowseMolecularProfileKeySpecifier = ('aliases' | 'assertionCount' | 'diseases' | 'evidenceItemCount' | 'features' | 'id' | 'link' | 'molecularProfileScore' | 'name' | 'therapies' | 'variantCount' | 'variants' | BrowseMolecularProfileKeySpecifier)[];
 export type BrowseMolecularProfileFieldPolicy = {
 	aliases?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -1401,7 +1369,7 @@ export type PhenotypePopoverFieldPolicy = {
 	name?: FieldPolicy<any> | FieldReadFunction<any>,
 	url?: FieldPolicy<any> | FieldReadFunction<any>
 };
-export type QueryKeySpecifier = ('acmgCode' | 'acmgCodesTypeahead' | 'activities' | 'activity' | 'assertion' | 'assertions' | 'browseDiseases' | 'browseFeatures' | 'browseGenes' | 'browseMolecularProfiles' | 'browseSources' | 'browseVariantGroups' | 'browseVariants' | 'clingenCode' | 'clingenCodesTypeahead' | 'clinicalTrial' | 'clinicalTrials' | 'comment' | 'comments' | 'contributors' | 'countries' | 'dataReleases' | 'disease' | 'diseasePopover' | 'diseaseTypeahead' | 'entityTypeahead' | 'events' | 'evidenceItem' | 'evidenceItems' | 'feature' | 'featureTypeahead' | 'flag' | 'flags' | 'gene' | 'genes' | 'molecularProfile' | 'molecularProfiles' | 'nccnGuideline' | 'nccnGuidelinesTypeahead' | 'notifications' | 'organization' | 'organizationLeaderboards' | 'organizations' | 'phenotype' | 'phenotypePopover' | 'phenotypeTypeahead' | 'phenotypes' | 'previewCommentText' | 'previewMolecularProfileName' | 'remoteCitation' | 'revision' | 'revisions' | 'search' | 'searchByPermalink' | 'searchGenes' | 'source' | 'sourcePopover' | 'sourceSuggestionValues' | 'sourceSuggestions' | 'sourceTypeahead' | 'subscriptionForEntity' | 'therapies' | 'therapy' | 'therapyPopover' | 'therapyTypeahead' | 'timepointStats' | 'user' | 'userLeaderboards' | 'userTypeahead' | 'users' | 'validateRevisionsForAcceptance' | 'variant' | 'variantGroup' | 'variantGroups' | 'variantType' | 'variantTypePopover' | 'variantTypeTypeahead' | 'variantTypes' | 'variants' | 'viewer' | QueryKeySpecifier)[];
+export type QueryKeySpecifier = ('acmgCode' | 'acmgCodesTypeahead' | 'activities' | 'activity' | 'assertion' | 'assertions' | 'browseDiseases' | 'browseFeatures' | 'browseMolecularProfiles' | 'browseSources' | 'browseVariantGroups' | 'browseVariants' | 'clingenCode' | 'clingenCodesTypeahead' | 'clinicalTrial' | 'clinicalTrials' | 'comment' | 'comments' | 'contributors' | 'countries' | 'dataReleases' | 'disease' | 'diseasePopover' | 'diseaseTypeahead' | 'entityTypeahead' | 'events' | 'evidenceItem' | 'evidenceItems' | 'feature' | 'featureTypeahead' | 'flag' | 'flags' | 'gene' | 'genes' | 'molecularProfile' | 'molecularProfiles' | 'nccnGuideline' | 'nccnGuidelinesTypeahead' | 'notifications' | 'organization' | 'organizationLeaderboards' | 'organizations' | 'phenotype' | 'phenotypePopover' | 'phenotypeTypeahead' | 'phenotypes' | 'previewCommentText' | 'previewMolecularProfileName' | 'remoteCitation' | 'revision' | 'revisions' | 'search' | 'searchByPermalink' | 'searchGenes' | 'source' | 'sourcePopover' | 'sourceSuggestionValues' | 'sourceSuggestions' | 'sourceTypeahead' | 'subscriptionForEntity' | 'therapies' | 'therapy' | 'therapyPopover' | 'therapyTypeahead' | 'timepointStats' | 'user' | 'userLeaderboards' | 'userTypeahead' | 'users' | 'validateRevisionsForAcceptance' | 'variant' | 'variantGroup' | 'variantGroups' | 'variantType' | 'variantTypePopover' | 'variantTypeTypeahead' | 'variantTypes' | 'variants' | 'viewer' | QueryKeySpecifier)[];
 export type QueryFieldPolicy = {
 	acmgCode?: FieldPolicy<any> | FieldReadFunction<any>,
 	acmgCodesTypeahead?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -1411,7 +1379,6 @@ export type QueryFieldPolicy = {
 	assertions?: FieldPolicy<any> | FieldReadFunction<any>,
 	browseDiseases?: FieldPolicy<any> | FieldReadFunction<any>,
 	browseFeatures?: FieldPolicy<any> | FieldReadFunction<any>,
-	browseGenes?: FieldPolicy<any> | FieldReadFunction<any>,
 	browseMolecularProfiles?: FieldPolicy<any> | FieldReadFunction<any>,
 	browseSources?: FieldPolicy<any> | FieldReadFunction<any>,
 	browseVariantGroups?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -1951,7 +1918,7 @@ export type ValidationErrorsFieldPolicy = {
 	genericErrors?: FieldPolicy<any> | FieldReadFunction<any>,
 	validationErrors?: FieldPolicy<any> | FieldReadFunction<any>
 };
-export type VariantKeySpecifier = ('alleleRegistryId' | 'clinvarIds' | 'comments' | 'creationActivity' | 'deprecated' | 'deprecationActivity' | 'deprecationReason' | 'ensemblVersion' | 'events' | 'feature' | 'flagged' | 'flags' | 'gene' | 'hgvsDescriptions' | 'id' | 'lastAcceptedRevisionEvent' | 'lastCommentEvent' | 'lastSubmittedRevisionEvent' | 'link' | 'maneSelectTranscript' | 'molecularProfiles' | 'myVariantInfo' | 'name' | 'openCravatUrl' | 'primaryCoordinates' | 'referenceBases' | 'referenceBuild' | 'revisions' | 'secondaryCoordinates' | 'singleVariantMolecularProfile' | 'singleVariantMolecularProfileId' | 'variantAliases' | 'variantBases' | 'variantTypes' | VariantKeySpecifier)[];
+export type VariantKeySpecifier = ('alleleRegistryId' | 'clinvarIds' | 'comments' | 'creationActivity' | 'deprecated' | 'deprecationActivity' | 'deprecationReason' | 'ensemblVersion' | 'events' | 'feature' | 'flagged' | 'flags' | 'hgvsDescriptions' | 'id' | 'lastAcceptedRevisionEvent' | 'lastCommentEvent' | 'lastSubmittedRevisionEvent' | 'link' | 'maneSelectTranscript' | 'molecularProfiles' | 'myVariantInfo' | 'name' | 'openCravatUrl' | 'primaryCoordinates' | 'referenceBases' | 'referenceBuild' | 'revisions' | 'secondaryCoordinates' | 'singleVariantMolecularProfile' | 'singleVariantMolecularProfileId' | 'variantAliases' | 'variantBases' | 'variantTypes' | VariantKeySpecifier)[];
 export type VariantFieldPolicy = {
 	alleleRegistryId?: FieldPolicy<any> | FieldReadFunction<any>,
 	clinvarIds?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -1965,7 +1932,6 @@ export type VariantFieldPolicy = {
 	feature?: FieldPolicy<any> | FieldReadFunction<any>,
 	flagged?: FieldPolicy<any> | FieldReadFunction<any>,
 	flags?: FieldPolicy<any> | FieldReadFunction<any>,
-	gene?: FieldPolicy<any> | FieldReadFunction<any>,
 	hgvsDescriptions?: FieldPolicy<any> | FieldReadFunction<any>,
 	id?: FieldPolicy<any> | FieldReadFunction<any>,
 	lastAcceptedRevisionEvent?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -2153,18 +2119,6 @@ export type StrictTypedTypePolicies = {
 		keyFields?: false | BrowseFeatureEdgeKeySpecifier | (() => undefined | BrowseFeatureEdgeKeySpecifier),
 		fields?: BrowseFeatureEdgeFieldPolicy,
 	},
-	BrowseGene?: Omit<TypePolicy, "fields" | "keyFields"> & {
-		keyFields?: false | BrowseGeneKeySpecifier | (() => undefined | BrowseGeneKeySpecifier),
-		fields?: BrowseGeneFieldPolicy,
-	},
-	BrowseGeneConnection?: Omit<TypePolicy, "fields" | "keyFields"> & {
-		keyFields?: false | BrowseGeneConnectionKeySpecifier | (() => undefined | BrowseGeneConnectionKeySpecifier),
-		fields?: BrowseGeneConnectionFieldPolicy,
-	},
-	BrowseGeneEdge?: Omit<TypePolicy, "fields" | "keyFields"> & {
-		keyFields?: false | BrowseGeneEdgeKeySpecifier | (() => undefined | BrowseGeneEdgeKeySpecifier),
-		fields?: BrowseGeneEdgeFieldPolicy,
-	},
 	BrowseMolecularProfile?: Omit<TypePolicy, "fields" | "keyFields"> & {
 		keyFields?: false | BrowseMolecularProfileKeySpecifier | (() => undefined | BrowseMolecularProfileKeySpecifier),
 		fields?: BrowseMolecularProfileFieldPolicy,
diff --git a/client/src/app/generated/civic.apollo.ts b/client/src/app/generated/civic.apollo.ts
index 512d24dcb..864040b58 100644
--- a/client/src/app/generated/civic.apollo.ts
+++ b/client/src/app/generated/civic.apollo.ts
@@ -586,65 +586,6 @@ export type BrowseFeatureEdge = {
   node?: Maybe<BrowseFeature>;
 };
 
-export type BrowseGene = Flaggable & {
-  __typename: 'BrowseGene';
-  assertionCount: Scalars['Int'];
-  description: Scalars['String'];
-  diseases?: Maybe<Array<Disease>>;
-  entrezId: Scalars['Int'];
-  evidenceItemCount: Scalars['Int'];
-  flagged: Scalars['Boolean'];
-  /** List and filter flags. */
-  flags: FlagConnection;
-  geneAliases?: Maybe<Array<Scalars['String']>>;
-  id: Scalars['Int'];
-  link: Scalars['String'];
-  molecularProfileCount: Scalars['Int'];
-  name: Scalars['String'];
-  therapies?: Maybe<Array<Therapy>>;
-  variantCount: Scalars['Int'];
-};
-
-
-export type BrowseGeneFlagsArgs = {
-  after?: InputMaybe<Scalars['String']>;
-  before?: InputMaybe<Scalars['String']>;
-  first?: InputMaybe<Scalars['Int']>;
-  flaggingUserId?: InputMaybe<Scalars['Int']>;
-  last?: InputMaybe<Scalars['Int']>;
-  resolvingUserId?: InputMaybe<Scalars['Int']>;
-  sortBy?: InputMaybe<DateSort>;
-  state?: InputMaybe<FlagState>;
-};
-
-/** The connection type for BrowseGene. */
-export type BrowseGeneConnection = {
-  __typename: 'BrowseGeneConnection';
-  /** A list of edges. */
-  edges: Array<BrowseGeneEdge>;
-  /** The total number of records in this set. */
-  filteredCount: Scalars['Int'];
-  /** The last time the data in this browse table was refreshed */
-  lastUpdated: Scalars['ISO8601DateTime'];
-  /** A list of nodes. */
-  nodes: Array<BrowseGene>;
-  /** Total number of pages, based on filtered count and pagesize. */
-  pageCount: Scalars['Int'];
-  /** Information to aid in pagination. */
-  pageInfo: PageInfo;
-  /** The total number of records of this type, regardless of any filtering. */
-  totalCount: Scalars['Int'];
-};
-
-/** An edge in a connection. */
-export type BrowseGeneEdge = {
-  __typename: 'BrowseGeneEdge';
-  /** A cursor for use in pagination. */
-  cursor: Scalars['String'];
-  /** The item at the end of the edge. */
-  node?: Maybe<BrowseGene>;
-};
-
 export type BrowseMolecularProfile = {
   __typename: 'BrowseMolecularProfile';
   aliases: Array<MolecularProfileAlias>;
@@ -2119,7 +2060,6 @@ export enum FlaggableEntities {
   Assertion = 'ASSERTION',
   EvidenceItem = 'EVIDENCE_ITEM',
   Feature = 'FEATURE',
-  Gene = 'GENE',
   MolecularProfile = 'MOLECULAR_PROFILE',
   Variant = 'VARIANT',
   VariantGroup = 'VARIANT_GROUP'
@@ -2270,24 +2210,6 @@ export type GeneSearchFilter = {
   subFilters?: InputMaybe<Array<GeneSearchFilter>>;
 };
 
-export type GenesSort = {
-  /** Available columns for sorting */
-  column: GenesSortColumns;
-  /** Sort direction */
-  direction: SortDirection;
-};
-
-export enum GenesSortColumns {
-  AssertionCount = 'assertionCount',
-  DiseaseName = 'diseaseName',
-  EntrezSymbol = 'entrezSymbol',
-  EvidenceItemCount = 'evidenceItemCount',
-  GeneAlias = 'geneAlias',
-  MolecularProfileCount = 'molecularProfileCount',
-  TherapyName = 'therapyName',
-  VariantCount = 'variantCount'
-}
-
 export type IntSearchInput = {
   comparisonOperator: IntSearchOperator;
   value: Scalars['Int'];
@@ -2580,7 +2502,6 @@ export enum ModeratedEntities {
   Assertion = 'ASSERTION',
   EvidenceItem = 'EVIDENCE_ITEM',
   Feature = 'FEATURE',
-  Gene = 'GENE',
   MolecularProfile = 'MOLECULAR_PROFILE',
   Variant = 'VARIANT',
   VariantGroup = 'VARIANT_GROUP'
@@ -3541,7 +3462,6 @@ export type Query = {
   assertions: AssertionConnection;
   browseDiseases: BrowseDiseaseConnection;
   browseFeatures: BrowseFeatureConnection;
-  browseGenes: BrowseGeneConnection;
   browseMolecularProfiles: BrowseMolecularProfileConnection;
   browseSources: BrowseSourceConnection;
   browseVariantGroups: BrowseVariantGroupConnection;
@@ -3752,19 +3672,6 @@ export type QueryBrowseFeaturesArgs = {
 };
 
 
-export type QueryBrowseGenesArgs = {
-  after?: InputMaybe<Scalars['String']>;
-  before?: InputMaybe<Scalars['String']>;
-  diseaseName?: InputMaybe<Scalars['String']>;
-  entrezSymbol?: InputMaybe<Scalars['String']>;
-  first?: InputMaybe<Scalars['Int']>;
-  geneAlias?: InputMaybe<Scalars['String']>;
-  last?: InputMaybe<Scalars['Int']>;
-  sortBy?: InputMaybe<GenesSort>;
-  therapyName?: InputMaybe<Scalars['String']>;
-};
-
-
 export type QueryBrowseMolecularProfilesArgs = {
   after?: InputMaybe<Scalars['String']>;
   before?: InputMaybe<Scalars['String']>;
@@ -4253,7 +4160,6 @@ export type QueryVariantGroupsArgs = {
   after?: InputMaybe<Scalars['String']>;
   before?: InputMaybe<Scalars['String']>;
   first?: InputMaybe<Scalars['Int']>;
-  geneId?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
 };
 
@@ -4293,7 +4199,6 @@ export type QueryVariantsArgs = {
   before?: InputMaybe<Scalars['String']>;
   featureId?: InputMaybe<Scalars['Int']>;
   first?: InputMaybe<Scalars['Int']>;
-  geneId?: InputMaybe<Scalars['Int']>;
   hasNoVariantType?: InputMaybe<Scalars['Boolean']>;
   last?: InputMaybe<Scalars['Int']>;
   name?: InputMaybe<Scalars['String']>;
@@ -4941,7 +4846,6 @@ export enum SubscribableEntities {
   Assertion = 'ASSERTION',
   EvidenceItem = 'EVIDENCE_ITEM',
   Feature = 'FEATURE',
-  Gene = 'GENE',
   MolecularProfile = 'MOLECULAR_PROFILE',
   Revision = 'REVISION',
   SourceSuggestion = 'SOURCE_SUGGESTION',
@@ -5642,7 +5546,6 @@ export type Variant = Commentable & EventOriginObject & EventSubject & Flaggable
   flagged: Scalars['Boolean'];
   /** List and filter flags. */
   flags: FlagConnection;
-  gene: Gene;
   hgvsDescriptions: Array<Scalars['String']>;
   id: Scalars['Int'];
   lastAcceptedRevisionEvent?: Maybe<Event>;
@@ -6351,46 +6254,20 @@ export type FlagListQueryVariables = Exact<{
 }>;
 
 
-export type FlagListQuery = { __typename: 'Query', flags: { __typename: 'FlagConnection', totalCount: number, unfilteredCountForSubject?: number | undefined, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, uniqueFlaggingUsers: Array<{ __typename: 'User', username: string, id: number, profileImagePath?: string | undefined }>, uniqueResolvingUsers?: Array<{ __typename: 'User', username: string, id: number, profileImagePath?: string | undefined }> | undefined, edges: Array<{ __typename: 'FlagEdge', node?: { __typename: 'Flag', id: number, state: FlagState, flaggable: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'BrowseFeature', id: number, name: string, link: string } | { __typename: 'BrowseGene', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | { __typename: 'VariantGroup', id: number, name: string, link: string }, openActivity: { __typename: 'FlagEntityActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } }, resolutionActivity?: { __typename: 'ResolveFlagActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined } | undefined }> } };
+export type FlagListQuery = { __typename: 'Query', flags: { __typename: 'FlagConnection', totalCount: number, unfilteredCountForSubject?: number | undefined, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, uniqueFlaggingUsers: Array<{ __typename: 'User', username: string, id: number, profileImagePath?: string | undefined }>, uniqueResolvingUsers?: Array<{ __typename: 'User', username: string, id: number, profileImagePath?: string | undefined }> | undefined, edges: Array<{ __typename: 'FlagEdge', node?: { __typename: 'Flag', id: number, state: FlagState, flaggable: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'BrowseFeature', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | { __typename: 'VariantGroup', id: number, name: string, link: string }, openActivity: { __typename: 'FlagEntityActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } }, resolutionActivity?: { __typename: 'ResolveFlagActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined } | undefined }> } };
 
-export type FlagListFragment = { __typename: 'FlagConnection', totalCount: number, unfilteredCountForSubject?: number | undefined, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, uniqueFlaggingUsers: Array<{ __typename: 'User', username: string, id: number, profileImagePath?: string | undefined }>, uniqueResolvingUsers?: Array<{ __typename: 'User', username: string, id: number, profileImagePath?: string | undefined }> | undefined, edges: Array<{ __typename: 'FlagEdge', node?: { __typename: 'Flag', id: number, state: FlagState, flaggable: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'BrowseFeature', id: number, name: string, link: string } | { __typename: 'BrowseGene', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | { __typename: 'VariantGroup', id: number, name: string, link: string }, openActivity: { __typename: 'FlagEntityActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } }, resolutionActivity?: { __typename: 'ResolveFlagActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined } | undefined }> };
+export type FlagListFragment = { __typename: 'FlagConnection', totalCount: number, unfilteredCountForSubject?: number | undefined, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, uniqueFlaggingUsers: Array<{ __typename: 'User', username: string, id: number, profileImagePath?: string | undefined }>, uniqueResolvingUsers?: Array<{ __typename: 'User', username: string, id: number, profileImagePath?: string | undefined }> | undefined, edges: Array<{ __typename: 'FlagEdge', node?: { __typename: 'Flag', id: number, state: FlagState, flaggable: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'BrowseFeature', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | { __typename: 'VariantGroup', id: number, name: string, link: string }, openActivity: { __typename: 'FlagEntityActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } }, resolutionActivity?: { __typename: 'ResolveFlagActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined } | undefined }> };
 
-export type FlagFragment = { __typename: 'Flag', id: number, state: FlagState, flaggable: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'BrowseFeature', id: number, name: string, link: string } | { __typename: 'BrowseGene', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | { __typename: 'VariantGroup', id: number, name: string, link: string }, openActivity: { __typename: 'FlagEntityActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } }, resolutionActivity?: { __typename: 'ResolveFlagActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined };
+export type FlagFragment = { __typename: 'Flag', id: number, state: FlagState, flaggable: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'BrowseFeature', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | { __typename: 'VariantGroup', id: number, name: string, link: string }, openActivity: { __typename: 'FlagEntityActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } }, resolutionActivity?: { __typename: 'ResolveFlagActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined };
 
 export type FlagPopoverQueryVariables = Exact<{
   flagId: Scalars['Int'];
 }>;
 
 
-export type FlagPopoverQuery = { __typename: 'Query', flag?: { __typename: 'Flag', id: number, name: string, state: FlagState, createdAt: any, flaggingUser: { __typename: 'User', id: number, displayName: string, role: UserRole }, flaggable: { __typename: 'Assertion', id: number, link: string, name: string } | { __typename: 'BrowseFeature', id: number, link: string, name: string } | { __typename: 'BrowseGene', id: number, link: string, name: string } | { __typename: 'EvidenceItem', id: number, link: string, name: string } | { __typename: 'Feature', id: number, link: string, name: string } | { __typename: 'Gene', id: number, link: string, name: string } | { __typename: 'MolecularProfile', id: number, link: string, name: string } | { __typename: 'Variant', id: number, link: string, name: string } | { __typename: 'VariantGroup', id: number, link: string, name: string }, openActivity: { __typename: 'FlagEntityActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } } | undefined };
+export type FlagPopoverQuery = { __typename: 'Query', flag?: { __typename: 'Flag', id: number, name: string, state: FlagState, createdAt: any, flaggingUser: { __typename: 'User', id: number, displayName: string, role: UserRole }, flaggable: { __typename: 'Assertion', id: number, link: string, name: string } | { __typename: 'BrowseFeature', id: number, link: string, name: string } | { __typename: 'EvidenceItem', id: number, link: string, name: string } | { __typename: 'Feature', id: number, link: string, name: string } | { __typename: 'Gene', id: number, link: string, name: string } | { __typename: 'MolecularProfile', id: number, link: string, name: string } | { __typename: 'Variant', id: number, link: string, name: string } | { __typename: 'VariantGroup', id: number, link: string, name: string }, openActivity: { __typename: 'FlagEntityActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } } | undefined };
 
-export type FlagPopoverFragment = { __typename: 'Flag', id: number, name: string, state: FlagState, createdAt: any, flaggingUser: { __typename: 'User', id: number, displayName: string, role: UserRole }, flaggable: { __typename: 'Assertion', id: number, link: string, name: string } | { __typename: 'BrowseFeature', id: number, link: string, name: string } | { __typename: 'BrowseGene', id: number, link: string, name: string } | { __typename: 'EvidenceItem', id: number, link: string, name: string } | { __typename: 'Feature', id: number, link: string, name: string } | { __typename: 'Gene', id: number, link: string, name: string } | { __typename: 'MolecularProfile', id: number, link: string, name: string } | { __typename: 'Variant', id: number, link: string, name: string } | { __typename: 'VariantGroup', id: number, link: string, name: string }, openActivity: { __typename: 'FlagEntityActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } };
-
-export type GenePopoverQueryVariables = Exact<{
-  geneId: Scalars['Int'];
-}>;
-
-
-export type GenePopoverQuery = { __typename: 'Query', gene?: { __typename: 'Gene', id: number, name: string, fullName?: string | undefined, featureAliases: Array<string>, variants: { __typename: 'VariantConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, flags: { __typename: 'FlagConnection', totalCount: number } } | undefined };
-
-export type GenePopoverFragment = { __typename: 'Gene', id: number, name: string, fullName?: string | undefined, featureAliases: Array<string>, variants: { __typename: 'VariantConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, flags: { __typename: 'FlagConnection', totalCount: number } };
-
-export type BrowseGenesQueryVariables = Exact<{
-  entrezSymbol?: InputMaybe<Scalars['String']>;
-  therapyName?: InputMaybe<Scalars['String']>;
-  geneAlias?: InputMaybe<Scalars['String']>;
-  diseaseName?: InputMaybe<Scalars['String']>;
-  sortBy?: InputMaybe<GenesSort>;
-  first?: InputMaybe<Scalars['Int']>;
-  last?: InputMaybe<Scalars['Int']>;
-  before?: InputMaybe<Scalars['String']>;
-  after?: InputMaybe<Scalars['String']>;
-}>;
-
-
-export type BrowseGenesQuery = { __typename: 'Query', browseGenes: { __typename: 'BrowseGeneConnection', lastUpdated: any, totalCount: number, filteredCount: number, pageCount: number, edges: Array<{ __typename: 'BrowseGeneEdge', cursor: string, node?: { __typename: 'BrowseGene', id: number, entrezId: number, name: string, link: string, flagged: boolean, geneAliases?: Array<string> | undefined, variantCount: number, evidenceItemCount: number, assertionCount: number, molecularProfileCount: number, diseases?: Array<{ __typename: 'Disease', name: string, id: number, link: string }> | undefined, therapies?: Array<{ __typename: 'Therapy', name: string, id: number, link: string }> | undefined } | undefined }>, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasPreviousPage: boolean, hasNextPage: boolean } } };
-
-export type BrowseGenesFieldsFragment = { __typename: 'BrowseGene', id: number, entrezId: number, name: string, link: string, flagged: boolean, geneAliases?: Array<string> | undefined, variantCount: number, evidenceItemCount: number, assertionCount: number, molecularProfileCount: number, diseases?: Array<{ __typename: 'Disease', name: string, id: number, link: string }> | undefined, therapies?: Array<{ __typename: 'Therapy', name: string, id: number, link: string }> | undefined };
+export type FlagPopoverFragment = { __typename: 'Flag', id: number, name: string, state: FlagState, createdAt: any, flaggingUser: { __typename: 'User', id: number, displayName: string, role: UserRole }, flaggable: { __typename: 'Assertion', id: number, link: string, name: string } | { __typename: 'BrowseFeature', id: number, link: string, name: string } | { __typename: 'EvidenceItem', id: number, link: string, name: string } | { __typename: 'Feature', id: number, link: string, name: string } | { __typename: 'Gene', id: number, link: string, name: string } | { __typename: 'MolecularProfile', id: number, link: string, name: string } | { __typename: 'Variant', id: number, link: string, name: string } | { __typename: 'VariantGroup', id: number, link: string, name: string }, openActivity: { __typename: 'FlagEntityActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } };
 
 export type QuicksearchQueryVariables = Exact<{
   query: Scalars['String'];
@@ -6850,7 +6727,6 @@ export type VariantPopoverQuery = { __typename: 'Query', variant?: { __typename:
 export type VariantPopoverFieldsFragment = { __typename: 'Variant', id: number, name: string, variantAliases: Array<string>, alleleRegistryId?: string | undefined, feature: { __typename: 'Feature', id: number, name: string, link: string }, molecularProfiles: { __typename: 'MolecularProfileConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, flags: { __typename: 'FlagConnection', totalCount: number } };
 
 export type VariantsMenuQueryVariables = Exact<{
-  geneId?: InputMaybe<Scalars['Int']>;
   featureId?: InputMaybe<Scalars['Int']>;
   variantName?: InputMaybe<Scalars['String']>;
   variantTypeIds?: InputMaybe<Array<Scalars['Int']> | Scalars['Int']>;
@@ -7646,27 +7522,11 @@ export type FeaturesSummaryQueryVariables = Exact<{
 }>;
 
 
-export type FeaturesSummaryQuery = { __typename: 'Query', feature?: { __typename: 'Feature', id: number, name: string, fullName?: string | undefined, featureInstance: { __typename: 'Gene', id: number, description: string, featureAliases: Array<string>, name: string, entrezId: number, myGeneInfoDetails?: any | undefined, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceUrl?: string | undefined, displayType: string, sourceType: SourceSource }> } } | undefined };
-
-export type FeatureSummaryFieldsFragment = { __typename: 'Feature', id: number, name: string, fullName?: string | undefined, featureInstance: { __typename: 'Gene', id: number, description: string, featureAliases: Array<string>, name: string, entrezId: number, myGeneInfoDetails?: any | undefined, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceUrl?: string | undefined, displayType: string, sourceType: SourceSource }> } };
-
-export type GeneDetailQueryVariables = Exact<{
-  geneId: Scalars['Int'];
-}>;
-
-
-export type GeneDetailQuery = { __typename: 'Query', gene?: { __typename: 'Gene', id: number, name: string, fullName?: string | undefined, entrezId: number, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number } } | undefined };
-
-export type GeneDetailFieldsFragment = { __typename: 'Gene', id: number, name: string, fullName?: string | undefined, entrezId: number, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number } };
-
-export type GenesSummaryQueryVariables = Exact<{
-  geneId: Scalars['Int'];
-}>;
+export type FeaturesSummaryQuery = { __typename: 'Query', feature?: { __typename: 'Feature', id: number, name: string, fullName?: string | undefined, featureInstance: { __typename: 'Gene', id: number, description: string, featureAliases: Array<string>, entrezId: number, name: string, myGeneInfoDetails?: any | undefined, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceUrl?: string | undefined, displayType: string, sourceType: SourceSource }> } } | undefined };
 
+export type FeatureSummaryFieldsFragment = { __typename: 'Feature', id: number, name: string, fullName?: string | undefined, featureInstance: { __typename: 'Gene', id: number, description: string, featureAliases: Array<string>, entrezId: number, name: string, myGeneInfoDetails?: any | undefined, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceUrl?: string | undefined, displayType: string, sourceType: SourceSource }> } };
 
-export type GenesSummaryQuery = { __typename: 'Query', gene?: { __typename: 'Gene', description: string, entrezId: number, featureAliases: Array<string>, id: number, name: string, myGeneInfoDetails?: any | undefined, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceUrl?: string | undefined, displayType: string, sourceType: SourceSource }> } | undefined };
-
-export type GeneSummaryFieldsFragment = { __typename: 'Gene', description: string, entrezId: number, featureAliases: Array<string>, id: number, name: string, myGeneInfoDetails?: any | undefined, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceUrl?: string | undefined, displayType: string, sourceType: SourceSource }> };
+export type GeneSummaryFieldsFragment = { __typename: 'Gene', id: number, description: string, featureAliases: Array<string>, entrezId: number, name: string, myGeneInfoDetails?: any | undefined, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceUrl?: string | undefined, displayType: string, sourceType: SourceSource }> };
 
 export type MolecularProfileDetailQueryVariables = Exact<{
   mpId: Scalars['Int'];
@@ -8477,50 +8337,6 @@ export const FlagPopoverFragmentDoc = gql`
   }
 }
     ${ParsedCommentFragmentFragmentDoc}`;
-export const GenePopoverFragmentDoc = gql`
-    fragment genePopover on Gene {
-  id
-  name
-  fullName
-  featureAliases
-  variants {
-    totalCount
-  }
-  revisions(status: NEW) {
-    totalCount
-  }
-  comments {
-    totalCount
-  }
-  flags(state: OPEN) {
-    totalCount
-  }
-}
-    `;
-export const BrowseGenesFieldsFragmentDoc = gql`
-    fragment BrowseGenesFields on BrowseGene {
-  id
-  entrezId
-  name
-  link
-  flagged
-  geneAliases
-  diseases {
-    name
-    id
-    link
-  }
-  therapies {
-    name
-    id
-    link
-  }
-  variantCount
-  evidenceItemCount
-  assertionCount
-  molecularProfileCount
-}
-    `;
 export const QuicksearchResultFragmentDoc = gql`
     fragment QuicksearchResult on SearchResult {
   id
@@ -9894,55 +9710,12 @@ export const FeatureDetailFieldsFragmentDoc = gql`
   }
 }
     `;
-export const FeatureSummaryFieldsFragmentDoc = gql`
-    fragment FeatureSummaryFields on Feature {
-  id
-  name
-  fullName
-  featureInstance {
-    __typename
-    ... on Gene {
-      id
-      description
-      featureAliases
-      name
-      sources {
-        id
-        citation
-        link
-        sourceUrl
-        displayType
-        sourceType
-      }
-      entrezId
-      myGeneInfoDetails
-    }
-  }
-}
-    `;
-export const GeneDetailFieldsFragmentDoc = gql`
-    fragment GeneDetailFields on Gene {
-  id
-  name
-  fullName
-  entrezId
-  flags(state: OPEN) {
-    totalCount
-  }
-  revisions(status: NEW) {
-    totalCount
-  }
-  comments {
-    totalCount
-  }
-}
-    `;
 export const GeneSummaryFieldsFragmentDoc = gql`
     fragment GeneSummaryFields on Gene {
+  id
   description
-  entrezId
   featureAliases
-  id
+  entrezId
   name
   sources {
     id
@@ -9955,6 +9728,19 @@ export const GeneSummaryFieldsFragmentDoc = gql`
   myGeneInfoDetails
 }
     `;
+export const FeatureSummaryFieldsFragmentDoc = gql`
+    fragment FeatureSummaryFields on Feature {
+  id
+  name
+  fullName
+  featureInstance {
+    __typename
+    ... on Gene {
+      ...GeneSummaryFields
+    }
+  }
+}
+    ${GeneSummaryFieldsFragmentDoc}`;
 export const MolecularProfileDetailFieldsFragmentDoc = gql`
     fragment MolecularProfileDetailFields on MolecularProfile {
   id
@@ -11190,67 +10976,6 @@ export const FlagPopoverDocument = gql`
   export class FlagPopoverGQL extends Apollo.Query<FlagPopoverQuery, FlagPopoverQueryVariables> {
     document = FlagPopoverDocument;
     
-    constructor(apollo: Apollo.Apollo) {
-      super(apollo);
-    }
-  }
-export const GenePopoverDocument = gql`
-    query GenePopover($geneId: Int!) {
-  gene(id: $geneId) {
-    ...genePopover
-  }
-}
-    ${GenePopoverFragmentDoc}`;
-
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class GenePopoverGQL extends Apollo.Query<GenePopoverQuery, GenePopoverQueryVariables> {
-    document = GenePopoverDocument;
-    
-    constructor(apollo: Apollo.Apollo) {
-      super(apollo);
-    }
-  }
-export const BrowseGenesDocument = gql`
-    query BrowseGenes($entrezSymbol: String, $therapyName: String, $geneAlias: String, $diseaseName: String, $sortBy: GenesSort, $first: Int, $last: Int, $before: String, $after: String) {
-  browseGenes(
-    entrezSymbol: $entrezSymbol
-    therapyName: $therapyName
-    geneAlias: $geneAlias
-    diseaseName: $diseaseName
-    sortBy: $sortBy
-    first: $first
-    last: $last
-    before: $before
-    after: $after
-  ) {
-    edges {
-      cursor
-      node {
-        ...BrowseGenesFields
-      }
-    }
-    pageInfo {
-      startCursor
-      endCursor
-      hasPreviousPage
-      hasNextPage
-    }
-    lastUpdated
-    totalCount
-    filteredCount
-    pageCount
-  }
-}
-    ${BrowseGenesFieldsFragmentDoc}`;
-
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class BrowseGenesGQL extends Apollo.Query<BrowseGenesQuery, BrowseGenesQueryVariables> {
-    document = BrowseGenesDocument;
-    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -12492,9 +12217,8 @@ export const VariantPopoverDocument = gql`
     }
   }
 export const VariantsMenuDocument = gql`
-    query VariantsMenu($geneId: Int, $featureId: Int, $variantName: String, $variantTypeIds: [Int!], $hasNoVariantType: Boolean, $first: Int, $last: Int, $before: String, $after: String, $sortBy: VariantMenuSort) {
+    query VariantsMenu($featureId: Int, $variantName: String, $variantTypeIds: [Int!], $hasNoVariantType: Boolean, $first: Int, $last: Int, $before: String, $after: String, $sortBy: VariantMenuSort) {
   variants(
-    geneId: $geneId
     featureId: $featureId
     name: $variantName
     variantTypeIds: $variantTypeIds
@@ -14460,42 +14184,6 @@ export const FeaturesSummaryDocument = gql`
   export class FeaturesSummaryGQL extends Apollo.Query<FeaturesSummaryQuery, FeaturesSummaryQueryVariables> {
     document = FeaturesSummaryDocument;
     
-    constructor(apollo: Apollo.Apollo) {
-      super(apollo);
-    }
-  }
-export const GeneDetailDocument = gql`
-    query GeneDetail($geneId: Int!) {
-  gene(id: $geneId) {
-    ...GeneDetailFields
-  }
-}
-    ${GeneDetailFieldsFragmentDoc}`;
-
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class GeneDetailGQL extends Apollo.Query<GeneDetailQuery, GeneDetailQueryVariables> {
-    document = GeneDetailDocument;
-    
-    constructor(apollo: Apollo.Apollo) {
-      super(apollo);
-    }
-  }
-export const GenesSummaryDocument = gql`
-    query GenesSummary($geneId: Int!) {
-  gene(id: $geneId) {
-    ...GeneSummaryFields
-  }
-}
-    ${GeneSummaryFieldsFragmentDoc}`;
-
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class GenesSummaryGQL extends Apollo.Query<GenesSummaryQuery, GenesSummaryQueryVariables> {
-    document = GenesSummaryDocument;
-    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
diff --git a/client/src/app/generated/civic.possible-types.ts b/client/src/app/generated/civic.possible-types.ts
index 96c8dd514..eb64011d2 100644
--- a/client/src/app/generated/civic.possible-types.ts
+++ b/client/src/app/generated/civic.possible-types.ts
@@ -73,7 +73,6 @@
     "Flaggable": [
       "Assertion",
       "BrowseFeature",
-      "BrowseGene",
       "EvidenceItem",
       "Feature",
       "Gene",
diff --git a/client/src/app/generated/server.model.graphql b/client/src/app/generated/server.model.graphql
index 6bdfdb987..fcbb74768 100644
--- a/client/src/app/generated/server.model.graphql
+++ b/client/src/app/generated/server.model.graphql
@@ -993,122 +993,6 @@ type BrowseFeatureEdge {
   node: BrowseFeature
 }
 
-type BrowseGene implements Flaggable {
-  assertionCount: Int!
-  description: String!
-  diseases: [Disease!]
-  entrezId: Int!
-  evidenceItemCount: Int!
-  flagged: Boolean!
-
-  """
-  List and filter flags.
-  """
-  flags(
-    """
-    Returns the elements in the list that come after the specified cursor.
-    """
-    after: String
-
-    """
-    Returns the elements in the list that come before the specified cursor.
-    """
-    before: String
-
-    """
-    Returns the first _n_ elements from the list.
-    """
-    first: Int
-
-    """
-    Limit to flags added by a certain user
-    """
-    flaggingUserId: Int
-
-    """
-    Returns the last _n_ elements from the list.
-    """
-    last: Int
-
-    """
-    Limit to flags resolved by a certain user
-    """
-    resolvingUserId: Int
-
-    """
-    Sort order for the flags. Defaults to most recent.
-    """
-    sortBy: DateSort
-
-    """
-    Limit to flags in a particular state
-    """
-    state: FlagState
-  ): FlagConnection!
-  geneAliases: [String!]
-  id: Int!
-  link: String!
-  molecularProfileCount: Int!
-  name: String!
-  therapies: [Therapy!]
-  variantCount: Int!
-}
-
-"""
-The connection type for BrowseGene.
-"""
-type BrowseGeneConnection {
-  """
-  A list of edges.
-  """
-  edges: [BrowseGeneEdge!]!
-
-  """
-  The total number of records in this set.
-  """
-  filteredCount: Int!
-
-  """
-  The last time the data in this browse table was refreshed
-  """
-  lastUpdated: ISO8601DateTime!
-
-  """
-  A list of nodes.
-  """
-  nodes: [BrowseGene!]!
-
-  """
-  Total number of pages, based on filtered count and pagesize.
-  """
-  pageCount: Int!
-
-  """
-  Information to aid in pagination.
-  """
-  pageInfo: PageInfo!
-
-  """
-  The total number of records of this type, regardless of any filtering.
-  """
-  totalCount: Int!
-}
-
-"""
-An edge in a connection.
-"""
-type BrowseGeneEdge {
-  """
-  A cursor for use in pagination.
-  """
-  cursor: String!
-
-  """
-  The item at the end of the edge.
-  """
-  node: BrowseGene
-}
-
 type BrowseMolecularProfile {
   aliases: [MolecularProfileAlias!]!
   assertionCount: Int!
@@ -3465,7 +3349,6 @@ enum FlaggableEntities {
   ASSERTION
   EVIDENCE_ITEM
   FEATURE
-  GENE
   MOLECULAR_PROFILE
   VARIANT
   VARIANT_GROUP
@@ -3785,29 +3668,6 @@ input GeneSearchFilter {
   subFilters: [GeneSearchFilter!]
 }
 
-input GenesSort {
-  """
-  Available columns for sorting
-  """
-  column: GenesSortColumns!
-
-  """
-  Sort direction
-  """
-  direction: SortDirection!
-}
-
-enum GenesSortColumns {
-  assertionCount
-  diseaseName
-  entrezSymbol
-  evidenceItemCount
-  geneAlias
-  molecularProfileCount
-  therapyName
-  variantCount
-}
-
 """
 An ISO 8601-encoded datetime
 """
@@ -4236,7 +4096,6 @@ enum ModeratedEntities {
   ASSERTION
   EVIDENCE_ITEM
   FEATURE
-  GENE
   MOLECULAR_PROFILE
   VARIANT
   VARIANT_GROUP
@@ -5897,32 +5756,6 @@ type Query {
     sortBy: FeaturesSort
     therapyName: String
   ): BrowseFeatureConnection!
-  browseGenes(
-    """
-    Returns the elements in the list that come after the specified cursor.
-    """
-    after: String
-
-    """
-    Returns the elements in the list that come before the specified cursor.
-    """
-    before: String
-    diseaseName: String
-    entrezSymbol: String
-
-    """
-    Returns the first _n_ elements from the list.
-    """
-    first: Int
-    geneAlias: String
-
-    """
-    Returns the last _n_ elements from the list.
-    """
-    last: Int
-    sortBy: GenesSort
-    therapyName: String
-  ): BrowseGeneConnection!
   browseMolecularProfiles(
     """
     Returns the elements in the list that come after the specified cursor.
@@ -6982,11 +6815,6 @@ type Query {
     """
     first: Int
 
-    """
-    Gene that variant groups are associated with.
-    """
-    geneId: Int
-
     """
     Returns the last _n_ elements from the list.
     """
@@ -7092,11 +6920,6 @@ type Query {
     """
     first: Int
 
-    """
-    Gene that variants are associated with.
-    """
-    geneId: Int
-
     """
     Return Variants lacking an assigned VariantType
     """
@@ -8115,7 +7938,6 @@ enum SubscribableEntities {
   ASSERTION
   EVIDENCE_ITEM
   FEATURE
-  GENE
   MOLECULAR_PROFILE
   REVISION
   SOURCE_SUGGESTION
@@ -9281,7 +9103,6 @@ type Variant implements Commentable & EventOriginObject & EventSubject & Flaggab
     """
     state: FlagState
   ): FlagConnection!
-  gene: Gene!
   hgvsDescriptions: [String!]!
   id: Int!
   lastAcceptedRevisionEvent: Event
diff --git a/client/src/app/generated/server.schema.json b/client/src/app/generated/server.schema.json
index c4c143601..1431ba468 100644
--- a/client/src/app/generated/server.schema.json
+++ b/client/src/app/generated/server.schema.json
@@ -4479,534 +4479,6 @@
           "enumValues": null,
           "possibleTypes": null
         },
-        {
-          "kind": "OBJECT",
-          "name": "BrowseGene",
-          "description": null,
-          "fields": [
-            {
-              "name": "assertionCount",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Int",
-                  "ofType": null
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "description",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "diseases",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "LIST",
-                "name": null,
-                "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "OBJECT",
-                    "name": "Disease",
-                    "ofType": null
-                  }
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "entrezId",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Int",
-                  "ofType": null
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "evidenceItemCount",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Int",
-                  "ofType": null
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "flagged",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Boolean",
-                  "ofType": null
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "flags",
-              "description": "List and filter flags.",
-              "args": [
-                {
-                  "name": "flaggingUserId",
-                  "description": "Limit to flags added by a certain user",
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "Int",
-                    "ofType": null
-                  },
-                  "defaultValue": null,
-                  "isDeprecated": false,
-                  "deprecationReason": null
-                },
-                {
-                  "name": "resolvingUserId",
-                  "description": "Limit to flags resolved by a certain user",
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "Int",
-                    "ofType": null
-                  },
-                  "defaultValue": null,
-                  "isDeprecated": false,
-                  "deprecationReason": null
-                },
-                {
-                  "name": "state",
-                  "description": "Limit to flags in a particular state",
-                  "type": {
-                    "kind": "ENUM",
-                    "name": "FlagState",
-                    "ofType": null
-                  },
-                  "defaultValue": null,
-                  "isDeprecated": false,
-                  "deprecationReason": null
-                },
-                {
-                  "name": "sortBy",
-                  "description": "Sort order for the flags. Defaults to most recent.",
-                  "type": {
-                    "kind": "INPUT_OBJECT",
-                    "name": "DateSort",
-                    "ofType": null
-                  },
-                  "defaultValue": null,
-                  "isDeprecated": false,
-                  "deprecationReason": null
-                },
-                {
-                  "name": "after",
-                  "description": "Returns the elements in the list that come after the specified cursor.",
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "String",
-                    "ofType": null
-                  },
-                  "defaultValue": null,
-                  "isDeprecated": false,
-                  "deprecationReason": null
-                },
-                {
-                  "name": "before",
-                  "description": "Returns the elements in the list that come before the specified cursor.",
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "String",
-                    "ofType": null
-                  },
-                  "defaultValue": null,
-                  "isDeprecated": false,
-                  "deprecationReason": null
-                },
-                {
-                  "name": "first",
-                  "description": "Returns the first _n_ elements from the list.",
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "Int",
-                    "ofType": null
-                  },
-                  "defaultValue": null,
-                  "isDeprecated": false,
-                  "deprecationReason": null
-                },
-                {
-                  "name": "last",
-                  "description": "Returns the last _n_ elements from the list.",
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "Int",
-                    "ofType": null
-                  },
-                  "defaultValue": null,
-                  "isDeprecated": false,
-                  "deprecationReason": null
-                }
-              ],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "OBJECT",
-                  "name": "FlagConnection",
-                  "ofType": null
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "geneAliases",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "LIST",
-                "name": null,
-                "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "SCALAR",
-                    "name": "String",
-                    "ofType": null
-                  }
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "id",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Int",
-                  "ofType": null
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "link",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "molecularProfileCount",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Int",
-                  "ofType": null
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "name",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "therapies",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "LIST",
-                "name": null,
-                "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "OBJECT",
-                    "name": "Therapy",
-                    "ofType": null
-                  }
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "variantCount",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Int",
-                  "ofType": null
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            }
-          ],
-          "inputFields": null,
-          "interfaces": [
-            {
-              "kind": "INTERFACE",
-              "name": "Flaggable",
-              "ofType": null
-            }
-          ],
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "OBJECT",
-          "name": "BrowseGeneConnection",
-          "description": "The connection type for BrowseGene.",
-          "fields": [
-            {
-              "name": "edges",
-              "description": "A list of edges.",
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "OBJECT",
-                      "name": "BrowseGeneEdge",
-                      "ofType": null
-                    }
-                  }
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "filteredCount",
-              "description": "The total number of records in this set.",
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Int",
-                  "ofType": null
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "lastUpdated",
-              "description": "The last time the data in this browse table was refreshed",
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "ISO8601DateTime",
-                  "ofType": null
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "nodes",
-              "description": "A list of nodes.",
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "OBJECT",
-                      "name": "BrowseGene",
-                      "ofType": null
-                    }
-                  }
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "pageCount",
-              "description": "Total number of pages, based on filtered count and pagesize.",
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Int",
-                  "ofType": null
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "pageInfo",
-              "description": "Information to aid in pagination.",
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "OBJECT",
-                  "name": "PageInfo",
-                  "ofType": null
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "totalCount",
-              "description": "The total number of records of this type, regardless of any filtering.",
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Int",
-                  "ofType": null
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            }
-          ],
-          "inputFields": null,
-          "interfaces": [],
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "OBJECT",
-          "name": "BrowseGeneEdge",
-          "description": "An edge in a connection.",
-          "fields": [
-            {
-              "name": "cursor",
-              "description": "A cursor for use in pagination.",
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "node",
-              "description": "The item at the end of the edge.",
-              "args": [],
-              "type": {
-                "kind": "OBJECT",
-                "name": "BrowseGene",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            }
-          ],
-          "inputFields": null,
-          "interfaces": [],
-          "enumValues": null,
-          "possibleTypes": null
-        },
         {
           "kind": "OBJECT",
           "name": "BrowseMolecularProfile",
@@ -16722,11 +16194,6 @@
               "name": "BrowseFeature",
               "ofType": null
             },
-            {
-              "kind": "OBJECT",
-              "name": "BrowseGene",
-              "ofType": null
-            },
             {
               "kind": "OBJECT",
               "name": "EvidenceItem",
@@ -16767,12 +16234,6 @@
           "inputFields": null,
           "interfaces": null,
           "enumValues": [
-            {
-              "name": "GENE",
-              "description": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
             {
               "name": "FEATURE",
               "description": null,
@@ -17999,108 +17460,6 @@
           "enumValues": null,
           "possibleTypes": null
         },
-        {
-          "kind": "INPUT_OBJECT",
-          "name": "GenesSort",
-          "description": null,
-          "fields": null,
-          "inputFields": [
-            {
-              "name": "column",
-              "description": "Available columns for sorting",
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "ENUM",
-                  "name": "GenesSortColumns",
-                  "ofType": null
-                }
-              },
-              "defaultValue": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "direction",
-              "description": "Sort direction",
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "ENUM",
-                  "name": "SortDirection",
-                  "ofType": null
-                }
-              },
-              "defaultValue": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            }
-          ],
-          "interfaces": null,
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "ENUM",
-          "name": "GenesSortColumns",
-          "description": null,
-          "fields": null,
-          "inputFields": null,
-          "interfaces": null,
-          "enumValues": [
-            {
-              "name": "entrezSymbol",
-              "description": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "therapyName",
-              "description": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "geneAlias",
-              "description": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "diseaseName",
-              "description": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "variantCount",
-              "description": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "evidenceItemCount",
-              "description": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "assertionCount",
-              "description": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "molecularProfileCount",
-              "description": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            }
-          ],
-          "possibleTypes": null
-        },
         {
           "kind": "SCALAR",
           "name": "ID",
@@ -20402,12 +19761,6 @@
           "inputFields": null,
           "interfaces": null,
           "enumValues": [
-            {
-              "name": "GENE",
-              "description": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
             {
               "name": "FEATURE",
               "description": null,
@@ -27772,131 +27125,6 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
-            {
-              "name": "browseGenes",
-              "description": null,
-              "args": [
-                {
-                  "name": "entrezSymbol",
-                  "description": null,
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "String",
-                    "ofType": null
-                  },
-                  "defaultValue": null,
-                  "isDeprecated": false,
-                  "deprecationReason": null
-                },
-                {
-                  "name": "geneAlias",
-                  "description": null,
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "String",
-                    "ofType": null
-                  },
-                  "defaultValue": null,
-                  "isDeprecated": false,
-                  "deprecationReason": null
-                },
-                {
-                  "name": "diseaseName",
-                  "description": null,
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "String",
-                    "ofType": null
-                  },
-                  "defaultValue": null,
-                  "isDeprecated": false,
-                  "deprecationReason": null
-                },
-                {
-                  "name": "therapyName",
-                  "description": null,
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "String",
-                    "ofType": null
-                  },
-                  "defaultValue": null,
-                  "isDeprecated": false,
-                  "deprecationReason": null
-                },
-                {
-                  "name": "sortBy",
-                  "description": null,
-                  "type": {
-                    "kind": "INPUT_OBJECT",
-                    "name": "GenesSort",
-                    "ofType": null
-                  },
-                  "defaultValue": null,
-                  "isDeprecated": false,
-                  "deprecationReason": null
-                },
-                {
-                  "name": "after",
-                  "description": "Returns the elements in the list that come after the specified cursor.",
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "String",
-                    "ofType": null
-                  },
-                  "defaultValue": null,
-                  "isDeprecated": false,
-                  "deprecationReason": null
-                },
-                {
-                  "name": "before",
-                  "description": "Returns the elements in the list that come before the specified cursor.",
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "String",
-                    "ofType": null
-                  },
-                  "defaultValue": null,
-                  "isDeprecated": false,
-                  "deprecationReason": null
-                },
-                {
-                  "name": "first",
-                  "description": "Returns the first _n_ elements from the list.",
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "Int",
-                    "ofType": null
-                  },
-                  "defaultValue": null,
-                  "isDeprecated": false,
-                  "deprecationReason": null
-                },
-                {
-                  "name": "last",
-                  "description": "Returns the last _n_ elements from the list.",
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "Int",
-                    "ofType": null
-                  },
-                  "defaultValue": null,
-                  "isDeprecated": false,
-                  "deprecationReason": null
-                }
-              ],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "OBJECT",
-                  "name": "BrowseGeneConnection",
-                  "ofType": null
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
             {
               "name": "browseMolecularProfiles",
               "description": null,
@@ -32156,18 +31384,6 @@
               "name": "variantGroups",
               "description": "List and filter variant groups.",
               "args": [
-                {
-                  "name": "geneId",
-                  "description": "Gene that variant groups are associated with.",
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "Int",
-                    "ofType": null
-                  },
-                  "defaultValue": null,
-                  "isDeprecated": false,
-                  "deprecationReason": null
-                },
                 {
                   "name": "after",
                   "description": "Returns the elements in the list that come after the specified cursor.",
@@ -32481,18 +31697,6 @@
                   "isDeprecated": false,
                   "deprecationReason": null
                 },
-                {
-                  "name": "geneId",
-                  "description": "Gene that variants are associated with.",
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "Int",
-                    "ofType": null
-                  },
-                  "defaultValue": null,
-                  "isDeprecated": false,
-                  "deprecationReason": null
-                },
                 {
                   "name": "featureId",
                   "description": "Feature that the variants are associated with.",
@@ -37686,12 +36890,6 @@
           "inputFields": null,
           "interfaces": null,
           "enumValues": [
-            {
-              "name": "GENE",
-              "description": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
             {
               "name": "FEATURE",
               "description": null,
@@ -42313,22 +41511,6 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
-            {
-              "name": "gene",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "OBJECT",
-                  "name": "Gene",
-                  "ofType": null
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
             {
               "name": "hgvsDescriptions",
               "description": null,
diff --git a/client/src/app/layout/layout-routing.module.ts b/client/src/app/layout/layout-routing.module.ts
index b906a5f38..e455ba2fe 100644
--- a/client/src/app/layout/layout-routing.module.ts
+++ b/client/src/app/layout/layout-routing.module.ts
@@ -73,14 +73,15 @@ const routes: Routes = [
           breadcrumb: 'Evidence',
         },
       },
-      {
+/*       {
         path: 'genes',
         loadChildren: () =>
           import('@app/views/genes/genes.module').then((m) => m.GenesModule),
         data: {
           breadcrumb: 'Genes',
         },
-      },
+      } ,
+*/
       {
         path: 'features',
         loadChildren: () =>
diff --git a/client/src/app/views/evidence/evidence-home/evidence-home.module.ts b/client/src/app/views/evidence/evidence-home/evidence-home.module.ts
index 7bb027363..b94a9fb5c 100644
--- a/client/src/app/views/evidence/evidence-home/evidence-home.module.ts
+++ b/client/src/app/views/evidence/evidence-home/evidence-home.module.ts
@@ -6,7 +6,6 @@ import { NzPageHeaderModule } from 'ng-zorro-antd/page-header'
 import { NzGridModule } from 'ng-zorro-antd/grid'
 import { NzIconModule } from 'ng-zorro-antd/icon'
 import { CvcEvidenceTableModule } from '@app/components/evidence/evidence-table/evidence-table.module'
-import { CvcGeneTagModule } from '@app/components/genes/gene-tag/gene-tag.module'
 import { LetDirective, PushPipe } from '@ngrx/component'
 import { NzSwitchModule } from 'ng-zorro-antd/switch'
 import { RouterModule } from '@angular/router'
@@ -31,7 +30,6 @@ import { CvcPipesModule } from '@app/core/pipes/pipes.module'
     NzTypographyModule,
     CvcPipesModule,
     CvcSectionNavigationModule,
-    CvcGeneTagModule,
     CvcEvidenceTableModule,
   ],
   exports: [EvidenceHomePage],
diff --git a/client/src/app/views/features/features-detail/features-detail.view.ts b/client/src/app/views/features/features-detail/features-detail.view.ts
index 79b356b29..9875582da 100644
--- a/client/src/app/views/features/features-detail/features-detail.view.ts
+++ b/client/src/app/views/features/features-detail/features-detail.view.ts
@@ -105,7 +105,7 @@ export class FeaturesDetailView implements OnDestroy {
 
       this.subscribable = {
         id: +params.featureId,
-        entityType: SubscribableEntities.Gene,
+        entityType: SubscribableEntities.Feature,
       }
     })
   }
diff --git a/client/src/app/views/features/features-detail/features-summary/features-summary.module.ts b/client/src/app/views/features/features-detail/features-summary/features-summary.module.ts
index 3b17bd822..8774204c9 100644
--- a/client/src/app/views/features/features-detail/features-summary/features-summary.module.ts
+++ b/client/src/app/views/features/features-detail/features-summary/features-summary.module.ts
@@ -17,7 +17,7 @@ import { CvcUserTagModule } from '@app/components/users/user-tag/user-tag.module
 import { NzTagModule } from 'ng-zorro-antd/tag'
 import { NzTabsModule } from 'ng-zorro-antd/tabs'
 import { CvcMolecularProfilesMenuModule } from '@app/components/molecular-profiles/molecular-profiles-menu/molecular-profiles-menu.module'
-import { GenesSummaryModule } from '@app/views/genes/genes-detail/genes-summary/genes-summary.module'
+import { GenesSummaryModule } from '@app/components/genes/genes-summary/genes-summary.module'
 
 @NgModule({
   declarations: [FeaturesSummaryPage],
diff --git a/client/src/app/views/features/features-detail/features-summary/features-summary.query.gql b/client/src/app/views/features/features-detail/features-summary/features-summary.query.gql
index 60ee3e0d5..c126494d0 100644
--- a/client/src/app/views/features/features-detail/features-summary/features-summary.query.gql
+++ b/client/src/app/views/features/features-detail/features-summary/features-summary.query.gql
@@ -11,20 +11,7 @@ fragment FeatureSummaryFields on Feature{
   featureInstance {
     __typename
     ... on Gene {
-      id
-      description
-      featureAliases
-      name
-      sources {
-        id
-        citation
-        link
-        sourceUrl
-        displayType
-        sourceType
-      }
-      entrezId
-      myGeneInfoDetails
+      ... GeneSummaryFields
     }
   }
   # lastSubmittedRevisionEvent {
@@ -44,3 +31,20 @@ fragment FeatureSummaryFields on Feature{
   #   }
   # }
 }
+
+fragment GeneSummaryFields on Gene {
+  id
+  description
+  featureAliases
+  entrezId
+  name
+  sources {
+    id
+    citation
+    link
+    sourceUrl
+    displayType
+    sourceType
+  }
+  myGeneInfoDetails
+}
diff --git a/client/src/app/views/features/features-revise/features-revise.view.html b/client/src/app/views/features/features-revise/features-revise.view.html
index ce54f13e6..a54a828c7 100644
--- a/client/src/app/views/features/features-revise/features-revise.view.html
+++ b/client/src/app/views/features/features-revise/features-revise.view.html
@@ -1,5 +1,5 @@
-<ng-container *ngIf="gene$ | async as gene">
-  <cvc-section-navigation [displayName]="gene.name"> </cvc-section-navigation>
+<ng-container *ngIf="feature$ | async as feature">
+  <cvc-section-navigation [displayName]="feature.name"> </cvc-section-navigation>
 
   <nz-page-header class="site-page-header">
     <!-- title -->
@@ -10,11 +10,11 @@
         nzTheme="twotone"
         [nzTwotoneColor]="'Gene' | entityColor"
         nzType="civic-gene"></i>
-      {{ gene.name }}
+      {{ feature.name }}
     </nz-page-header-title>
 
     <!-- subtitle -->
-    <nz-page-header-subtitle> {{ gene.fullName }} </nz-page-header-subtitle>
+    <nz-page-header-subtitle> {{ feature.fullName }} </nz-page-header-subtitle>
 
     <nz-page-header-content>
       <div class="content">
diff --git a/client/src/app/views/features/features-revise/features-revise.view.ts b/client/src/app/views/features/features-revise/features-revise.view.ts
index fa85c6b4c..daf655e65 100644
--- a/client/src/app/views/features/features-revise/features-revise.view.ts
+++ b/client/src/app/views/features/features-revise/features-revise.view.ts
@@ -2,8 +2,8 @@ import { Component, OnDestroy, OnInit } from '@angular/core'
 import { ActivatedRoute } from '@angular/router'
 import { ViewerService } from '@app/core/services/viewer/viewer.service'
 import {
-  GeneDetailFieldsFragment,
-  GeneDetailGQL,
+  FeatureSummaryFieldsFragment,
+  FeaturesSummaryGQL,
   Maybe,
 } from '@app/generated/civic.apollo'
 import { Observable, Subscription } from 'rxjs'
@@ -17,7 +17,7 @@ import { pluck } from 'rxjs-etc/operators'
 })
 export class FeaturesReviseView implements OnInit, OnDestroy {
   loading$?: Observable<boolean>
-  gene$?: Observable<Maybe<GeneDetailFieldsFragment>>
+  feature$?: Observable<Maybe<FeatureSummaryFieldsFragment>>
   commentsTotal$?: Observable<number>
   revisionsTotal$?: Observable<number>
   flagsTotal$?: Observable<number>
@@ -25,22 +25,22 @@ export class FeaturesReviseView implements OnInit, OnDestroy {
   isSignedIn$?: Observable<boolean>
 
   constructor(
-    private gql: GeneDetailGQL,
+    private gql: FeaturesSummaryGQL,
     private route: ActivatedRoute,
     private viewerService: ViewerService
   ) {
     this.routeSub = this.route.params.subscribe((params) => {
-      let observable = this.gql.watch({ geneId: +params.featureId }).valueChanges
+      let observable = this.gql.watch({ featureId: +params.featureId }).valueChanges
 
       this.loading$ = observable.pipe(pluck('loading'), startWith(true))
 
-      this.gene$ = observable.pipe(pluck('data', 'gene'))
+      this.feature$ = observable.pipe(pluck('data', 'feature'))
 
-      this.commentsTotal$ = this.gene$.pipe(pluck('comments', 'totalCount'))
+      this.commentsTotal$ = this.feature$.pipe(pluck('comments', 'totalCount'))
 
-      this.flagsTotal$ = this.gene$.pipe(pluck('flags', 'totalCount'))
+      this.flagsTotal$ = this.feature$.pipe(pluck('flags', 'totalCount'))
 
-      this.revisionsTotal$ = this.gene$.pipe(pluck('revisions', 'totalCount'))
+      this.revisionsTotal$ = this.feature$.pipe(pluck('revisions', 'totalCount'))
     })
   }
 
diff --git a/client/src/app/views/features/features-revise/features-suggest/features-suggest.page.html b/client/src/app/views/features/features-revise/features-suggest/features-suggest.page.html
index b64191d71..c0d27a926 100644
--- a/client/src/app/views/features/features-revise/features-suggest/features-suggest.page.html
+++ b/client/src/app/views/features/features-revise/features-suggest/features-suggest.page.html
@@ -1,4 +1,4 @@
-<ng-container *ngIf="featureId; else loadingGene">
+<ng-container *ngIf="featureId; else loadingFeature">
   <cvc-gene-revise-form [featureId]="featureId"> </cvc-gene-revise-form>
 </ng-container>
-<ng-template #loadingGene>Loading Feature...</ng-template>
+<ng-template #loadingFeature>Loading Feature...</ng-template>
diff --git a/client/src/app/views/genes/genes-detail/genes-comments/genes-comments.module.ts b/client/src/app/views/genes/genes-detail/genes-comments/genes-comments.module.ts
deleted file mode 100644
index 29d3b9b0d..000000000
--- a/client/src/app/views/genes/genes-detail/genes-comments/genes-comments.module.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { NgModule } from '@angular/core'
-import { CommonModule } from '@angular/common'
-import { GenesCommentsPage } from './genes-comments.page'
-import { CvcCommentListModule } from '@app/components/comments/comment-list/comment-list.module'
-
-@NgModule({
-  declarations: [GenesCommentsPage],
-  imports: [CommonModule, CvcCommentListModule],
-  exports: [GenesCommentsPage],
-})
-export class GenesCommentsModule {}
diff --git a/client/src/app/views/genes/genes-detail/genes-comments/genes-comments.page.html b/client/src/app/views/genes/genes-detail/genes-comments/genes-comments.page.html
deleted file mode 100644
index 548a74c31..000000000
--- a/client/src/app/views/genes/genes-detail/genes-comments/genes-comments.page.html
+++ /dev/null
@@ -1 +0,0 @@
-<cvc-comment-list [commentable]="commentable"></cvc-comment-list>
diff --git a/client/src/app/views/genes/genes-detail/genes-comments/genes-comments.page.less b/client/src/app/views/genes/genes-detail/genes-comments/genes-comments.page.less
deleted file mode 100644
index 5d4e87f30..000000000
--- a/client/src/app/views/genes/genes-detail/genes-comments/genes-comments.page.less
+++ /dev/null
@@ -1,3 +0,0 @@
-:host {
-  display: block;
-}
diff --git a/client/src/app/views/genes/genes-detail/genes-comments/genes-comments.page.ts b/client/src/app/views/genes/genes-detail/genes-comments/genes-comments.page.ts
deleted file mode 100644
index 819450767..000000000
--- a/client/src/app/views/genes/genes-detail/genes-comments/genes-comments.page.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { Component } from '@angular/core'
-import { ActivatedRoute } from '@angular/router'
-import {
-  CommentableEntities,
-  CommentableInput,
-} from '@app/generated/civic.apollo'
-
-@Component({
-  selector: 'cvc-genes-comments',
-  templateUrl: './genes-comments.page.html',
-  styleUrls: ['./genes-comments.page.less'],
-})
-export class GenesCommentsPage {
-  commentable: CommentableInput
-
-  constructor(private route: ActivatedRoute) {
-    const geneId: number = +this.route.snapshot.params['geneId']
-    this.commentable = {
-      id: geneId,
-      entityType: CommentableEntities.Feature,
-    }
-  }
-}
diff --git a/client/src/app/views/genes/genes-detail/genes-detail-routing.module.ts b/client/src/app/views/genes/genes-detail/genes-detail-routing.module.ts
deleted file mode 100644
index 61b69658f..000000000
--- a/client/src/app/views/genes/genes-detail/genes-detail-routing.module.ts
+++ /dev/null
@@ -1,74 +0,0 @@
-import { NgModule } from '@angular/core'
-import { Routes, RouterModule } from '@angular/router'
-import { GenesCommentsModule } from './genes-comments/genes-comments.module'
-import { GenesCommentsPage } from './genes-comments/genes-comments.page'
-import { GenesDetailView } from './genes-detail.view'
-import { GenesEventsModule } from './genes-events/genes-events.module'
-import { GenesEventsPage } from './genes-events/genes-events.page'
-import { GenesFlagsModule } from './genes-flags/genes-flags.module'
-import { GenesFlagsPage } from './genes-flags/genes-flags.page'
-import { GenesRevisionsModule } from './genes-revisions/genes-revisions.module'
-import { GenesRevisionsPage } from './genes-revisions/genes-revisions.page'
-import { GenesSummaryModule } from './genes-summary/genes-summary.module'
-import { GenesSummaryPage } from './genes-summary/genes-summary.page'
-
-const routes: Routes = [
-  {
-    path: '',
-    component: GenesDetailView,
-    // setting 'DISPLAYNAME' here will cause breadcrumb & title generation logic
-    // to use a provided displayName instead of breadcrumb string
-    data: { breadcrumb: 'DISPLAYNAME' },
-    children: [
-      { path: '', redirectTo: 'summary', pathMatch: 'full' },
-      {
-        path: 'summary',
-        component: GenesSummaryPage,
-        data: {
-          breadcrumb: 'Summary',
-        },
-      },
-      {
-        path: 'comments',
-        component: GenesCommentsPage,
-        data: {
-          breadcrumb: 'Comments',
-        },
-      },
-      {
-        path: 'revisions',
-        component: GenesRevisionsPage,
-        data: {
-          breadcrumb: 'Revisions',
-        },
-      },
-      {
-        path: 'flags',
-        component: GenesFlagsPage,
-        data: {
-          breadcrumb: 'Summary',
-        },
-      },
-      {
-        path: 'events',
-        component: GenesEventsPage,
-        data: {
-          breadcrumb: 'Events',
-        },
-      },
-    ],
-  },
-]
-
-@NgModule({
-  imports: [
-    RouterModule.forChild(routes),
-    GenesSummaryModule,
-    GenesCommentsModule,
-    GenesRevisionsModule,
-    GenesFlagsModule,
-    GenesEventsModule,
-  ],
-  exports: [RouterModule],
-})
-export class GenesDetailRoutingModule {}
diff --git a/client/src/app/views/genes/genes-detail/genes-detail.module.ts b/client/src/app/views/genes/genes-detail/genes-detail.module.ts
deleted file mode 100644
index ccfd6734d..000000000
--- a/client/src/app/views/genes/genes-detail/genes-detail.module.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import { CommonModule } from '@angular/common'
-import { NgModule } from '@angular/core'
-import { CvcEventFeedModule } from '@app/components/events/event-feed/event-feed.module'
-import { CvcFlaggableModule } from '@app/components/flags/flaggable/flaggable.module'
-import { CvcContributorAvatarsModule } from '@app/components/shared/contributor-avatars/contributor-avatars.module'
-import { CvcEntitySubscriptionButtonModule } from '@app/components/shared/entity-subscription-button/entity-subscription-button.module'
-import { CvcSectionNavigationModule } from '@app/components/shared/section-navigation/section-navigation.module'
-import { CvcTabNavigationModule } from '@app/components/shared/tab-navigation/tab-navigation.module'
-import { CvcPipesModule } from '@app/core/pipes/pipes.module'
-import { LetDirective, PushPipe } from '@ngrx/component'
-import { NzButtonModule } from 'ng-zorro-antd/button'
-import { NzGridModule } from 'ng-zorro-antd/grid'
-import { NzIconModule } from 'ng-zorro-antd/icon'
-import { NzPageHeaderModule } from 'ng-zorro-antd/page-header'
-import { NzSpaceModule } from 'ng-zorro-antd/space'
-import { NzTypographyModule } from 'ng-zorro-antd/typography'
-import { GenesDetailRoutingModule } from './genes-detail-routing.module'
-import { GenesDetailView } from './genes-detail.view'
-
-@NgModule({
-  declarations: [GenesDetailView],
-  imports: [
-    CommonModule,
-    GenesDetailRoutingModule,
-    LetDirective,
-    PushPipe,
-    NzButtonModule,
-    NzIconModule,
-    NzPageHeaderModule,
-    NzSpaceModule,
-    NzTypographyModule,
-    NzGridModule,
-    CvcPipesModule,
-    CvcTabNavigationModule,
-    CvcFlaggableModule,
-    CvcContributorAvatarsModule,
-    CvcSectionNavigationModule,
-    CvcEntitySubscriptionButtonModule,
-    CvcEventFeedModule,
-  ],
-})
-export class GenesDetailModule {}
diff --git a/client/src/app/views/genes/genes-detail/genes-detail.query.gql b/client/src/app/views/genes/genes-detail/genes-detail.query.gql
deleted file mode 100644
index ce34b8ec8..000000000
--- a/client/src/app/views/genes/genes-detail/genes-detail.query.gql
+++ /dev/null
@@ -1,21 +0,0 @@
-query GeneDetail($geneId: Int!) {
-  gene(id: $geneId) {
-    ...GeneDetailFields
-  }
-}
-
-fragment GeneDetailFields on Gene {
-  id
-  name
-  fullName
-  entrezId
-  flags(state: OPEN) {
-    totalCount
-  }
-  revisions(status: NEW) {
-    totalCount
-  }
-  comments {
-    totalCount
-  }
-}
diff --git a/client/src/app/views/genes/genes-detail/genes-detail.view.html b/client/src/app/views/genes/genes-detail/genes-detail.view.html
deleted file mode 100644
index 527e6d5d9..000000000
--- a/client/src/app/views/genes/genes-detail/genes-detail.view.html
+++ /dev/null
@@ -1,83 +0,0 @@
-<ng-container *ngIf="gene$ | async as gene">
-  <cvc-section-navigation [displayName]="gene.name"> </cvc-section-navigation>
-  <div
-    cvcFlaggable
-    [flags]="flagsTotal$ | ngrxPush">
-    <nz-page-header class="site-page-header">
-      <!-- title -->
-      <nz-page-header-title
-        cvcFlaggableOptions
-        [ngClass]="{ 'flagged': gene.flags.totalCount > 0 }">
-        <i
-          nz-icon
-          nzTheme="twotone"
-          [nzTwotoneColor]="'Gene' | entityColor"
-          nzType="civic-gene"></i>
-        {{ gene.name }}
-      </nz-page-header-title>
-
-      <!-- subtitle -->
-      <nz-page-header-subtitle> {{ gene.fullName }} </nz-page-header-subtitle>
-
-      <!-- header action btns, actions menu -->
-      <nz-page-header-extra *ngrxLet="viewer$ as viewer">
-        <nz-space
-          nzDirection="horizontal"
-          nzSize="small"
-          *ngrxLet="viewer$ as viewer">
-          <!-- add revision btn -->
-          <span *nzSpaceItem>
-            <button
-              [routerLink]="['/genes', gene.id, 'revise']"
-              *ngIf="viewer.signedIn"
-              routerLinkActive
-              #rlaComments="routerLinkActive"
-              [nzType]="rlaComments.isActive ? 'primary' : 'default'"
-              nz-button
-              nzSize="small">
-              Revise
-            </button>
-          </span>
-
-          <!-- add flag btn -->
-          <!-- TODO implement as flag form within popover window -->
-          <span *nzSpaceItem>
-            <button
-              routerLink="flags"
-              *ngIf="viewer.signedIn"
-              routerLinkActive
-              #rlaComments="routerLinkActive"
-              [nzType]="rlaComments.isActive ? 'primary' : 'default'"
-              nz-button
-              nzSize="small">
-              Flag
-            </button>
-          </span>
-
-          <span *nzSpaceItem>
-            <cvc-entity-subscription-button
-              *ngIf="viewer.signedIn && subscribable"
-              [viewer]="viewer"
-              [subscribableId]="subscribable.id"
-              typename="Gene">
-            </cvc-entity-subscription-button>
-          </span>
-        </nz-space>
-      </nz-page-header-extra>
-
-      <nz-page-header-content>
-        <cvc-tab-navigation [tabs]="this.tabs$ | ngrxPush">
-          <ng-template #tabBarExtraContent>
-            <nz-col id="contributors-col">
-              <cvc-contributor-avatars
-                [subscribable]="subscribable"></cvc-contributor-avatars>
-            </nz-col>
-          </ng-template>
-        </cvc-tab-navigation>
-        <div class="content">
-          <router-outlet></router-outlet>
-        </div>
-      </nz-page-header-content>
-    </nz-page-header>
-  </div>
-</ng-container>
diff --git a/client/src/app/views/genes/genes-detail/genes-detail.view.less b/client/src/app/views/genes/genes-detail/genes-detail.view.less
deleted file mode 100644
index 00bda38f0..000000000
--- a/client/src/app/views/genes/genes-detail/genes-detail.view.less
+++ /dev/null
@@ -1 +0,0 @@
-@import "themes/overrides/entity-page-header.overrides.less";
diff --git a/client/src/app/views/genes/genes-detail/genes-detail.view.ts b/client/src/app/views/genes/genes-detail/genes-detail.view.ts
deleted file mode 100644
index 0086b97bb..000000000
--- a/client/src/app/views/genes/genes-detail/genes-detail.view.ts
+++ /dev/null
@@ -1,120 +0,0 @@
-import { Component, OnDestroy } from '@angular/core'
-import { ActivatedRoute } from '@angular/router'
-import { BehaviorSubject, Observable, Subject, Subscription } from 'rxjs'
-import { startWith, takeUntil } from 'rxjs/operators'
-import { pluck } from 'rxjs-etc/operators'
-import {
-  GeneDetailFieldsFragment,
-  GeneDetailGQL,
-  Maybe,
-  SubscribableEntities,
-  SubscribableInput,
-} from '@app/generated/civic.apollo'
-import { Viewer, ViewerService } from '@app/core/services/viewer/viewer.service'
-import { RouteableTab } from '@app/components/shared/tab-navigation/tab-navigation.component'
-
-@Component({
-  selector: 'genes-detail',
-  templateUrl: './genes-detail.view.html',
-  styleUrls: ['./genes-detail.view.less'],
-})
-export class GenesDetailView implements OnDestroy {
-  loading$?: Observable<boolean>
-  gene$?: Observable<Maybe<GeneDetailFieldsFragment>>
-  viewer$: Observable<Viewer>
-  flagsTotal$?: Observable<number>
-  routeSub: Subscription
-  subscribable?: SubscribableInput
-
-  tabs$: BehaviorSubject<RouteableTab[]>
-  destroy$ = new Subject<void>()
-  defaultTabs: RouteableTab[] = [
-    {
-      routeName: 'summary',
-      iconName: 'pic-left',
-      tabLabel: 'Summary',
-    },
-    {
-      routeName: 'comments',
-      iconName: 'civic-comment',
-      tabLabel: 'Comments',
-    },
-    {
-      routeName: 'revisions',
-      iconName: 'civic-revision',
-      tabLabel: 'Revisions',
-    },
-    {
-      routeName: 'flags',
-      iconName: 'civic-flag',
-      tabLabel: 'Flags',
-    },
-    {
-      routeName: 'events',
-      iconName: 'civic-event',
-      tabLabel: 'Events',
-    },
-  ]
-
-  constructor(
-    private gql: GeneDetailGQL,
-    private viewerService: ViewerService,
-    private route: ActivatedRoute
-  ) {
-    this.tabs$ = new BehaviorSubject(this.defaultTabs)
-    this.viewer$ = this.viewerService.viewer$
-
-    this.routeSub = this.route.params.subscribe((params) => {
-      let observable = this.gql.watch({ geneId: +params.geneId }).valueChanges
-
-      this.loading$ = observable.pipe(pluck('loading'), startWith(true))
-
-      this.gene$ = observable.pipe(pluck('data', 'gene'))
-
-      this.flagsTotal$ = this.gene$.pipe(pluck('flags', 'totalCount'))
-
-      this.gene$
-        .pipe(takeUntil(this.destroy$))
-        .subscribe({
-          next: (geneResp) => {
-            this.tabs$.next(
-              this.defaultTabs.map((tab) => {
-                if (tab.tabLabel === 'Revisions') {
-                  return {
-                    badgeCount: geneResp?.revisions.totalCount,
-                    ...tab,
-                  }
-                } else if (tab.tabLabel === 'Comments') {
-                  return {
-                    badgeCount: geneResp?.comments.totalCount,
-                    badgeColor: '#cccccc',
-                    ...tab,
-                  }
-                } else {
-                  return tab
-                }
-              })
-            )
-          },
-        })
-
-      this.subscribable = {
-        id: +params.geneId,
-        entityType: SubscribableEntities.Gene,
-      }
-    })
-  }
-
-  filterCurators = (u: any): boolean => {
-    return u.role == 'curator'
-  }
-  filterEditors = (u: any): boolean => {
-    return u.role == 'editor' || u.role == 'admin'
-  }
-
-  ngOnDestroy() {
-    this.routeSub.unsubscribe()
-    this.destroy$.next()
-    this.destroy$.unsubscribe()
-  }
-}
diff --git a/client/src/app/views/genes/genes-detail/genes-events/genes-events.module.ts b/client/src/app/views/genes/genes-detail/genes-events/genes-events.module.ts
deleted file mode 100644
index 86c3e980a..000000000
--- a/client/src/app/views/genes/genes-detail/genes-events/genes-events.module.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { NgModule } from '@angular/core'
-import { CommonModule } from '@angular/common'
-import { GenesEventsPage } from './genes-events.page'
-import { CvcEventFeedModule } from '@app/components/events/event-feed/event-feed.module'
-
-@NgModule({
-  declarations: [GenesEventsPage],
-  imports: [CommonModule, CvcEventFeedModule],
-  exports: [GenesEventsPage],
-})
-export class GenesEventsModule {}
diff --git a/client/src/app/views/genes/genes-detail/genes-events/genes-events.page.html b/client/src/app/views/genes/genes-detail/genes-events/genes-events.page.html
deleted file mode 100644
index 19dec6769..000000000
--- a/client/src/app/views/genes/genes-detail/genes-events/genes-events.page.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<cvc-event-feed
-  [subscribable]="subscribable"
-  tagDisplay="hideSubject"></cvc-event-feed>
diff --git a/client/src/app/views/genes/genes-detail/genes-events/genes-events.page.less b/client/src/app/views/genes/genes-detail/genes-events/genes-events.page.less
deleted file mode 100644
index 5d4e87f30..000000000
--- a/client/src/app/views/genes/genes-detail/genes-events/genes-events.page.less
+++ /dev/null
@@ -1,3 +0,0 @@
-:host {
-  display: block;
-}
diff --git a/client/src/app/views/genes/genes-detail/genes-events/genes-events.page.ts b/client/src/app/views/genes/genes-detail/genes-events/genes-events.page.ts
deleted file mode 100644
index 20d34237e..000000000
--- a/client/src/app/views/genes/genes-detail/genes-events/genes-events.page.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { Component } from '@angular/core'
-import { ActivatedRoute } from '@angular/router'
-import {
-  SubscribableEntities,
-  SubscribableInput,
-} from '@app/generated/civic.apollo'
-
-@Component({
-  selector: 'cvc-genes-events',
-  templateUrl: './genes-events.page.html',
-  styleUrls: ['./genes-events.page.less'],
-})
-export class GenesEventsPage {
-  subscribable: SubscribableInput
-
-  constructor(private route: ActivatedRoute) {
-    const geneId: number = +this.route.snapshot.params['geneId']
-    this.subscribable = {
-      id: geneId,
-      entityType: SubscribableEntities.Gene,
-    }
-  }
-}
diff --git a/client/src/app/views/genes/genes-detail/genes-flags/genes-flags.module.ts b/client/src/app/views/genes/genes-detail/genes-flags/genes-flags.module.ts
deleted file mode 100644
index ca1e3e3d1..000000000
--- a/client/src/app/views/genes/genes-detail/genes-flags/genes-flags.module.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { NgModule } from '@angular/core'
-import { CommonModule } from '@angular/common'
-import { GenesFlagsPage } from './genes-flags.page'
-import { NzGridModule } from 'ng-zorro-antd/grid'
-import { NzCardModule } from 'ng-zorro-antd/card'
-import { NzSpaceModule } from 'ng-zorro-antd/space'
-import { NzSkeletonModule } from 'ng-zorro-antd/skeleton'
-import { CvcFlagListAndFilterModule } from '@app/components/flags/flag-list-and-filter/flag-list-and-filter.module'
-
-@NgModule({
-  declarations: [GenesFlagsPage],
-  imports: [
-    CommonModule,
-    NzGridModule,
-    NzCardModule,
-    NzSpaceModule,
-    NzSkeletonModule,
-    CvcFlagListAndFilterModule,
-  ],
-})
-export class GenesFlagsModule {}
diff --git a/client/src/app/views/genes/genes-detail/genes-flags/genes-flags.page.html b/client/src/app/views/genes/genes-detail/genes-flags/genes-flags.page.html
deleted file mode 100644
index 5df531d27..000000000
--- a/client/src/app/views/genes/genes-detail/genes-flags/genes-flags.page.html
+++ /dev/null
@@ -1 +0,0 @@
-<cvc-flag-list-and-filter [flaggable]="flaggable"></cvc-flag-list-and-filter>
diff --git a/client/src/app/views/genes/genes-detail/genes-flags/genes-flags.page.less b/client/src/app/views/genes/genes-detail/genes-flags/genes-flags.page.less
deleted file mode 100644
index 5d4e87f30..000000000
--- a/client/src/app/views/genes/genes-detail/genes-flags/genes-flags.page.less
+++ /dev/null
@@ -1,3 +0,0 @@
-:host {
-  display: block;
-}
diff --git a/client/src/app/views/genes/genes-detail/genes-flags/genes-flags.page.ts b/client/src/app/views/genes/genes-detail/genes-flags/genes-flags.page.ts
deleted file mode 100644
index fa86011fa..000000000
--- a/client/src/app/views/genes/genes-detail/genes-flags/genes-flags.page.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { Component, OnInit } from '@angular/core'
-import { ActivatedRoute } from '@angular/router'
-import { FlaggableEntities, FlaggableInput } from '@app/generated/civic.apollo'
-
-@Component({
-  selector: 'cvc-genes-flags',
-  templateUrl: './genes-flags.page.html',
-  styleUrls: ['./genes-flags.page.less'],
-})
-export class GenesFlagsPage implements OnInit {
-  flaggable: FlaggableInput
-
-  constructor(private route: ActivatedRoute) {
-    const geneId: number = +this.route.snapshot.params['geneId']
-
-    this.flaggable = {
-      entityType: FlaggableEntities.Gene,
-      id: geneId,
-    }
-  }
-
-  ngOnInit(): void {}
-}
diff --git a/client/src/app/views/genes/genes-detail/genes-revisions/genes-revisions.module.ts b/client/src/app/views/genes/genes-detail/genes-revisions/genes-revisions.module.ts
deleted file mode 100644
index b6466564f..000000000
--- a/client/src/app/views/genes/genes-detail/genes-revisions/genes-revisions.module.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { NgModule } from '@angular/core'
-import { CommonModule } from '@angular/common'
-import { LetDirective, PushPipe } from '@ngrx/component'
-import { NzGridModule } from 'ng-zorro-antd/grid'
-import { NzListModule } from 'ng-zorro-antd/list'
-import { NzCardModule } from 'ng-zorro-antd/card'
-import { NzSpaceModule } from 'ng-zorro-antd/space'
-import { NzTagModule } from 'ng-zorro-antd/tag'
-import { NzTypographyModule } from 'ng-zorro-antd/typography'
-
-import { GenesRevisionsPage } from './genes-revisions.page'
-import { CvcParticipantListModule } from '@app/components/shared/participant-list/participant-list.module'
-import { NzAvatarModule } from 'ng-zorro-antd/avatar'
-import { RevisionListModule } from '@app/components/revisions/revision-list/revision-list.module'
-import { CvcRevisionsListAndFilterModule } from '@app/components/revisions/revisions-list-and-filter/revisions-list-and-filter.module'
-
-@NgModule({
-  declarations: [GenesRevisionsPage],
-  imports: [
-    CommonModule,
-    LetDirective,
-    PushPipe,
-    NzGridModule,
-    NzListModule,
-    NzCardModule,
-    NzSpaceModule,
-    NzTagModule,
-    NzTypographyModule,
-    NzAvatarModule,
-    CvcParticipantListModule,
-    RevisionListModule,
-    CvcRevisionsListAndFilterModule,
-  ],
-})
-export class GenesRevisionsModule {}
diff --git a/client/src/app/views/genes/genes-detail/genes-revisions/genes-revisions.page.html b/client/src/app/views/genes/genes-detail/genes-revisions/genes-revisions.page.html
deleted file mode 100644
index 1452354c2..000000000
--- a/client/src/app/views/genes/genes-detail/genes-revisions/genes-revisions.page.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<cvc-revisions-list-and-filter
-  [id]="this.geneId"
-  [entityType]="this.entityType"></cvc-revisions-list-and-filter>
diff --git a/client/src/app/views/genes/genes-detail/genes-revisions/genes-revisions.page.less b/client/src/app/views/genes/genes-detail/genes-revisions/genes-revisions.page.less
deleted file mode 100644
index 5d4e87f30..000000000
--- a/client/src/app/views/genes/genes-detail/genes-revisions/genes-revisions.page.less
+++ /dev/null
@@ -1,3 +0,0 @@
-:host {
-  display: block;
-}
diff --git a/client/src/app/views/genes/genes-detail/genes-revisions/genes-revisions.page.ts b/client/src/app/views/genes/genes-detail/genes-revisions/genes-revisions.page.ts
deleted file mode 100644
index 6e0dfa512..000000000
--- a/client/src/app/views/genes/genes-detail/genes-revisions/genes-revisions.page.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { Component, OnDestroy } from '@angular/core'
-import { ActivatedRoute } from '@angular/router'
-import { ModeratedEntities } from '@app/generated/civic.apollo'
-import { Subscription } from 'rxjs'
-
-@Component({
-  selector: 'cvc-genes-revisions',
-  templateUrl: './genes-revisions.page.html',
-  styleUrls: ['./genes-revisions.page.less'],
-})
-export class GenesRevisionsPage implements OnDestroy {
-  geneId!: number
-  entityType!: ModeratedEntities
-
-  routeSub: Subscription
-
-  constructor(private route: ActivatedRoute) {
-    this.routeSub = this.route.params.subscribe((params) => {
-      this.geneId = +params.geneId
-      this.entityType = ModeratedEntities['Gene']
-    })
-  }
-
-  ngOnDestroy() {
-    this.routeSub.unsubscribe()
-  }
-}
diff --git a/client/src/app/views/genes/genes-detail/genes-summary/genes-summary.query.gql b/client/src/app/views/genes/genes-detail/genes-summary/genes-summary.query.gql
deleted file mode 100644
index e0f2a25dc..000000000
--- a/client/src/app/views/genes/genes-detail/genes-summary/genes-summary.query.gql
+++ /dev/null
@@ -1,22 +0,0 @@
-query GenesSummary($geneId: Int!) {
-  gene(id: $geneId) {
-    ...GeneSummaryFields
-  }
-}
-
-fragment GeneSummaryFields on Gene {
-  description
-  entrezId
-  featureAliases
-  id
-  name
-  sources {
-    id
-    citation
-    link
-    sourceUrl
-    displayType
-    sourceType
-  }
-  myGeneInfoDetails
-}
diff --git a/client/src/app/views/genes/genes-home/genes-home.component.ts b/client/src/app/views/genes/genes-home/genes-home.component.ts
deleted file mode 100644
index b0fa46691..000000000
--- a/client/src/app/views/genes/genes-home/genes-home.component.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Component, OnInit } from '@angular/core'
-
-@Component({
-  selector: 'cvc-genes-home',
-  templateUrl: './genes-home.page.html',
-  styleUrls: ['./genes-home.page.less'],
-})
-export class GenesHomePage implements OnInit {
-  constructor() {}
-
-  ngOnInit(): void {}
-}
diff --git a/client/src/app/views/genes/genes-home/genes-home.module.ts b/client/src/app/views/genes/genes-home/genes-home.module.ts
deleted file mode 100644
index f607a5c3a..000000000
--- a/client/src/app/views/genes/genes-home/genes-home.module.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { CommonModule } from '@angular/common'
-import { NgModule } from '@angular/core'
-import { CvcGenesTableModule } from '@app/components/genes/genes-table/genes-table.module'
-import { CvcSectionNavigationModule } from '@app/components/shared/section-navigation/section-navigation.module'
-import { CvcPipesModule } from '@app/core/pipes/pipes.module'
-import { NzButtonModule } from 'ng-zorro-antd/button'
-import { NzGridModule } from 'ng-zorro-antd/grid'
-import { NzIconModule } from 'ng-zorro-antd/icon'
-import { NzPageHeaderModule } from 'ng-zorro-antd/page-header'
-import { NzSpaceModule } from 'ng-zorro-antd/space'
-import { NzTypographyModule } from 'ng-zorro-antd/typography'
-import { GenesHomePage } from './genes-home.page'
-
-@NgModule({
-  declarations: [GenesHomePage],
-  imports: [
-    CommonModule,
-    NzButtonModule,
-    NzIconModule,
-    NzSpaceModule,
-    NzTypographyModule,
-    NzPageHeaderModule,
-    NzGridModule,
-    CvcPipesModule,
-    CvcSectionNavigationModule,
-    CvcGenesTableModule,
-  ],
-  exports: [GenesHomePage],
-})
-export class GenesHomeModule {}
diff --git a/client/src/app/views/genes/genes-home/genes-home.page.html b/client/src/app/views/genes/genes-home/genes-home.page.html
deleted file mode 100644
index 41a2d27ea..000000000
--- a/client/src/app/views/genes/genes-home/genes-home.page.html
+++ /dev/null
@@ -1,72 +0,0 @@
-<cvc-section-navigation> </cvc-section-navigation>
-<nz-page-header class="site-page-header">
-  <!--content-->
-  <nz-page-header-content>
-    <!-- title, description, docs links -->
-    <nz-row class="header-content">
-      <nz-col
-        nzFlex="64px"
-        class="header-icon">
-        <i
-          nz-icon
-          nzTheme="twotone"
-          [nzTwotoneColor]="'Gene' | entityColor"
-          nzType="civic-gene"></i>
-      </nz-col>
-      <nz-col
-        nzFlex="0 1 600px"
-        class="header-description">
-        <h2>Genes</h2>
-        <p
-          nz-typography
-          nzEllipsis
-          nzExpandable
-          [nzEllipsisRows]="2">
-          CIViC Genes include a gene-level summary, a link to the Drug Gene
-          Interation Database, and extensive gene details from MyGene.info.
-        </p>
-      </nz-col>
-      <nz-col
-        nzFlex="auto"
-        class="header-links">
-        <nz-space
-          nzDirection="vertical"
-          class="docs-buttons">
-          <a
-            nz-button
-            href="https://civic.readthedocs.io/en/latest/model/genes.html"
-            target="_blank"
-            nzSize="small"
-            nzBlock
-            *nzSpaceItem>
-            <i
-              nz-icon
-              nzType="link"
-              nzTheme="outline"></i>
-            View Gene Model Docs
-          </a>
-          <a
-            nz-button
-            href="https://civic.readthedocs.io/en/latest/curating/genes.html"
-            target="_blank"
-            nzSize="small"
-            nzBlock
-            *nzSpaceItem>
-            <i
-              nz-icon
-              nzType="link"
-              nzTheme="outline"></i>
-            View Gene Curation Docs
-          </a>
-        </nz-space>
-      </nz-col>
-    </nz-row>
-    <nz-row>
-      <nz-col [nzSpan]="24">
-        <div class="content">
-          <cvc-genes-table cvcTitle="Browse All Genes"></cvc-genes-table>
-        </div>
-      </nz-col>
-    </nz-row>
-  </nz-page-header-content>
-</nz-page-header>
diff --git a/client/src/app/views/genes/genes-home/genes-home.page.less b/client/src/app/views/genes/genes-home/genes-home.page.less
deleted file mode 100644
index 00bda38f0..000000000
--- a/client/src/app/views/genes/genes-home/genes-home.page.less
+++ /dev/null
@@ -1 +0,0 @@
-@import "themes/overrides/entity-page-header.overrides.less";
diff --git a/client/src/app/views/genes/genes-home/genes-home.page.ts b/client/src/app/views/genes/genes-home/genes-home.page.ts
deleted file mode 100644
index b0fa46691..000000000
--- a/client/src/app/views/genes/genes-home/genes-home.page.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Component, OnInit } from '@angular/core'
-
-@Component({
-  selector: 'cvc-genes-home',
-  templateUrl: './genes-home.page.html',
-  styleUrls: ['./genes-home.page.less'],
-})
-export class GenesHomePage implements OnInit {
-  constructor() {}
-
-  ngOnInit(): void {}
-}
diff --git a/client/src/app/views/genes/genes-revise/genes-revise-routing.module.ts b/client/src/app/views/genes/genes-revise/genes-revise-routing.module.ts
deleted file mode 100644
index 2ef7a9198..000000000
--- a/client/src/app/views/genes/genes-revise/genes-revise-routing.module.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { NgModule } from '@angular/core'
-import { Routes, RouterModule } from '@angular/router'
-import { GenesReviseView } from './genes-revise.view'
-import { GenesSuggestModule } from './genes-suggest/genes-suggest.module'
-import { GenesSuggestPage } from './genes-suggest/genes-suggest.page'
-
-const routes: Routes = [
-  {
-    path: '',
-    component: GenesReviseView,
-    data: { breadcrumb: 'Revise' },
-    children: [
-      { path: '', redirectTo: 'suggest', pathMatch: 'full' },
-      {
-        path: 'suggest',
-        component: GenesSuggestPage,
-        data: {
-          breadcrumb: 'Suggest Revision',
-        },
-      },
-    ],
-  },
-]
-
-@NgModule({
-  imports: [RouterModule.forChild(routes), GenesSuggestModule],
-})
-export class GenesReviseRoutingModule {}
diff --git a/client/src/app/views/genes/genes-revise/genes-revise.module.ts b/client/src/app/views/genes/genes-revise/genes-revise.module.ts
deleted file mode 100644
index 572af0b73..000000000
--- a/client/src/app/views/genes/genes-revise/genes-revise.module.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { CommonModule } from '@angular/common'
-import { NgModule } from '@angular/core'
-import { RouterModule } from '@angular/router'
-import { CvcLoginPromptModule } from '@app/components/shared/login-prompt/login-prompt.module'
-import { CvcSectionNavigationModule } from '@app/components/shared/section-navigation/section-navigation.module'
-import { CvcPipesModule } from '@app/core/pipes/pipes.module'
-import { LetDirective, PushPipe } from '@ngrx/component'
-import { NzGridModule } from 'ng-zorro-antd/grid'
-import { NzIconModule } from 'ng-zorro-antd/icon'
-import { NzPageHeaderModule } from 'ng-zorro-antd/page-header'
-import { GenesReviseRoutingModule } from './genes-revise-routing.module'
-import { GenesReviseView } from './genes-revise.view'
-
-@NgModule({
-  declarations: [GenesReviseView],
-  imports: [
-    CommonModule,
-    RouterModule,
-    LetDirective,
-    PushPipe,
-    GenesReviseRoutingModule,
-
-    NzPageHeaderModule,
-    NzIconModule,
-    NzGridModule,
-
-    CvcLoginPromptModule,
-    CvcSectionNavigationModule,
-    CvcPipesModule,
-  ],
-})
-export class GenesReviseModule {}
diff --git a/client/src/app/views/genes/genes-revise/genes-revise.view.html b/client/src/app/views/genes/genes-revise/genes-revise.view.html
deleted file mode 100644
index ce54f13e6..000000000
--- a/client/src/app/views/genes/genes-revise/genes-revise.view.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<ng-container *ngIf="gene$ | async as gene">
-  <cvc-section-navigation [displayName]="gene.name"> </cvc-section-navigation>
-
-  <nz-page-header class="site-page-header">
-    <!-- title -->
-    <nz-page-header-title cvcFlaggableOptions>
-      REVISE
-      <i
-        nz-icon
-        nzTheme="twotone"
-        [nzTwotoneColor]="'Gene' | entityColor"
-        nzType="civic-gene"></i>
-      {{ gene.name }}
-    </nz-page-header-title>
-
-    <!-- subtitle -->
-    <nz-page-header-subtitle> {{ gene.fullName }} </nz-page-header-subtitle>
-
-    <nz-page-header-content>
-      <div class="content">
-        <div *ngIf="isSignedIn$ | ngrxPush as isSignedIn; else notSignedIn">
-          <router-outlet></router-outlet>
-        </div>
-        <ng-template #notSignedIn>
-          <nz-row
-            nzSpan="24"
-            nzJustify="center">
-            <div
-              nz-col
-              nzSpan="6">
-              <cvc-login-prompt></cvc-login-prompt>
-            </div>
-          </nz-row>
-        </ng-template>
-      </div>
-    </nz-page-header-content>
-  </nz-page-header>
-</ng-container>
diff --git a/client/src/app/views/genes/genes-revise/genes-revise.view.less b/client/src/app/views/genes/genes-revise/genes-revise.view.less
deleted file mode 100644
index 00bda38f0..000000000
--- a/client/src/app/views/genes/genes-revise/genes-revise.view.less
+++ /dev/null
@@ -1 +0,0 @@
-@import "themes/overrides/entity-page-header.overrides.less";
diff --git a/client/src/app/views/genes/genes-revise/genes-revise.view.ts b/client/src/app/views/genes/genes-revise/genes-revise.view.ts
deleted file mode 100644
index a11ff85ab..000000000
--- a/client/src/app/views/genes/genes-revise/genes-revise.view.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import { Component, OnDestroy, OnInit } from '@angular/core'
-import { ActivatedRoute } from '@angular/router'
-import { ViewerService } from '@app/core/services/viewer/viewer.service'
-import {
-  GeneDetailFieldsFragment,
-  GeneDetailGQL,
-  Maybe,
-} from '@app/generated/civic.apollo'
-import { Observable, Subscription } from 'rxjs'
-import { map, startWith } from 'rxjs/operators'
-import { pluck } from 'rxjs-etc/operators'
-
-@Component({
-  selector: 'genes-revise',
-  templateUrl: './genes-revise.view.html',
-  styleUrls: ['./genes-revise.view.less'],
-})
-export class GenesReviseView implements OnInit, OnDestroy {
-  loading$?: Observable<boolean>
-  gene$?: Observable<Maybe<GeneDetailFieldsFragment>>
-  commentsTotal$?: Observable<number>
-  revisionsTotal$?: Observable<number>
-  flagsTotal$?: Observable<number>
-  routeSub: Subscription
-  isSignedIn$?: Observable<boolean>
-
-  constructor(
-    private gql: GeneDetailGQL,
-    private route: ActivatedRoute,
-    private viewerService: ViewerService
-  ) {
-    this.routeSub = this.route.params.subscribe((params) => {
-      let observable = this.gql.watch({ geneId: +params.geneId }).valueChanges
-
-      this.loading$ = observable.pipe(pluck('loading'), startWith(true))
-
-      this.gene$ = observable.pipe(pluck('data', 'gene'))
-
-      this.commentsTotal$ = this.gene$.pipe(pluck('comments', 'totalCount'))
-
-      this.flagsTotal$ = this.gene$.pipe(pluck('flags', 'totalCount'))
-
-      this.revisionsTotal$ = this.gene$.pipe(pluck('revisions', 'totalCount'))
-    })
-  }
-
-  ngOnInit(): void {
-    this.isSignedIn$ = this.viewerService.viewer$.pipe(map((v) => v.signedIn))
-  }
-
-  ngOnDestroy(): void {
-    this.routeSub.unsubscribe()
-  }
-}
diff --git a/client/src/app/views/genes/genes-revise/genes-suggest/genes-suggest.module.ts b/client/src/app/views/genes/genes-revise/genes-suggest/genes-suggest.module.ts
deleted file mode 100644
index ffb1ab4d7..000000000
--- a/client/src/app/views/genes/genes-revise/genes-suggest/genes-suggest.module.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { NgModule } from '@angular/core'
-import { CommonModule } from '@angular/common'
-import { GenesSuggestPage } from './genes-suggest.page'
-import { NzGridModule } from 'ng-zorro-antd/grid'
-import { NzSpaceModule } from 'ng-zorro-antd/space'
-import { NzSkeletonModule } from 'ng-zorro-antd/skeleton'
-import { NzCardModule } from 'ng-zorro-antd/card'
-import { LetDirective, PushPipe } from '@ngrx/component'
-import { NzPageHeaderModule } from 'ng-zorro-antd/page-header'
-import { CvcSectionNavigationModule } from '@app/components/shared/section-navigation/section-navigation.module'
-import { CvcGeneReviseFormModule } from '@app/forms/config/gene-revise/gene-revise.form.module'
-
-@NgModule({
-  declarations: [GenesSuggestPage],
-  imports: [
-    CommonModule,
-    LetDirective,
-    PushPipe,
-    NzCardModule,
-    NzGridModule,
-    NzSpaceModule,
-    NzSkeletonModule,
-    NzPageHeaderModule,
-    CvcGeneReviseFormModule,
-    CvcSectionNavigationModule,
-  ],
-})
-export class GenesSuggestModule {}
diff --git a/client/src/app/views/genes/genes-revise/genes-suggest/genes-suggest.page.html b/client/src/app/views/genes/genes-revise/genes-suggest/genes-suggest.page.html
deleted file mode 100644
index d544ebd92..000000000
--- a/client/src/app/views/genes/genes-revise/genes-suggest/genes-suggest.page.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<ng-container *ngIf="geneId; else loadingGene">
-</ng-container>
-<ng-template #loadingGene>Loading Gene...</ng-template>
diff --git a/client/src/app/views/genes/genes-revise/genes-suggest/genes-suggest.page.less b/client/src/app/views/genes/genes-revise/genes-suggest/genes-suggest.page.less
deleted file mode 100644
index 00bda38f0..000000000
--- a/client/src/app/views/genes/genes-revise/genes-suggest/genes-suggest.page.less
+++ /dev/null
@@ -1 +0,0 @@
-@import "themes/overrides/entity-page-header.overrides.less";
diff --git a/client/src/app/views/genes/genes-revise/genes-suggest/genes-suggest.page.ts b/client/src/app/views/genes/genes-revise/genes-suggest/genes-suggest.page.ts
deleted file mode 100644
index 0bae454af..000000000
--- a/client/src/app/views/genes/genes-revise/genes-suggest/genes-suggest.page.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { Component, OnDestroy } from '@angular/core'
-import { ActivatedRoute } from '@angular/router'
-import { Subscription } from 'rxjs'
-
-@Component({
-  selector: 'cvc-genes-suggest',
-  templateUrl: './genes-suggest.page.html',
-  styleUrls: ['./genes-suggest.page.less'],
-})
-export class GenesSuggestPage implements OnDestroy {
-  geneId?: number
-  routeParams$: Subscription
-
-  constructor(private route: ActivatedRoute) {
-    this.routeParams$ = this.route.params.subscribe((params) => {
-      this.geneId = +params.geneId
-    })
-  }
-
-  ngOnDestroy(): void {
-    this.routeParams$.unsubscribe()
-  }
-}
diff --git a/client/src/app/views/genes/genes-routing.module.ts b/client/src/app/views/genes/genes-routing.module.ts
deleted file mode 100644
index ac06663a5..000000000
--- a/client/src/app/views/genes/genes-routing.module.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import { NgModule } from '@angular/core'
-import { Routes, RouterModule } from '@angular/router'
-import { GenesView } from './genes.view'
-import { GenesHomeModule } from './genes-home/genes-home.module'
-import { GenesHomePage } from './genes-home/genes-home.page'
-
-const routes: Routes = [
-  {
-    path: '',
-    component: GenesView,
-    children: [
-      { path: '', redirectTo: 'home', pathMatch: 'full' },
-      {
-        path: 'home',
-        component: GenesHomePage,
-        data: {
-          breadcrumb: 'Home',
-        },
-      },
-      {
-        path: ':geneId',
-        data: { breadcrumb: 'DISPLAYNAME' },
-        children: [
-          {
-            path: '',
-            loadChildren: () =>
-              import('@app/views/genes/genes-detail/genes-detail.module').then(
-                (m) => m.GenesDetailModule
-              ),
-          },
-          {
-            path: 'revise',
-            loadChildren: () =>
-              import('@app/views/genes/genes-revise/genes-revise.module').then(
-                (m) => m.GenesReviseModule
-              ),
-            data: { breadcrumb: 'Revise' },
-          },
-        ],
-      },
-    ],
-  },
-]
-
-@NgModule({
-  imports: [RouterModule.forChild(routes), GenesHomeModule],
-  exports: [RouterModule],
-})
-export class GenesRoutingModule {}
diff --git a/client/src/app/views/genes/genes.module.ts b/client/src/app/views/genes/genes.module.ts
deleted file mode 100644
index d3b4bd7e6..000000000
--- a/client/src/app/views/genes/genes.module.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-// framework imports
-import { CommonModule } from '@angular/common'
-import { NgModule } from '@angular/core'
-import { GenesRoutingModule } from './genes-routing.module'
-import { GenesView } from './genes.view'
-
-@NgModule({
-  declarations: [GenesView],
-  imports: [CommonModule, GenesRoutingModule],
-})
-export class GenesModule {}
diff --git a/client/src/app/views/genes/genes.view.html b/client/src/app/views/genes/genes.view.html
deleted file mode 100644
index 0680b43f9..000000000
--- a/client/src/app/views/genes/genes.view.html
+++ /dev/null
@@ -1 +0,0 @@
-<router-outlet></router-outlet>
diff --git a/client/src/app/views/genes/genes.view.ts b/client/src/app/views/genes/genes.view.ts
deleted file mode 100644
index 9ef11d4b4..000000000
--- a/client/src/app/views/genes/genes.view.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { Component } from '@angular/core'
-
-@Component({
-  selector: 'app-genes',
-  templateUrl: './genes.view.html',
-})
-export class GenesView {
-  constructor() {}
-}
diff --git a/client/src/app/views/molecular-profiles/molecular-profiles-detail/molecular-profiles-detail.module.ts b/client/src/app/views/molecular-profiles/molecular-profiles-detail/molecular-profiles-detail.module.ts
index 9437c6001..39deca4e1 100644
--- a/client/src/app/views/molecular-profiles/molecular-profiles-detail/molecular-profiles-detail.module.ts
+++ b/client/src/app/views/molecular-profiles/molecular-profiles-detail/molecular-profiles-detail.module.ts
@@ -4,7 +4,6 @@ import { CvcSectionNavigationModule } from '@app/components/shared/section-navig
 import { LetDirective, PushPipe } from '@ngrx/component'
 import { NzSpaceModule } from 'ng-zorro-antd/space'
 import { CvcFlaggableModule } from '@app/components/flags/flaggable/flaggable.module'
-import { CvcGeneTagModule } from '@app/components/genes/gene-tag/gene-tag.module'
 import { NzPageHeaderModule } from 'ng-zorro-antd/page-header'
 import { NzButtonModule } from 'ng-zorro-antd/button'
 import { NzIconModule } from 'ng-zorro-antd/icon'
@@ -39,7 +38,6 @@ import { NzPopoverModule } from 'ng-zorro-antd/popover'
     CvcContributorAvatarsModule,
     CvcTabNavigationModule,
     CvcFlaggableModule,
-    CvcGeneTagModule,
     CvcSectionNavigationModule,
     CvcEntitySubscriptionButtonModule,
     CvcVariantTagModule,
diff --git a/client/src/app/views/molecular-profiles/molecular-profiles-detail/molecular-profiles-summary/molecular-profiles-summary.module.ts b/client/src/app/views/molecular-profiles/molecular-profiles-detail/molecular-profiles-summary/molecular-profiles-summary.module.ts
index bd30bc916..04062197a 100644
--- a/client/src/app/views/molecular-profiles/molecular-profiles-detail/molecular-profiles-summary/molecular-profiles-summary.module.ts
+++ b/client/src/app/views/molecular-profiles/molecular-profiles-detail/molecular-profiles-summary/molecular-profiles-summary.module.ts
@@ -17,7 +17,6 @@ import { CvcPipesModule } from '@app/core/pipes/pipes.module'
 import { NzIconModule } from 'ng-zorro-antd/icon'
 import { CvcUserTagModule } from '@app/components/users/user-tag/user-tag.module'
 import { NzTagModule } from 'ng-zorro-antd/tag'
-import { CvcGeneTagModule } from '@app/components/genes/gene-tag/gene-tag.module'
 import { MolecularProfilesSummaryPage } from './molecular-profiles-summary.page'
 import { CvcMolecularProfileTagNameModule } from '@app/components/molecular-profiles/molecular-profile-tag-name/molecular-profile-tag-name.module'
 import { CvcMolecularProfileVariantCardModule } from '@app/components/molecular-profiles/molecular-profile-variant-card/molecular-profile-variant-card.module'
@@ -43,7 +42,6 @@ import { CvcEmptyValueModule } from '@app/forms/components/empty-value/empty-val
     CvcTagListModule,
     CvcUserTagModule,
     CvcSourceTagModule,
-    CvcGeneTagModule,
     CvcVariantTypeTagModule,
     CvcLinkTagModule,
     CvcEmptyRevisableModule,
diff --git a/client/src/app/views/molecular-profiles/molecular-profiles-home/molecular-profiles-home.module.ts b/client/src/app/views/molecular-profiles/molecular-profiles-home/molecular-profiles-home.module.ts
index ab3c09cfe..676c4080f 100644
--- a/client/src/app/views/molecular-profiles/molecular-profiles-home/molecular-profiles-home.module.ts
+++ b/client/src/app/views/molecular-profiles/molecular-profiles-home/molecular-profiles-home.module.ts
@@ -5,7 +5,6 @@ import { CvcSectionNavigationModule } from '@app/components/shared/section-navig
 import { NzPageHeaderModule } from 'ng-zorro-antd/page-header'
 import { NzGridModule } from 'ng-zorro-antd/grid'
 import { NzIconModule } from 'ng-zorro-antd/icon'
-import { CvcGeneTagModule } from '@app/components/genes/gene-tag/gene-tag.module'
 import { NzTypographyModule } from 'ng-zorro-antd/typography'
 import { NzButtonModule } from 'ng-zorro-antd/button'
 import { NzSpaceModule } from 'ng-zorro-antd/space'
@@ -33,7 +32,6 @@ import { CvcPipesModule } from '@app/core/pipes/pipes.module'
     NzPopoverModule,
     CvcPipesModule,
     CvcSectionNavigationModule,
-    CvcGeneTagModule,
     CvcMolecularProfilesTableModule,
     CvcAutoHeightDivModule,
     CvcSectionNavigationModule,
diff --git a/client/src/app/views/variants/variants-home/variants-home.module.ts b/client/src/app/views/variants/variants-home/variants-home.module.ts
index 444876e85..75f07fa10 100644
--- a/client/src/app/views/variants/variants-home/variants-home.module.ts
+++ b/client/src/app/views/variants/variants-home/variants-home.module.ts
@@ -6,7 +6,6 @@ import { NzPageHeaderModule } from 'ng-zorro-antd/page-header'
 import { NzGridModule } from 'ng-zorro-antd/grid'
 import { NzIconModule } from 'ng-zorro-antd/icon'
 import { CvcVariantsTableModule } from '@app/components/variants/variants-table/variants-table.module'
-import { CvcGeneTagModule } from '@app/components/genes/gene-tag/gene-tag.module'
 import { NzTypographyModule } from 'ng-zorro-antd/typography'
 import { NzButtonModule } from 'ng-zorro-antd/button'
 import { NzSpaceModule } from 'ng-zorro-antd/space'
@@ -33,7 +32,6 @@ import { CvcPipesModule } from '@app/core/pipes/pipes.module'
     NzPopoverModule,
     CvcPipesModule,
     CvcSectionNavigationModule,
-    CvcGeneTagModule,
     CvcVariantsTableModule,
     CvcAutoHeightDivModule,
     CvcSectionNavigationModule,
diff --git a/server/app/graphql/resolvers/browse_genes.rb b/server/app/graphql/resolvers/browse_genes.rb
deleted file mode 100644
index bdd5d016d..000000000
--- a/server/app/graphql/resolvers/browse_genes.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-require 'search_object'
-require 'search_object/plugin/graphql'
-
-class Resolvers::BrowseGenes < GraphQL::Schema::Resolver
-  # include SearchObject for GraphQL
-  include SearchObject.module(:graphql)
-
-  type Types::BrowseTables::BrowseGeneType.connection_type, null: false
-
-  scope { MaterializedViews::GeneBrowseTableRow.all }
-
-  option(:entrez_symbol, type: String) { |scope, value| scope.where("name ILIKE ?", "#{value}%") }
-  option(:gene_alias, type: String)    { |scope, value| scope.where(array_query_for_column('alias_names'), "#{value}%") }
-  option(:disease_name, type: String)  { |scope, value| scope.where(json_name_query_for_column('diseases'), "%#{value}%") }
-  option(:therapy_name, type: String)     { |scope, value| scope.where(json_name_query_for_column('therapies'), "%#{value}%") }
-
-  option :sort_by, type: Types::BrowseTables::GenesSortType do |scope, value|
-    case value.column
-    when "entrezSymbol"
-      scope.order "gene_browse_table_rows.name #{value.direction}"
-    when "therapyName"
-      scope.order "drug_names #{value.direction}"
-    when "geneAlias"
-      scope.order "alias_names #{value.direction}"
-    when "diseaseName"
-      scope.order "disease_names #{value.direction}"
-    when "variantCount"
-      scope.order "variant_count #{value.direction}"
-    when "evidenceItemCount"
-      scope.order "evidence_item_count #{value.direction}"
-    when "assertionCount"
-      scope.order "assertion_count #{value.direction}"
-    when "molecularProfileCount"
-      scope.order "molecular_profile_count #{value.direction}"
-    end
-  end
-
-  private
-  def array_query_for_column(col)
-    raise 'Must supply a column name' if col.nil?
-    "EXISTS (SELECT * FROM (SELECT unnest(#{col})) x(name) where name ILIKE ?)"
-  end
-
-  def json_name_query_for_column(col)
-    raise 'Must supply a column name' if col.nil?
-    "gene_browse_table_rows.id IN (select gb.id FROM gene_browse_table_rows gb, json_array_elements(gb.#{col}) d where d->>'name' ILIKE ?)"
-  end
-end
diff --git a/server/app/graphql/resolvers/top_level_variant_groups.rb b/server/app/graphql/resolvers/top_level_variant_groups.rb
index 915a1cf6b..a6c0d230f 100644
--- a/server/app/graphql/resolvers/top_level_variant_groups.rb
+++ b/server/app/graphql/resolvers/top_level_variant_groups.rb
@@ -8,9 +8,4 @@ class Resolvers::TopLevelVariantGroups < GraphQL::Schema::Resolver
   description 'List and filter variant groups.'
 
   scope { VariantGroup.order('variant_groups.name ASC').distinct }
-
-  option(:gene_id, type: GraphQL::Types::Int, description: 'Gene that variant groups are associated with.') do |scope, value|
-    scope.where(gene_id: value)
-  end
-
 end
diff --git a/server/app/graphql/resolvers/top_level_variants.rb b/server/app/graphql/resolvers/top_level_variants.rb
index d08c63f07..4ee52c2e9 100644
--- a/server/app/graphql/resolvers/top_level_variants.rb
+++ b/server/app/graphql/resolvers/top_level_variants.rb
@@ -14,10 +14,6 @@ class Resolvers::TopLevelVariants < GraphQL::Schema::Resolver
       .where('variants.name ILIKE :query OR variant_aliases.name ILIKE :query', { query: "%#{value}%" })
   end
 
-  option(:gene_id, type: GraphQL::Types::Int, description: 'Gene that variants are associated with.') do |scope, value|
-    scope.where(gene_id: value)
-  end
-
   option(:feature_id, type: GraphQL::Types::Int, description: 'Feature that the variants are associated with.') do |scope, value|
     scope.where(feature_id: value)
   end
diff --git a/server/app/graphql/types/browse_tables/browse_gene_type.rb b/server/app/graphql/types/browse_tables/browse_gene_type.rb
deleted file mode 100644
index 9f66e9e9a..000000000
--- a/server/app/graphql/types/browse_tables/browse_gene_type.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-module Types::BrowseTables
-  class BrowseGeneType < Types::BaseObject
-    implements Types::Interfaces::Flaggable
-    connection_type_class(Types::Connections::BrowseTableConnection)
-
-    field :id, Int, null: false
-    field :entrez_id, Int, null: false
-    field :name, String, null: false
-    field :link, String, null: false
-    field :description, String, null: false
-    field :gene_aliases, [String], null: true
-    field :diseases, [Types::Entities::DiseaseType], null: true
-    field :therapies, [Types::Entities::TherapyType], null: true
-    field :variant_count, Int, null: false
-    field :evidence_item_count, Int, null: false
-    field :assertion_count, Int, null: false
-    field :molecular_profile_count, Int, null: false
-
-    def link
-      Rails.application.routes.url_helpers.url_for("/genes/#{object.id}")
-    end
-
-    def gene_aliases
-      object.alias_names.compact
-    end
-
-    def diseases
-      Array(object.diseases)
-        .sort_by { |d| -d['total'] }
-        .map { |d| { name: d['name'], id: d['id'], link: "/diseases/#{d['id']}" } }
-    end
-
-    def therapies
-      Array(object.therapies)
-        .sort_by { |d| -d['total'] }
-        .map { |d| { name: d['name'], id: d['id'], link: "/therapies/#{d['id']}"  } }
-    end
-  end
-end
diff --git a/server/app/graphql/types/browse_tables/genes_sort_columns.rb b/server/app/graphql/types/browse_tables/genes_sort_columns.rb
deleted file mode 100644
index d91b95444..000000000
--- a/server/app/graphql/types/browse_tables/genes_sort_columns.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-module Types::BrowseTables
-  class GenesSortColumns < Types::BaseEnum
-    value "entrezSymbol"
-    value "therapyName"
-    value "geneAlias"
-    value "diseaseName"
-    value "variantCount"
-    value "evidenceItemCount"
-    value "assertionCount"
-    value "molecularProfileCount"
-  end
-end
diff --git a/server/app/graphql/types/browse_tables/genes_sort_type.rb b/server/app/graphql/types/browse_tables/genes_sort_type.rb
deleted file mode 100644
index ee49ad760..000000000
--- a/server/app/graphql/types/browse_tables/genes_sort_type.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-module Types::BrowseTables
-  class GenesSortType < Types::BaseInputObject
-    argument :column, Types::BrowseTables::GenesSortColumns, "Available columns for sorting", required: true
-    argument :direction, Types::SortDirection, "Sort direction", required: true
-  end
-end
diff --git a/server/app/graphql/types/commentable/taggable_entity_input_type.rb b/server/app/graphql/types/commentable/taggable_entity_input_type.rb
index d882d07f1..7fbeef756 100644
--- a/server/app/graphql/types/commentable/taggable_entity_input_type.rb
+++ b/server/app/graphql/types/commentable/taggable_entity_input_type.rb
@@ -9,8 +9,8 @@ class TaggableEntityInputType < Types::BaseInputObject
 
     def prepare
       const = case entity_type
-      when 'GENE'
-        Gene
+      when 'FEATURE'
+        Feature
       when 'VARIANT'
         Variant
       when 'EVIDENCE_ITEM'
diff --git a/server/app/graphql/types/entities/feature_type.rb b/server/app/graphql/types/entities/feature_type.rb
index 6cbc9cf9c..eccf2fe2b 100644
--- a/server/app/graphql/types/entities/feature_type.rb
+++ b/server/app/graphql/types/entities/feature_type.rb
@@ -53,16 +53,5 @@ def link
     def feature_instance
       object.feature_instance
     end
-
-    #definition_methods do
-    #  def resolve_type(object, context)
-    #    case object
-    #    when Features::Gene
-    #      Types::Entities::GeneType
-    #    else
-    #      raise "Unexpected Feature type #{object.class}"
-    #    end
-    #  end
-    #end
   end
 end
diff --git a/server/app/graphql/types/entities/variant_type.rb b/server/app/graphql/types/entities/variant_type.rb
index 495382cbb..ab2b22e95 100644
--- a/server/app/graphql/types/entities/variant_type.rb
+++ b/server/app/graphql/types/entities/variant_type.rb
@@ -11,7 +11,6 @@ class VariantType < Types::BaseObject
 
     field :id, Int, null: false
     field :name, String, null: false
-    field :gene, "Types::Entities::GeneType", null: false
     field :feature, Types::Entities::FeatureType, null: false
     field :reference_build, Types::ReferenceBuildType, null: true
     field :ensembl_version, Int, null: true
@@ -36,10 +35,6 @@ class VariantType < Types::BaseObject
     field :molecular_profiles, Types::Entities::MolecularProfileType.connection_type, null: false
     field :open_cravat_url, String, null: true
 
-    def gene
-      Loaders::RecordLoader.for(Features::Gene).load(object.gene_id)
-    end
-
     def feature
       Loaders::AssociationLoader.for(Variant, :feature).load(object)
     end
diff --git a/server/app/graphql/types/flaggable/flaggable_entities_type.rb b/server/app/graphql/types/flaggable/flaggable_entities_type.rb
index e7ef7cb1b..b7e550ffa 100644
--- a/server/app/graphql/types/flaggable/flaggable_entities_type.rb
+++ b/server/app/graphql/types/flaggable/flaggable_entities_type.rb
@@ -1,7 +1,6 @@
 module Types::Flaggable
   class FlaggableEntitiesType < Types::BaseEnum
     description 'Enumeration of all entities in CIViC that can be flagged.'
-    value 'GENE'
     value 'FEATURE'
     value 'VARIANT'
     value 'EVIDENCE_ITEM'
diff --git a/server/app/graphql/types/flaggable/flaggable_input.rb b/server/app/graphql/types/flaggable/flaggable_input.rb
index f06ab6934..67404bdd2 100644
--- a/server/app/graphql/types/flaggable/flaggable_input.rb
+++ b/server/app/graphql/types/flaggable/flaggable_input.rb
@@ -11,8 +11,6 @@ class FlaggableInput < Types::BaseInputObject
 
     def prepare
       const = case entity_type
-      when 'GENE'
-        Features::Gene
       when 'FEATURE'
         Feature
       when 'VARIANT'
diff --git a/server/app/graphql/types/interfaces/commentable.rb b/server/app/graphql/types/interfaces/commentable.rb
index 57cbb72de..d6cc365de 100644
--- a/server/app/graphql/types/interfaces/commentable.rb
+++ b/server/app/graphql/types/interfaces/commentable.rb
@@ -19,8 +19,6 @@ def resolve_type(object, context)
           Types::Entities::EvidenceItemType
         when Flag
           Types::Entities::FlagType
-        when Features::Gene
-          Types::Entities::GeneType
         when Revision
           Types::Revisions::RevisionType
         when Source
diff --git a/server/app/graphql/types/interfaces/event_subject.rb b/server/app/graphql/types/interfaces/event_subject.rb
index 731946cbb..7af62074a 100644
--- a/server/app/graphql/types/interfaces/event_subject.rb
+++ b/server/app/graphql/types/interfaces/event_subject.rb
@@ -13,8 +13,6 @@ module EventSubject
     definition_methods do
       def resolve_type(object, context)
         case object
-        when Features::Gene
-          Types::Entities::GeneType
         when Feature
           Types::Entities::FeatureType
         when Variant
diff --git a/server/app/graphql/types/interfaces/flaggable.rb b/server/app/graphql/types/interfaces/flaggable.rb
index 41a918a8a..fa370cd29 100644
--- a/server/app/graphql/types/interfaces/flaggable.rb
+++ b/server/app/graphql/types/interfaces/flaggable.rb
@@ -14,8 +14,6 @@ module Flaggable
     definition_methods do
       def resolve_type(object, context)
         case object
-        when Features::Gene
-          Types::Entities::GeneType
         when Feature
           Types::Entities::FeatureType
         when Variant
diff --git a/server/app/graphql/types/query_type.rb b/server/app/graphql/types/query_type.rb
index 0c4b22175..ac533f081 100644
--- a/server/app/graphql/types/query_type.rb
+++ b/server/app/graphql/types/query_type.rb
@@ -14,7 +14,6 @@ class QueryType < Types::BaseObject
 
     # Add root-level fields here.
     # They will be entry points for queries on your schema.
-    field :browseGenes, resolver: Resolvers::BrowseGenes
     field :browseFeatures, resolver: Resolvers::BrowseFeatures
     field :browseVariants, resolver: Resolvers::BrowseVariants
     field :browseSources, resolver: Resolvers::BrowseSources
diff --git a/server/app/graphql/types/revisions/moderated_entities_type.rb b/server/app/graphql/types/revisions/moderated_entities_type.rb
index 4fbc6f473..353178a0c 100644
--- a/server/app/graphql/types/revisions/moderated_entities_type.rb
+++ b/server/app/graphql/types/revisions/moderated_entities_type.rb
@@ -1,7 +1,6 @@
 module Types::Revisions
   class ModeratedEntitiesType < Types::BaseEnum
     description 'Enumeration of all moderated CIViC entities.'
-    value 'GENE', value: 'Gene'
     value 'FEATURE', value: 'Feature'
     value 'VARIANT', value: 'Variant'
     value 'EVIDENCE_ITEM', value: 'EvidenceItem'
diff --git a/server/app/graphql/types/subscribable/subscribable_entities_type.rb b/server/app/graphql/types/subscribable/subscribable_entities_type.rb
index cca32811b..a0817c819 100644
--- a/server/app/graphql/types/subscribable/subscribable_entities_type.rb
+++ b/server/app/graphql/types/subscribable/subscribable_entities_type.rb
@@ -1,7 +1,6 @@
 module Types::Subscribable
   class SubscribableEntitiesType < Types::BaseEnum
     description 'Enumeration of all subscribable CIViC entities.'
-    value 'GENE', value: 'Features::Gene'
     value 'FEATURE', value: 'Feature'
     value 'VARIANT', value: 'Variant'
     value 'EVIDENCE_ITEM', value: 'EvidenceItem'

From 0684e7052a24ff3a25a25b21f6c4179a58888658 Mon Sep 17 00:00:00 2001
From: Adam Coffman <acoffman@wustl.edu>
Date: Wed, 27 Dec 2023 14:01:14 -0600
Subject: [PATCH 031/125] rename gene icon to feature, rebuild icon metadata

---
 .../src/app/generated/civic.docs-aliases.rst  | 12 ++--
 .../src/app/generated/civic.icons.data.json   | 36 +++++------
 client/src/app/generated/civic.icons.ts       | 60 +++++++++----------
 ...ne-fullcolor.svg => feature-fullcolor.svg} |  0
 .../{gene-outline.svg => feature-outline.svg} |  0
 .../{gene-twotone.svg => feature-twotone.svg} |  0
 6 files changed, 54 insertions(+), 54 deletions(-)
 rename client/src/assets/icons/fullcolor/{gene-fullcolor.svg => feature-fullcolor.svg} (100%)
 rename client/src/assets/icons/outline/{gene-outline.svg => feature-outline.svg} (100%)
 rename client/src/assets/icons/twotone/{gene-twotone.svg => feature-twotone.svg} (100%)

diff --git a/client/src/app/generated/civic.docs-aliases.rst b/client/src/app/generated/civic.docs-aliases.rst
index eb2594792..6ddbcace8 100644
--- a/client/src/app/generated/civic.docs-aliases.rst
+++ b/client/src/app/generated/civic.docs-aliases.rst
@@ -255,11 +255,11 @@
    :class: 'cvc-icon'
 
 
-.. |fullcolor-flag| image:: /images/icons/fullcolor/flag-fullcolor.svg
+.. |fullcolor-feature| image:: /images/icons/fullcolor/feature-fullcolor.svg
    :class: 'cvc-icon'
 
 
-.. |fullcolor-gene| image:: /images/icons/fullcolor/gene-fullcolor.svg
+.. |fullcolor-flag| image:: /images/icons/fullcolor/flag-fullcolor.svg
    :class: 'cvc-icon'
 
 
@@ -351,11 +351,11 @@
    :class: 'cvc-icon'
 
 
-.. |outline-flag| image:: /images/icons/outline/flag-outline.svg
+.. |outline-feature| image:: /images/icons/outline/feature-outline.svg
    :class: 'cvc-icon'
 
 
-.. |outline-gene| image:: /images/icons/outline/gene-outline.svg
+.. |outline-flag| image:: /images/icons/outline/flag-outline.svg
    :class: 'cvc-icon'
 
 
@@ -447,11 +447,11 @@
    :class: 'cvc-icon'
 
 
-.. |twotone-flag| image:: /images/icons/twotone/flag-twotone.svg
+.. |twotone-feature| image:: /images/icons/twotone/feature-twotone.svg
    :class: 'cvc-icon'
 
 
-.. |twotone-gene| image:: /images/icons/twotone/gene-twotone.svg
+.. |twotone-flag| image:: /images/icons/twotone/flag-twotone.svg
    :class: 'cvc-icon'
 
 
diff --git a/client/src/app/generated/civic.icons.data.json b/client/src/app/generated/civic.icons.data.json
index 59f0eeb33..7f66b11e0 100644
--- a/client/src/app/generated/civic.icons.data.json
+++ b/client/src/app/generated/civic.icons.data.json
@@ -380,15 +380,15 @@
     },
     {
       "type": "fullcolor",
-      "filepath": "fullcolor/flag-fullcolor.svg",
-      "name": "flag",
-      "alias": "fullcolor-flag"
+      "filepath": "fullcolor/feature-fullcolor.svg",
+      "name": "feature",
+      "alias": "fullcolor-feature"
     },
     {
       "type": "fullcolor",
-      "filepath": "fullcolor/gene-fullcolor.svg",
-      "name": "gene",
-      "alias": "fullcolor-gene"
+      "filepath": "fullcolor/flag-fullcolor.svg",
+      "name": "flag",
+      "alias": "fullcolor-flag"
     },
     {
       "type": "fullcolor",
@@ -524,15 +524,15 @@
     },
     {
       "type": "outline",
-      "filepath": "outline/flag-outline.svg",
-      "name": "flag",
-      "alias": "outline-flag"
+      "filepath": "outline/feature-outline.svg",
+      "name": "feature",
+      "alias": "outline-feature"
     },
     {
       "type": "outline",
-      "filepath": "outline/gene-outline.svg",
-      "name": "gene",
-      "alias": "outline-gene"
+      "filepath": "outline/flag-outline.svg",
+      "name": "flag",
+      "alias": "outline-flag"
     },
     {
       "type": "outline",
@@ -668,15 +668,15 @@
     },
     {
       "type": "twotone",
-      "filepath": "twotone/flag-twotone.svg",
-      "name": "flag",
-      "alias": "twotone-flag"
+      "filepath": "twotone/feature-twotone.svg",
+      "name": "feature",
+      "alias": "twotone-feature"
     },
     {
       "type": "twotone",
-      "filepath": "twotone/gene-twotone.svg",
-      "name": "gene",
-      "alias": "twotone-gene"
+      "filepath": "twotone/flag-twotone.svg",
+      "name": "flag",
+      "alias": "twotone-flag"
     },
     {
       "type": "twotone",
diff --git a/client/src/app/generated/civic.icons.ts b/client/src/app/generated/civic.icons.ts
index d4ecaa4de..95fbec1f3 100644
--- a/client/src/app/generated/civic.icons.ts
+++ b/client/src/app/generated/civic.icons.ts
@@ -440,6 +440,13 @@ export const civicEvidenceitemFullcolor: {
   name: 'evidenceitemFullcolor',
   data: `<svg viewBox="0 0 1024 1024"><circle fill="#FEEEE1" cx="512" cy="512" r="448"/><path fill="#F68F37" d="M195.2 195.2c-175 175-175 458.6 0 633.6s458.6 175 633.6 0 175-458.6 0-633.6-458.6-174.9-633.6 0zM476 137.7V476H137.7c17-179 159.4-321.3 338.3-338.3zM137.7 548H476v338.3c-179-17-321.3-159.4-338.3-338.3zM548 886.3V548h338.3c-17 179-159.4 321.3-338.3 338.3zM886.3 476H548V137.7c179 17 321.3 159.4 338.3 338.3z"/></svg>`
 };
+export const civicFeatureFullcolor: {
+  name: 'featureFullcolor';
+  data: string;
+} = {
+  name: 'featureFullcolor',
+  data: `<svg viewBox="0 0 1024 1024"><circle fill="#E6F7FD" cx="512" cy="512" r="448"/><path fill="#07AFF0" d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zM246.1 246.1C473.6 18.6 857 165.3 886.3 476H137.7c8-84.6 44.8-166.3 108.4-229.9z"/></svg>`
+};
 export const civicFlagFullcolor: {
   name: 'flagFullcolor';
   data: string;
@@ -447,13 +454,6 @@ export const civicFlagFullcolor: {
   name: 'flagFullcolor',
   data: `<svg viewBox="0 0 1024 1024"><circle fill="#FBE3E6" cx="512" cy="512" r="448"/><path fill="#E24759" d="M774.9 553.6c7.4 6.2 4.9 18.2-4.5 20.8L433.6 666c-6.4 1.7-13-2-14.7-8.4L341.2 372c-1.7-6.4 2-13 8.4-14.7C709 259.5 690.9 261 698.4 269c3 3.3 4 8 2.5 12.2-58.6 162.9-61 159.8-51.8 167.5l125.8 104.9zM960 512c0 247.4-200.6 448-448 448S64 759.4 64 512 264.6 64 512 64s448 200.6 448 448zm-72 0c0-207.7-168.3-376-376-376S136 304.3 136 512c0 157.7 96.9 292.6 234.5 348.5L241.6 386.6c-5.2-19.2 6.1-39 25.3-44.2 19.2-5.2 39 6.1 44.2 25.3l140.2 515.5c19.8 3.2 40.1 4.9 60.8 4.9C719.7 888 888 719.7 888 512z"/></svg>`
 };
-export const civicGeneFullcolor: {
-  name: 'geneFullcolor';
-  data: string;
-} = {
-  name: 'geneFullcolor',
-  data: `<svg viewBox="0 0 1024 1024"><circle fill="#E6F7FD" cx="512" cy="512" r="448"/><path fill="#07AFF0" d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zM246.1 246.1C473.6 18.6 857 165.3 886.3 476H137.7c8-84.6 44.8-166.3 108.4-229.9z"/></svg>`
-};
 export const civicMolecularprofileFullcolor: {
   name: 'molecularprofileFullcolor';
   data: string;
@@ -615,6 +615,13 @@ export const civicEvidenceitemOutline: {
   name: 'evidenceitemOutline',
   data: `<svg viewBox="0 0 1024 1024"><path d="M195.2 195.2c-175 175-175 458.6 0 633.6s458.6 175 633.6 0 175-458.6 0-633.6-458.6-174.9-633.6 0zM476 137.7V476H137.7c17-179 159.4-321.3 338.3-338.3zM137.7 548H476v338.3c-179-17-321.3-159.4-338.3-338.3zM548 886.3V548h338.3c-17 179-159.4 321.3-338.3 338.3zM886.3 476H548V137.7c179 17 321.3 159.4 338.3 338.3z"/></svg>`
 };
+export const civicFeatureOutline: {
+  name: 'featureOutline';
+  data: string;
+} = {
+  name: 'featureOutline',
+  data: `<svg viewBox="0 0 1024 1024"><path d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zM246.1 246.1C473.6 18.6 857 165.3 886.3 476H137.7c8-84.6 44.8-166.3 108.4-229.9z"/></svg>`
+};
 export const civicFlagOutline: {
   name: 'flagOutline';
   data: string;
@@ -622,13 +629,6 @@ export const civicFlagOutline: {
   name: 'flagOutline',
   data: `<svg viewBox="0 0 1024 1024"><path d="M774.9 553.6c7.4 6.2 4.9 18.2-4.5 20.8L433.6 666c-6.4 1.7-13-2-14.7-8.4L341.2 372c-1.7-6.4 2-13 8.4-14.7C709 259.5 690.9 261 698.4 269c3 3.3 4 8 2.5 12.2-58.6 162.9-61 159.8-51.8 167.5l125.8 104.9zM960 512c0 247.4-200.6 448-448 448S64 759.4 64 512 264.6 64 512 64s448 200.6 448 448zm-72 0c0-207.7-168.3-376-376-376S136 304.3 136 512c0 157.7 96.9 292.6 234.5 348.5L241.6 386.6c-5.2-19.2 6.1-39 25.3-44.2 19.2-5.2 39 6.1 44.2 25.3l140.2 515.5c19.8 3.2 40.1 4.9 60.8 4.9C719.7 888 888 719.7 888 512z"/></svg>`
 };
-export const civicGeneOutline: {
-  name: 'geneOutline';
-  data: string;
-} = {
-  name: 'geneOutline',
-  data: `<svg viewBox="0 0 1024 1024"><path d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zM246.1 246.1C473.6 18.6 857 165.3 886.3 476H137.7c8-84.6 44.8-166.3 108.4-229.9z"/></svg>`
-};
 export const civicMolecularprofileOutline: {
   name: 'molecularprofileOutline';
   data: string;
@@ -783,6 +783,13 @@ export const civicEvidenceitemTwotone: {
   name: 'evidenceitemTwotone',
   data: `<svg viewBox="0 0 1024 1024"><circle fill="#E6E6E6" cx="512" cy="512" r="448"/><path fill="#333" d="M195.2 195.2c-175 175-175 458.6 0 633.6s458.6 175 633.6 0 175-458.6 0-633.6-458.6-174.9-633.6 0zM476 137.7V476H137.7c17-179 159.4-321.3 338.3-338.3zM137.7 548H476v338.3c-179-17-321.3-159.4-338.3-338.3zM548 886.3V548h338.3c-17 179-159.4 321.3-338.3 338.3zM886.3 476H548V137.7c179 17 321.3 159.4 338.3 338.3z"/></svg>`
 };
+export const civicFeatureTwotone: {
+  name: 'featureTwotone';
+  data: string;
+} = {
+  name: 'featureTwotone',
+  data: `<svg viewBox="0 0 1024 1024"><circle fill="#E6E6E6" cx="512" cy="512" r="448"/><path fill="#333" d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zM246.1 246.1C473.6 18.6 857 165.3 886.3 476H137.7c8-84.6 44.8-166.3 108.4-229.9z"/></svg>`
+};
 export const civicFlagTwotone: {
   name: 'flagTwotone';
   data: string;
@@ -790,13 +797,6 @@ export const civicFlagTwotone: {
   name: 'flagTwotone',
   data: `<svg viewBox="0 0 1024 1024"><circle fill="#E6E6E6" cx="512" cy="512" r="448"/><path fill="#333" d="M774.9 553.6c7.4 6.2 4.9 18.2-4.5 20.8L433.6 666c-6.4 1.7-13-2-14.7-8.4L341.2 372c-1.7-6.4 2-13 8.4-14.7C709 259.5 690.9 261 698.4 269c3 3.3 4 8 2.5 12.2-58.6 162.9-61 159.8-51.8 167.5l125.8 104.9zM960 512c0 247.4-200.6 448-448 448S64 759.4 64 512 264.6 64 512 64s448 200.6 448 448zm-72 0c0-207.7-168.3-376-376-376S136 304.3 136 512c0 157.7 96.9 292.6 234.5 348.5L241.6 386.6c-5.2-19.2 6.1-39 25.3-44.2 19.2-5.2 39 6.1 44.2 25.3l140.2 515.5c19.8 3.2 40.1 4.9 60.8 4.9C719.7 888 888 719.7 888 512z"/></svg>`
 };
-export const civicGeneTwotone: {
-  name: 'geneTwotone';
-  data: string;
-} = {
-  name: 'geneTwotone',
-  data: `<svg viewBox="0 0 1024 1024"><circle fill="#E6E6E6" cx="512" cy="512" r="448"/><path fill="#333" d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zM246.1 246.1C473.6 18.6 857 165.3 886.3 476H137.7c8-84.6 44.8-166.3 108.4-229.9z"/></svg>`
-};
 export const civicMolecularprofileTwotone: {
   name: 'molecularprofileTwotone';
   data: string;
@@ -938,8 +938,8 @@ export type CivicIcon =
   | 'eventFullcolor'
   | 'evidenceFullcolor'
   | 'evidenceitemFullcolor'
+  | 'featureFullcolor'
   | 'flagFullcolor'
-  | 'geneFullcolor'
   | 'molecularprofileFullcolor'
   | 'organizationFullcolor'
   | 'phenotypeFullcolor'
@@ -963,8 +963,8 @@ export type CivicIcon =
   | 'eventOutline'
   | 'evidenceOutline'
   | 'evidenceitemOutline'
+  | 'featureOutline'
   | 'flagOutline'
-  | 'geneOutline'
   | 'molecularprofileOutline'
   | 'organizationOutline'
   | 'phenotypeOutline'
@@ -987,8 +987,8 @@ export type CivicIcon =
   | 'eventTwotone'
   | 'evidenceTwotone'
   | 'evidenceitemTwotone'
+  | 'featureTwotone'
   | 'flagTwotone'
-  | 'geneTwotone'
   | 'molecularprofileTwotone'
   | 'organizationTwotone'
   | 'phenotypeTwotone'
@@ -1064,8 +1064,8 @@ export const CivicIcon = {
   eventFullcolor: 'eventFullcolor' as CivicIcon,
   evidenceFullcolor: 'evidenceFullcolor' as CivicIcon,
   evidenceitemFullcolor: 'evidenceitemFullcolor' as CivicIcon,
+  featureFullcolor: 'featureFullcolor' as CivicIcon,
   flagFullcolor: 'flagFullcolor' as CivicIcon,
-  geneFullcolor: 'geneFullcolor' as CivicIcon,
   molecularprofileFullcolor: 'molecularprofileFullcolor' as CivicIcon,
   organizationFullcolor: 'organizationFullcolor' as CivicIcon,
   phenotypeFullcolor: 'phenotypeFullcolor' as CivicIcon,
@@ -1089,8 +1089,8 @@ export const CivicIcon = {
   eventOutline: 'eventOutline' as CivicIcon,
   evidenceOutline: 'evidenceOutline' as CivicIcon,
   evidenceitemOutline: 'evidenceitemOutline' as CivicIcon,
+  featureOutline: 'featureOutline' as CivicIcon,
   flagOutline: 'flagOutline' as CivicIcon,
-  geneOutline: 'geneOutline' as CivicIcon,
   molecularprofileOutline: 'molecularprofileOutline' as CivicIcon,
   organizationOutline: 'organizationOutline' as CivicIcon,
   phenotypeOutline: 'phenotypeOutline' as CivicIcon,
@@ -1113,8 +1113,8 @@ export const CivicIcon = {
   eventTwotone: 'eventTwotone' as CivicIcon,
   evidenceTwotone: 'evidenceTwotone' as CivicIcon,
   evidenceitemTwotone: 'evidenceitemTwotone' as CivicIcon,
+  featureTwotone: 'featureTwotone' as CivicIcon,
   flagTwotone: 'flagTwotone' as CivicIcon,
-  geneTwotone: 'geneTwotone' as CivicIcon,
   molecularprofileTwotone: 'molecularprofileTwotone' as CivicIcon,
   organizationTwotone: 'organizationTwotone' as CivicIcon,
   phenotypeTwotone: 'phenotypeTwotone' as CivicIcon,
@@ -1198,8 +1198,8 @@ export const completeIconSet = [
   civicEventFullcolor,
   civicEvidenceFullcolor,
   civicEvidenceitemFullcolor,
+  civicFeatureFullcolor,
   civicFlagFullcolor,
-  civicGeneFullcolor,
   civicMolecularprofileFullcolor,
   civicOrganizationFullcolor,
   civicPhenotypeFullcolor,
@@ -1223,8 +1223,8 @@ export const completeIconSet = [
   civicEventOutline,
   civicEvidenceOutline,
   civicEvidenceitemOutline,
+  civicFeatureOutline,
   civicFlagOutline,
-  civicGeneOutline,
   civicMolecularprofileOutline,
   civicOrganizationOutline,
   civicPhenotypeOutline,
@@ -1247,8 +1247,8 @@ export const completeIconSet = [
   civicEventTwotone,
   civicEvidenceTwotone,
   civicEvidenceitemTwotone,
+  civicFeatureTwotone,
   civicFlagTwotone,
-  civicGeneTwotone,
   civicMolecularprofileTwotone,
   civicOrganizationTwotone,
   civicPhenotypeTwotone,
diff --git a/client/src/assets/icons/fullcolor/gene-fullcolor.svg b/client/src/assets/icons/fullcolor/feature-fullcolor.svg
similarity index 100%
rename from client/src/assets/icons/fullcolor/gene-fullcolor.svg
rename to client/src/assets/icons/fullcolor/feature-fullcolor.svg
diff --git a/client/src/assets/icons/outline/gene-outline.svg b/client/src/assets/icons/outline/feature-outline.svg
similarity index 100%
rename from client/src/assets/icons/outline/gene-outline.svg
rename to client/src/assets/icons/outline/feature-outline.svg
diff --git a/client/src/assets/icons/twotone/gene-twotone.svg b/client/src/assets/icons/twotone/feature-twotone.svg
similarity index 100%
rename from client/src/assets/icons/twotone/gene-twotone.svg
rename to client/src/assets/icons/twotone/feature-twotone.svg

From bfb196852f8187f72f3d0f849cb2c68bc79cf4e0 Mon Sep 17 00:00:00 2001
From: Adam Coffman <acoffman@wustl.edu>
Date: Wed, 27 Dec 2023 14:01:46 -0600
Subject: [PATCH 032/125] remove unused card components

---
 .../assertion-card.component.html             | 138 -----------------
 .../assertion-card.component.ts               |  16 --
 .../assertion-card/assertion-card.module.ts   |  28 ----
 .../evidence-card.component.html              | 143 ------------------
 .../evidence-card/evidence-card.component.ts  |  16 --
 .../evidence-card/evidence-card.module.ts     |  33 ----
 6 files changed, 374 deletions(-)
 delete mode 100644 client/src/app/components/assertions/assertion-card/assertion-card.component.html
 delete mode 100644 client/src/app/components/assertions/assertion-card/assertion-card.component.ts
 delete mode 100644 client/src/app/components/assertions/assertion-card/assertion-card.module.ts
 delete mode 100644 client/src/app/components/evidence/evidence-card/evidence-card.component.html
 delete mode 100644 client/src/app/components/evidence/evidence-card/evidence-card.component.ts
 delete mode 100644 client/src/app/components/evidence/evidence-card/evidence-card.module.ts

diff --git a/client/src/app/components/assertions/assertion-card/assertion-card.component.html b/client/src/app/components/assertions/assertion-card/assertion-card.component.html
deleted file mode 100644
index a33db9100..000000000
--- a/client/src/app/components/assertions/assertion-card/assertion-card.component.html
+++ /dev/null
@@ -1,138 +0,0 @@
-<nz-space nzDirection="vertical">
-  <nz-row
-    [nzGutter]="16"
-    *nzSpaceItem>
-    <nz-col [nzSpan]="24">
-      <nz-card
-        [nzTitle]="assertionTitle"
-        style="width: 100%">
-        <ng-template #assertionTitle>
-          <i
-            nz-icon
-            nzTheme="twotone"
-            [nzTwotoneColor]="'Assertion' | entityColor"
-            nzType="civic-assertion"></i>
-          {{ assertion.name }}
-          <i
-            nz-icon
-            nzTheme="twotone"
-            [nzTwotoneColor]="'Gene' | entityColor"
-            nzType="civic-gene"></i>
-          {{ assertion.gene.name }}
-          <i
-            nz-icon
-            nzTheme="twotone"
-            [nzTwotoneColor]="'Variant' | entityColor"
-            nzType="civic-variant"></i>
-          {{ assertion.variant.name }}
-        </ng-template>
-        <nz-row [nzGutter]="16">
-          <nz-col [nzSpan]="8">
-            <nz-row><b>Summary:&nbsp;</b>{{ assertion.summary }}</nz-row>
-          </nz-col>
-          <nz-col [nzSpan]="8">
-            <nz-row
-              ><b>Assertion Type:&nbsp;</b
-              >{{ assertion.assertionType | evidenceEnumDisplay }}</nz-row
-            >
-            <nz-row
-              ><b>Assertion Direction:&nbsp;</b
-              >{{ assertion.assertionDirection | evidenceEnumDisplay }}</nz-row
-            >
-            <nz-row
-              ><b>Clinical Significance:&nbsp;</b
-              >{{ assertion.significance | evidenceEnumDisplay }}</nz-row
-            >
-            <nz-row
-              ><b>Variant Origin:&nbsp;</b
-              >{{ assertion.variantOrigin | evidenceEnumDisplay }}</nz-row
-            >
-            <nz-row [ngPlural]="assertion.therapies.length">
-              <ng-template ngPluralCase="=0"
-                ><b>Therapy:&nbsp;</b> <i>Not Applicable</i></ng-template
-              >
-              <ng-template ngPluralCase="=1"><b>Therapy:&nbsp;</b></ng-template>
-              <ng-template ngPluralCase="other"
-                ><b>Therapies:&nbsp;</b></ng-template
-              >
-              <ng-container *ngFor="let therapy of assertion.therapies">
-                <cvc-therapy-tag [therapy]="therapy"></cvc-therapy-tag>
-              </ng-container>
-              <ng-container *ngIf="assertion.therapies.length > 1"
-                >({{ assertion.therapyInteractionType | titlecase }})
-              </ng-container>
-            </nz-row>
-          </nz-col>
-          <nz-col [nzSpan]="8">
-            <nz-row *ngIf="assertion.disease"
-              ><b>Disease:&nbsp;</b>
-              <cvc-disease-tag [disease]="assertion.disease"></cvc-disease-tag>
-            </nz-row>
-            <nz-row *ngIf="!assertion.disease"
-              ><b>Disease:&nbsp;</b><i>Not Applicable</i></nz-row
-            >
-            <nz-row [ngPlural]="assertion.phenotypes.length">
-              <ng-template ngPluralCase="=0"
-                ><b>Associated Phenotype:&nbsp;</b> <i>-</i></ng-template
-              >
-              <ng-template ngPluralCase="=1"
-                ><b>Associated Phenotype:&nbsp;</b></ng-template
-              >
-              <ng-template ngPluralCase="other"
-                ><b>Associated Phenotypes:&nbsp;</b></ng-template
-              >
-              <ng-container *ngFor="let p of assertion.phenotypes">
-                <cvc-phenotype-tag [phenotype]="p"></cvc-phenotype-tag>
-              </ng-container>
-            </nz-row>
-            <nz-row *ngIf="assertion.ampLevel"
-              ><b>AMP/ASCO/CAP Category:&nbsp;</b
-              >{{ assertion.ampLevel | formatAmp : 'verbose' }}</nz-row
-            >
-            <nz-row *ngIf="assertion.acmgCodes.length > 0">
-              <span *ngIf="assertion.acmgCodes.length === 1; else acmgElse"
-                ><b>ACMG Code:&nbsp;</b></span
-              >
-              <ng-template #acmgElse><b>ACMG Codes:&nbsp;</b></ng-template>
-              <span *ngFor="let code of assertion.acmgCodes; let last = last">
-                {{ code.code
-                }}<ng-container *ngIf="!last">,&nbsp;</ng-container>
-              </span>
-            </nz-row>
-            <nz-row *ngIf="assertion.nccnGuideline"
-              ><b>NCCN Guideline:&nbsp;</b
-              >{{ assertion.nccnGuideline.name }}</nz-row
-            >
-            <nz-row>
-              <b>Regulatory Approval:&nbsp;</b>
-              <i
-                *ngIf="
-                  assertion.regulatoryApproval;
-                  else regulatoryApprovalElse
-                "
-                nz-icon
-                nzType="check-square"></i>
-              <ng-template #regulatoryApprovalElse>
-                <i
-                  nz-icon
-                  nzType="close-square"></i>
-              </ng-template>
-            </nz-row>
-            <nz-row>
-              <b>FDA Companion Test:&nbsp;</b>
-              <i
-                *ngIf="assertion.fdaCompanionTest; else fdaTestElse"
-                nz-icon
-                nzType="check-square"></i>
-              <ng-template #fdaTestElse>
-                <i
-                  nz-icon
-                  nzType="close-square"></i>
-              </ng-template>
-            </nz-row>
-          </nz-col>
-        </nz-row>
-      </nz-card>
-    </nz-col>
-  </nz-row>
-</nz-space>
diff --git a/client/src/app/components/assertions/assertion-card/assertion-card.component.ts b/client/src/app/components/assertions/assertion-card/assertion-card.component.ts
deleted file mode 100644
index 97032bab1..000000000
--- a/client/src/app/components/assertions/assertion-card/assertion-card.component.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { Component, Input, OnInit } from '@angular/core'
-import { AssertionBrowseFieldsFragment } from '@app/generated/civic.apollo'
-
-@Component({
-  selector: 'cvc-assertion-card',
-  templateUrl: './assertion-card.component.html',
-})
-export class CvcAssertionCardComponent implements OnInit {
-  @Input() assertion!: AssertionBrowseFieldsFragment
-
-  ngOnInit() {
-    if (this.assertion == undefined) {
-      throw new Error('Must pass an assertion into assertion card')
-    }
-  }
-}
diff --git a/client/src/app/components/assertions/assertion-card/assertion-card.module.ts b/client/src/app/components/assertions/assertion-card/assertion-card.module.ts
deleted file mode 100644
index ae0c5ab96..000000000
--- a/client/src/app/components/assertions/assertion-card/assertion-card.module.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { NgModule } from '@angular/core'
-import { CommonModule } from '@angular/common'
-import { CvcAssertionCardComponent } from './assertion-card.component'
-import { NzSpaceModule } from 'ng-zorro-antd/space'
-import { NzGridModule } from 'ng-zorro-antd/grid'
-import { NzCardModule } from 'ng-zorro-antd/card'
-import { CvcPipesModule } from '@app/core/pipes/pipes.module'
-import { CvcDiseaseTagModule } from '@app/components/diseases/cvc-disease-tag/cvc-disease-tag.module'
-import { CvcPhenotypeTagModule } from '@app/components/phenotypes/phenotype-tag/phenotype-tag.module'
-import { NzIconModule } from 'ng-zorro-antd/icon'
-import { CvcTherapyTagModule } from '@app/components/therapies/cvc-therapy-tag/cvc-therapy-tag.module'
-
-@NgModule({
-  declarations: [CvcAssertionCardComponent],
-  imports: [
-    CommonModule,
-    NzCardModule,
-    NzSpaceModule,
-    NzGridModule,
-    NzIconModule,
-    CvcTherapyTagModule,
-    CvcDiseaseTagModule,
-    CvcPhenotypeTagModule,
-    CvcPipesModule,
-  ],
-  exports: [CvcAssertionCardComponent],
-})
-export class CvcAssertionCardModule {}
diff --git a/client/src/app/components/evidence/evidence-card/evidence-card.component.html b/client/src/app/components/evidence/evidence-card/evidence-card.component.html
deleted file mode 100644
index 2e93eff88..000000000
--- a/client/src/app/components/evidence/evidence-card/evidence-card.component.html
+++ /dev/null
@@ -1,143 +0,0 @@
-<nz-space nzDirection="vertical">
-  <nz-row
-    [nzGutter]="16"
-    *nzSpaceItem>
-    <nz-col [nzSpan]="24">
-      <nz-card
-        [nzTitle]="evidenceTitle"
-        style="width: 100%">
-        <ng-template #evidenceTitle>
-          <i
-            nz-icon
-            nzTheme="twotone"
-            [nzTwotoneColor]="'EvidenceItem' | entityColor"
-            nzType="civic-evidence"></i>
-          {{ evidence.name }}
-
-          <i
-            nz-icon
-            nzTheme="twotone"
-            [nzTwotoneColor]="'Gene' | entityColor"
-            nzType="civic-gene"></i>
-          {{ evidence.gene.name }}
-
-          <i
-            nz-icon
-            nzTheme="twotone"
-            [nzTwotoneColor]="'Variant' | entityColor"
-            nzType="civic-variant"></i>
-          {{ evidence.variant.name }}
-        </ng-template>
-        <nz-row [nzGutter]="16">
-          <nz-col [nzSpan]="8">
-            <nz-row>{{ evidence.description }}</nz-row>
-            <nz-row *ngIf="evidence.assertions.length > 0">
-              <b>Supports Assertions:&nbsp;</b>
-              <ng-container *ngFor="let assertion of evidence.assertions">
-                <i
-                  nz-icon
-                  nzTheme="twotone"
-                  [nzTwotoneColor]="'Assertion' | entityColor"
-                  nzType="civic-assertion"></i
-                >{{ assertion.name }}
-              </ng-container>
-            </nz-row>
-          </nz-col>
-          <nz-col [nzSpan]="8">
-            <nz-row
-              ><b>Evidence Level:&nbsp;</b>{{ evidence.evidenceLevel }}</nz-row
-            >
-            <nz-row
-              ><b>Evidence Type:&nbsp;</b
-              >{{ evidence.evidenceType | evidenceEnumDisplay }}</nz-row
-            >
-            <nz-row
-              ><b>Evidence Direction:&nbsp;</b
-              >{{ evidence.evidenceDirection | evidenceEnumDisplay }}</nz-row
-            >
-            <nz-row
-              ><b>Clinical Significance:&nbsp;</b
-              >{{ evidence.significance | evidenceEnumDisplay }}</nz-row
-            >
-            <nz-row
-              ><b>Variant Origin:&nbsp;</b
-              >{{ evidence.variantOrigin | evidenceEnumDisplay }}</nz-row
-            >
-            <nz-row [ngPlural]="evidence.therapies.length">
-              <ng-template ngPluralCase="=0"
-                ><b>Therapy:&nbsp;</b> <i>Not Applicable</i></ng-template
-              >
-              <ng-template ngPluralCase="=1"><b>Therapy:&nbsp;</b></ng-template>
-              <ng-template ngPluralCase="other"
-                ><b>Therapies:&nbsp;</b></ng-template
-              >
-              <ng-container *ngFor="let therapy of evidence.therapies">
-                <cvc-therapy-tag [therapy]="therapy"></cvc-therapy-tag>
-              </ng-container>
-              <ng-container *ngIf="evidence.therapies.length > 1"
-                >({{
-                  evidence.therapyInteractionType | titlecase
-                }})</ng-container
-              >
-            </nz-row>
-          </nz-col>
-          <nz-col [nzSpan]="8">
-            <nz-row *ngIf="evidence.disease"
-              ><b>Disease:&nbsp;</b>
-              <cvc-disease-tag [disease]="evidence.disease"></cvc-disease-tag>
-            </nz-row>
-            <nz-row *ngIf="!evidence.disease"
-              ><b>Disease:&nbsp;</b><i>Not Applicable</i></nz-row
-            >
-            <nz-row [ngPlural]="evidence.phenotypes.length">
-              <ng-template ngPluralCase="=0"
-                ><b>Associated Phenotype:&nbsp;</b> <i>-</i></ng-template
-              >
-              <ng-template ngPluralCase="=1"
-                ><b>Associated Phenotype:&nbsp;</b></ng-template
-              >
-              <ng-template ngPluralCase="other"
-                ><b>Associated Phenotypes:&nbsp;</b></ng-template
-              >
-              <ng-container *ngFor="let p of evidence.phenotypes">
-                <cvc-phenotype-tag [phenotype]="p"></cvc-phenotype-tag>
-              </ng-container>
-            </nz-row>
-            <nz-row><b>Source:&nbsp;</b>{{ evidence.source.citation }}</nz-row>
-            <nz-row>
-              <span *ngIf="evidence.source.sourceType === 'PUBMED'"
-                ><b>PubMed ID:&nbsp;</b></span
-              >
-              <span *ngIf="evidence.source.sourceType === 'ASCO'"
-                ><b>ASCO ID:&nbsp;</b></span
-              >
-              {{ evidence.source.citationId }}
-            </nz-row>
-            <nz-row
-              *ngIf="evidence.source.clinicalTrials"
-              [ngPlural]="evidence.source.clinicalTrials.length">
-              <ng-template ngPluralCase="=0"
-                ><b>Clinical Trial:&nbsp;</b> <i>-</i></ng-template
-              >
-              <ng-template ngPluralCase="=1"
-                ><b>Clinical Trial:&nbsp;</b></ng-template
-              >
-              <ng-template ngPluralCase="other"
-                ><b>Clinical Trials:&nbsp;</b></ng-template
-              >
-              <ng-container *ngFor="let t of evidence.source.clinicalTrials">
-                <cvc-clinical-trial-tag
-                  [clinicalTrial]="t"></cvc-clinical-trial-tag>
-              </ng-container>
-            </nz-row>
-            <nz-row
-              ><b>Evidence Rating:&nbsp;</b>
-              <cvc-evidence-rating
-                [starRating]="evidence.evidenceRating"></cvc-evidence-rating>
-            </nz-row>
-          </nz-col>
-        </nz-row>
-      </nz-card>
-    </nz-col>
-  </nz-row>
-</nz-space>
diff --git a/client/src/app/components/evidence/evidence-card/evidence-card.component.ts b/client/src/app/components/evidence/evidence-card/evidence-card.component.ts
deleted file mode 100644
index 1041f17dd..000000000
--- a/client/src/app/components/evidence/evidence-card/evidence-card.component.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { Component, Input, OnInit } from '@angular/core'
-import { EvidenceGridFieldsFragment } from '@app/generated/civic.apollo'
-
-@Component({
-  selector: 'cvc-evidence-card',
-  templateUrl: './evidence-card.component.html',
-})
-export class CvcEvidenceCardComponent implements OnInit {
-  @Input() evidence!: EvidenceGridFieldsFragment
-
-  ngOnInit() {
-    if (this.evidence == undefined) {
-      throw new Error('Must pass an evidence item into evidence card')
-    }
-  }
-}
diff --git a/client/src/app/components/evidence/evidence-card/evidence-card.module.ts b/client/src/app/components/evidence/evidence-card/evidence-card.module.ts
deleted file mode 100644
index 67973739a..000000000
--- a/client/src/app/components/evidence/evidence-card/evidence-card.module.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { NgModule } from '@angular/core'
-import { CommonModule } from '@angular/common'
-import { NzGridModule } from 'ng-zorro-antd/grid'
-import { NzSpaceModule } from 'ng-zorro-antd/space'
-import { NzCardModule } from 'ng-zorro-antd/card'
-
-import { CvcClinicalTrialTagModule } from '@app/components/clinical-trials/clinical-trial-tag/clinical-trial-tag.module'
-import { CvcDiseaseTagModule } from '@app/components/diseases/cvc-disease-tag/cvc-disease-tag.module'
-import { CvcEvidenceCardComponent } from './evidence-card.component'
-import { CvcEvidenceRatingModule } from '@app/components/evidence/evidence-rating/evidence-rating.module'
-import { CvcPhenotypeTagModule } from '@app/components/phenotypes/phenotype-tag/phenotype-tag.module'
-import { CvcPipesModule } from '@app/core/pipes/pipes.module'
-import { NzIconModule } from 'ng-zorro-antd/icon'
-import { CvcTherapyTagModule } from '@app/components/therapies/cvc-therapy-tag/cvc-therapy-tag.module'
-
-@NgModule({
-  declarations: [CvcEvidenceCardComponent],
-  imports: [
-    CommonModule,
-    NzCardModule,
-    NzGridModule,
-    NzSpaceModule,
-    NzIconModule,
-    CvcClinicalTrialTagModule,
-    CvcDiseaseTagModule,
-    CvcTherapyTagModule,
-    CvcEvidenceRatingModule,
-    CvcPhenotypeTagModule,
-    CvcPipesModule,
-  ],
-  exports: [CvcEvidenceCardComponent],
-})
-export class CvcEvidenceCardModule {}

From fe3c9f637ca014c385fd852197db8587b404f21d Mon Sep 17 00:00:00 2001
From: Adam Coffman <acoffman@wustl.edu>
Date: Wed, 27 Dec 2023 14:02:41 -0600
Subject: [PATCH 033/125] change instances of civic-gene icon to civic-feature
 icon

---
 .../diseases-table/diseases-table.component.html     |  8 ++++----
 .../feature-popover/feature-popover.component.html   |  4 ++--
 .../features/feature-tag/feature-tag.component.html  |  4 ++--
 .../site-stats-card/site-stats-card.component.html   |  6 +++---
 .../core/pipes/icon-name-for-subscribable-entity.ts  |  2 +-
 client/src/app/core/utilities/get-entity-color.ts    |  2 +-
 client/src/app/forms/test-pages/test-pages.view.ts   |  2 +-
 client/src/app/icons-provider.module.ts              | 12 ++++++------
 client/src/app/layout/layout.component.html          |  2 +-
 .../features-detail/features-detail.view.html        |  4 ++--
 .../features/features-home/features-home.page.html   | 11 ++++++-----
 .../features-revise/features-revise.view.html        |  7 ++++---
 12 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/client/src/app/components/diseases/diseases-table/diseases-table.component.html b/client/src/app/components/diseases/diseases-table/diseases-table.component.html
index 3aaee05f5..6747b1254 100644
--- a/client/src/app/components/diseases/diseases-table/diseases-table.component.html
+++ b/client/src/app/components/diseases/diseases-table/diseases-table.component.html
@@ -71,7 +71,7 @@
           nzTooltipTitle="Feature Count">
           <i
             nz-icon
-            nzType="civic-gene"></i>
+            nzType="civic-feature"></i>
           Count
         </th>
         <th
@@ -163,9 +163,9 @@
 
             <ng-template #noDoid> -- </ng-template>
           </td>
-          <td
-            class="overflow-ellipsis">
-            <cvc-tag-overflow tagType="feature"
+          <td class="overflow-ellipsis">
+            <cvc-tag-overflow
+              tagType="feature"
               [tags]="disease.features"
               [maxDisplayCount]="5"
               [matchingText]="featureNameInput">
diff --git a/client/src/app/components/features/feature-popover/feature-popover.component.html b/client/src/app/components/features/feature-popover/feature-popover.component.html
index 8b9edd83a..12cdf6674 100644
--- a/client/src/app/components/features/feature-popover/feature-popover.component.html
+++ b/client/src/app/components/features/feature-popover/feature-popover.component.html
@@ -8,8 +8,8 @@
         <i
           nz-icon
           nzTheme="twotone"
-          [nzTwotoneColor]="'Gene' | entityColor"
-          nzType="civic-gene"></i>
+          [nzTwotoneColor]="'Feature' | entityColor"
+          nzType="civic-feature"></i>
         {{ feature.featureInstance.__typename }} - {{ feature.name }}
       </ng-template>
 
diff --git a/client/src/app/components/features/feature-tag/feature-tag.component.html b/client/src/app/components/features/feature-tag/feature-tag.component.html
index c70c81015..d146b721f 100644
--- a/client/src/app/components/features/feature-tag/feature-tag.component.html
+++ b/client/src/app/components/features/feature-tag/feature-tag.component.html
@@ -29,9 +29,9 @@
     [entityColor]="iconColor">
     <i
       nz-icon
-      nzType="civic-gene"
+      nzType="civic-feature"
       nzTheme="twotone"
-      [nzTwotoneColor]="'Gene' | entityColor"></i>
+      [nzTwotoneColor]="'Feature' | entityColor"></i>
   </cvc-icon-badges>
   <!-- gene name length mean: 8; mode: 12 (15306); max: 25 -->
   <ng-container *ngIf="this.truncateLongName; else fullName">
diff --git a/client/src/app/components/shared/site-stats-card/site-stats-card.component.html b/client/src/app/components/shared/site-stats-card/site-stats-card.component.html
index a62dea3c4..ca720d704 100644
--- a/client/src/app/components/shared/site-stats-card/site-stats-card.component.html
+++ b/client/src/app/components/shared/site-stats-card/site-stats-card.component.html
@@ -73,8 +73,8 @@
             <i
               nz-icon
               nzTheme="twotone"
-              [nzTwotoneColor]="'Gene' | entityColor"
-              nzType="civic-gene"></i>
+              [nzTwotoneColor]="'Feature' | entityColor"
+              nzType="civic-feature"></i>
           </ng-template>
         </a>
       </nz-col>
@@ -199,7 +199,7 @@
       </nz-col>
       <nz-col nzFlex="1">
         <nz-statistic
-          [nzTitle]="label() + ' Genes'"
+          [nzTitle]="label() + ' Features'"
           [nzValue]="'--'"></nz-statistic>
       </nz-col>
       <nz-col nzFlex="1">
diff --git a/client/src/app/core/pipes/icon-name-for-subscribable-entity.ts b/client/src/app/core/pipes/icon-name-for-subscribable-entity.ts
index 3ca909fba..5fcd3d6d2 100644
--- a/client/src/app/core/pipes/icon-name-for-subscribable-entity.ts
+++ b/client/src/app/core/pipes/icon-name-for-subscribable-entity.ts
@@ -19,7 +19,7 @@ export class IconNameForSubscribableEntity implements PipeTransform {
       case 'FEATURE':
       case 'Feature':
       case SubscribableEntities.Feature:
-        return 'civic-gene'
+        return 'civic-feature'
       case SubscribableEntities.Revision:
       case 'REVISION':
       case 'Revision':
diff --git a/client/src/app/core/utilities/get-entity-color.ts b/client/src/app/core/utilities/get-entity-color.ts
index ab47576ac..4f83ffae5 100644
--- a/client/src/app/core/utilities/get-entity-color.ts
+++ b/client/src/app/core/utilities/get-entity-color.ts
@@ -7,7 +7,7 @@ export const EntityColors = new Map<string, string>([
   ['Disease', '#e62f76'],
   ['Event', '#1db8a9'],
   ['EvidenceItem', '#2a63b6'],
-  ['Gene', '#07aff0'],
+  ['Feature', '#07aff0'],
   ['MolecularProfile', '#33b358'],
   ['NccnGuideline', '#49566D'],
   ['Phenotype', '#1db8a9'],
diff --git a/client/src/app/forms/test-pages/test-pages.view.ts b/client/src/app/forms/test-pages/test-pages.view.ts
index 2fa281613..ed2de74cc 100644
--- a/client/src/app/forms/test-pages/test-pages.view.ts
+++ b/client/src/app/forms/test-pages/test-pages.view.ts
@@ -42,7 +42,7 @@ export class TestPagesView {
       },
       {
         routeName: 'gene-revise-test',
-        iconName: 'civic-gene',
+        iconName: 'civic-feature',
         tabLabel: 'Revise',
       },
       {
diff --git a/client/src/app/icons-provider.module.ts b/client/src/app/icons-provider.module.ts
index 9cb211b9e..45fcd66c5 100644
--- a/client/src/app/icons-provider.module.ts
+++ b/client/src/app/icons-provider.module.ts
@@ -71,9 +71,9 @@ import {
   civicFlagTwotone,
   civicFunctionalOutline,
   civicGainoffunctionOutline,
-  civicGeneFullcolor,
-  civicGeneOutline,
-  civicGeneTwotone,
+  civicFeatureFullcolor,
+  civicFeatureOutline,
+  civicFeatureTwotone,
   civicLevelaOutline,
   civicLevelbOutline,
   civicLevelcOutline,
@@ -184,8 +184,8 @@ const iconLiterals = [
   civicFlagTwotone,
   civicFunctionalOutline,
   civicGainoffunctionOutline,
-  civicGeneOutline,
-  civicGeneTwotone,
+  civicFeatureOutline,
+  civicFeatureTwotone,
   civicLevelaOutline,
   civicLevelbOutline,
   civicLevelcOutline,
@@ -262,7 +262,7 @@ export const fullColorIcons: CivicIconLiteral[] = [
   civicEvidenceitemFullcolor,
   civicEvidenceFullcolor,
   civicFlagFullcolor,
-  civicGeneFullcolor,
+  civicFeatureFullcolor,
   civicTherapyFullcolor,
   civicMolecularprofileFullcolor,
   civicOrganizationFullcolor,
diff --git a/client/src/app/layout/layout.component.html b/client/src/app/layout/layout.component.html
index 44faeca36..2399e4cd4 100644
--- a/client/src/app/layout/layout.component.html
+++ b/client/src/app/layout/layout.component.html
@@ -82,7 +82,7 @@
             nzMatchRouter>
             <i
               nz-icon
-              nzType="civic-gene"></i>
+              nzType="civic-feature"></i>
             <span> <a routerLink="/features">Features</a> </span>
           </li>
 
diff --git a/client/src/app/views/features/features-detail/features-detail.view.html b/client/src/app/views/features/features-detail/features-detail.view.html
index c0661f87e..40181b89d 100644
--- a/client/src/app/views/features/features-detail/features-detail.view.html
+++ b/client/src/app/views/features/features-detail/features-detail.view.html
@@ -12,8 +12,8 @@
         <i
           nz-icon
           nzTheme="twotone"
-          [nzTwotoneColor]="'Gene' | entityColor"
-          nzType="civic-gene"></i>
+          [nzTwotoneColor]="'Feature' | entityColor"
+          nzType="civic-feature"></i>
         {{ feature.featureInstance.__typename }} - {{ feature.name }}
       </nz-page-header-title>
 
diff --git a/client/src/app/views/features/features-home/features-home.page.html b/client/src/app/views/features/features-home/features-home.page.html
index 7b0ef91f5..a3807b1e7 100644
--- a/client/src/app/views/features/features-home/features-home.page.html
+++ b/client/src/app/views/features/features-home/features-home.page.html
@@ -10,8 +10,8 @@
         <i
           nz-icon
           nzTheme="twotone"
-          [nzTwotoneColor]="'Gene' | entityColor"
-          nzType="civic-gene"></i>
+          [nzTwotoneColor]="'Feature' | entityColor"
+          nzType="civic-feature"></i>
       </nz-col>
       <nz-col
         nzFlex="0 1 600px"
@@ -22,8 +22,8 @@ <h2>Features</h2>
           nzEllipsis
           nzExpandable
           [nzEllipsisRows]="2">
-          CIViC Features include a feature-level summary, a link to the Drug Gene
-          Interation Database, and extensive gene details from MyGene.info.
+          CIViC Features include a feature-level summary, a link to the Drug
+          Gene Interation Database, and extensive gene details from MyGene.info.
         </p>
       </nz-col>
       <nz-col
@@ -64,7 +64,8 @@ <h2>Features</h2>
     <nz-row>
       <nz-col [nzSpan]="24">
         <div class="content">
-          <cvc-features-table cvcTitle="Browse All Features"></cvc-features-table>
+          <cvc-features-table
+            cvcTitle="Browse All Features"></cvc-features-table>
         </div>
       </nz-col>
     </nz-row>
diff --git a/client/src/app/views/features/features-revise/features-revise.view.html b/client/src/app/views/features/features-revise/features-revise.view.html
index a54a828c7..3374480ad 100644
--- a/client/src/app/views/features/features-revise/features-revise.view.html
+++ b/client/src/app/views/features/features-revise/features-revise.view.html
@@ -1,5 +1,6 @@
 <ng-container *ngIf="feature$ | async as feature">
-  <cvc-section-navigation [displayName]="feature.name"> </cvc-section-navigation>
+  <cvc-section-navigation [displayName]="feature.name">
+  </cvc-section-navigation>
 
   <nz-page-header class="site-page-header">
     <!-- title -->
@@ -8,8 +9,8 @@
       <i
         nz-icon
         nzTheme="twotone"
-        [nzTwotoneColor]="'Gene' | entityColor"
-        nzType="civic-gene"></i>
+        [nzTwotoneColor]="'Feature' | entityColor"
+        nzType="civic-feature"></i>
       {{ feature.name }}
     </nz-page-header-title>
 

From 0385cf53ad53d1c44a412ecf745c7718b2c836c4 Mon Sep 17 00:00:00 2001
From: Adam Coffman <acoffman@wustl.edu>
Date: Wed, 27 Dec 2023 14:11:25 -0600
Subject: [PATCH 034/125] ensure tsv generation works with gene features

---
 .../app/tsv_formatters/gene_tsv_formatter.rb  | 21 +++++++++++--------
 .../tsv_formatters/variant_tsv_formatter.rb   |  7 ++++---
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/server/app/tsv_formatters/gene_tsv_formatter.rb b/server/app/tsv_formatters/gene_tsv_formatter.rb
index 0bb8bc085..256c244b3 100644
--- a/server/app/tsv_formatters/gene_tsv_formatter.rb
+++ b/server/app/tsv_formatters/gene_tsv_formatter.rb
@@ -1,6 +1,9 @@
 class GeneTsvFormatter
   def self.objects
-    Gene.joins(variants: { molecular_profiles: [:evidence_items]}).distinct
+    Feature.joins(variants: { molecular_profiles: [:evidence_items]})
+      .where(feature_instance_type: 'Features::Gene')
+      .includes(:feature_instance)
+      .distinct
   end
 
   def self.headers
@@ -15,15 +18,15 @@ def self.headers
     ]
   end
 
-  def self.row_from_object(gene)
+  def self.row_from_object(feature)
     [
-      gene.id,
-      LinkAdaptors::Gene.new(gene).permalink_path(include_domain: true),
-      gene.name,
-      gene.entrez_id,
-      gene.description.squish,
-      gene.updated_at,
-      gene.flagged
+      feature.feature_instance.id,
+      LinkAdaptors::Gene.new(feature.feature_instance).permalink_path(include_domain: true),
+      feature.name,
+      feature.feature_instance.entrez_id,
+      feature.description.squish,
+      feature.updated_at,
+      feature.flagged
     ]
   end
 
diff --git a/server/app/tsv_formatters/variant_tsv_formatter.rb b/server/app/tsv_formatters/variant_tsv_formatter.rb
index f0479f162..c49a29fe2 100644
--- a/server/app/tsv_formatters/variant_tsv_formatter.rb
+++ b/server/app/tsv_formatters/variant_tsv_formatter.rb
@@ -1,8 +1,9 @@
 class VariantTsvFormatter
   def self.objects
     Variant.joins(molecular_profiles: [:evidence_items])
-      .includes(:gene, :variant_groups, :variant_types, :hgvs_descriptions, :variant_aliases)
+      .includes(:variant_groups, :variant_types, :hgvs_descriptions, :variant_aliases, :feature)
       .where("evidence_items.status = 'accepted'")
+      .where(features: { feature_instance_type: 'Features::Gene'})
       .distinct
   end
 
@@ -41,8 +42,8 @@ def self.row_from_object(variant)
     [
       variant.id,
       LinkAdaptors::Variant.new(variant).permalink_path(include_domain: true),
-      variant.gene.name,
-      variant.gene.entrez_id,
+      variant.feature.name,
+      variant.feature.feature_instance.entrez_id,
       variant.name,
       variant.variant_groups.map(&:name).join(','),
       variant.chromosome,

From 0042162d00a362db18f7716c7f1674059e65fc49 Mon Sep 17 00:00:00 2001
From: Adam Coffman <acoffman@wustl.edu>
Date: Wed, 27 Dec 2023 14:47:20 -0600
Subject: [PATCH 035/125] setup permalink support for features, handle legacy
 /genes/:id routes

---
 server/app/controllers/links_controller.rb |  5 +++++
 server/app/lib/link_adaptors/feature.rb    | 11 +++++++++++
 server/app/lib/link_adaptors/gene.rb       |  2 +-
 server/app/models/frontend_router.rb       | 22 ++++++++++++++++------
 server/config/routes.rb                    |  1 +
 5 files changed, 34 insertions(+), 7 deletions(-)
 create mode 100644 server/app/lib/link_adaptors/feature.rb

diff --git a/server/app/controllers/links_controller.rb b/server/app/controllers/links_controller.rb
index 7c43e4e23..1be819127 100644
--- a/server/app/controllers/links_controller.rb
+++ b/server/app/controllers/links_controller.rb
@@ -16,6 +16,11 @@ def redirect
     end
   end
 
+  def redirect_legacy_gene_id
+    params[:idtype] = 'genes'
+    redirect
+  end
+
   private
   def submit_analytics
     if Analytics.should_submit?(request)
diff --git a/server/app/lib/link_adaptors/feature.rb b/server/app/lib/link_adaptors/feature.rb
new file mode 100644
index 000000000..4996d7a17
--- /dev/null
+++ b/server/app/lib/link_adaptors/feature.rb
@@ -0,0 +1,11 @@
+module LinkAdaptors
+  class Feature < Base
+    def display_name
+      obj.name
+    end
+
+    def base_path
+      "/features/#{obj.id}"
+    end
+  end
+end
diff --git a/server/app/lib/link_adaptors/gene.rb b/server/app/lib/link_adaptors/gene.rb
index 001c88a0c..b8f1a18e6 100644
--- a/server/app/lib/link_adaptors/gene.rb
+++ b/server/app/lib/link_adaptors/gene.rb
@@ -5,7 +5,7 @@ def display_name
     end
 
     def base_path
-      "/genes/#{obj.id}"
+      "/features/#{obj.feature.id}"
     end
   end
 end
diff --git a/server/app/models/frontend_router.rb b/server/app/models/frontend_router.rb
index 6b1ccf321..f65d5be38 100644
--- a/server/app/models/frontend_router.rb
+++ b/server/app/models/frontend_router.rb
@@ -13,7 +13,7 @@ def url
       nil
     else
       obj = entity.find_by!(query_field => id)
-      adaptor = "LinkAdaptors::#{obj.class}".constantize.new(obj)
+      adaptor = "LinkAdaptors::#{obj.class.to_s.demodulize}".constantize.new(obj)
       "#{domain}#{adaptor.base_path}"
     end
   end
@@ -22,7 +22,11 @@ def url
   def query_info
     case id_type
     when /genes?/
-      [ Gene, :id, ]
+      [ 
+        Feature.where(feature_instance_type: "Features::Gene"), :feature_instance_id, 
+      ]
+    when /features?/
+      [ Feature, :id, ]
     when /variants?\z/
       [ Variant, :id, ]
     when /evidence/, /evidence_items?/
@@ -30,9 +34,11 @@ def query_info
     when /molecular_profiles?/, /molecular-profiles?/
       [ MolecularProfile, :id, ]
     when /entrez_id/
-      [ Gene, :entrez_id, ]
+      [ Features::Gene, :entrez_id ]
     when /entrez_name/
-      [ Gene, :name , ]
+      [ 
+        Feature.where(feature_instance_type: "Features::Gene"), :name, 
+      ]
     when /variant_groups?/
       [ VariantGroup, :id, ]
     when /revisions?/
@@ -54,7 +60,11 @@ def query_info
       when "AID"
         [ Assertion, :id ]
       when "GID"
-        [ Gene, :id ]
+        [ 
+          Feature.where(feature_instance_type: "Features::Gene"), :feature_instance_id, 
+        ]
+      when "FID"
+        [ Feature, :id ]
       when "VID"
         [ Variant, :id ]
       when "MPID"
@@ -72,7 +82,7 @@ def query_info
   end
 
   def remove_tag(id_with_tag)
-    match = id_with_tag.upcase.match(/^(AID|GID|VID|EID|SID|MPID)(\d+)$/)
+    match = id_with_tag.upcase.match(/^(AID|GID|FID|VID|EID|SID|MPID)(\d+)$/)
     if match
       match.captures
     else
diff --git a/server/config/routes.rb b/server/config/routes.rb
index 2ee489742..cc8ebc509 100644
--- a/server/config/routes.rb
+++ b/server/config/routes.rb
@@ -17,6 +17,7 @@
 
   get '/links' => 'links#redirect'
   get 'links/:idtype/:id' => 'links#redirect'
+  get '/genes/:id' => 'links#redirect_legacy_gene_id'
 
   mount GraphiQL::Rails::Engine, at: "/api/graphiql", graphql_path: "/api/graphql"
 

From c3fea4de9e4c11d9f0fa6ac9268e85cd0f76981a Mon Sep 17 00:00:00 2001
From: Adam Coffman <acoffman@wustl.edu>
Date: Wed, 27 Dec 2023 14:54:58 -0600
Subject: [PATCH 036/125] frontend redirect genes browse to features browse

---
 client/src/app/layout/layout-routing.module.ts | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/client/src/app/layout/layout-routing.module.ts b/client/src/app/layout/layout-routing.module.ts
index e455ba2fe..f495696d3 100644
--- a/client/src/app/layout/layout-routing.module.ts
+++ b/client/src/app/layout/layout-routing.module.ts
@@ -73,15 +73,14 @@ const routes: Routes = [
           breadcrumb: 'Evidence',
         },
       },
-/*       {
+       {
         path: 'genes',
-        loadChildren: () =>
-          import('@app/views/genes/genes.module').then((m) => m.GenesModule),
+        redirectTo: 'features',
         data: {
-          breadcrumb: 'Genes',
+          breadcrumb: 'Features',
         },
       } ,
-*/
+
       {
         path: 'features',
         loadChildren: () =>

From 919196edfaa9587011dd17b5c0424ee16544088e Mon Sep 17 00:00:00 2001
From: Adam Coffman <acoffman@wustl.edu>
Date: Thu, 28 Dec 2023 13:20:19 -0600
Subject: [PATCH 037/125] use combined feature-variant tag where needed

---
 .../activity-feed.component.html              |  91 +++---
 .../activity-feed/activity-feed.component.ts  |  14 +-
 .../activity-feed/activity-feed.gql           |   7 +-
 .../activity-feed/activity-feed.module.ts     |   4 +-
 .../comment-body/comment-body.component.html  |   7 +-
 .../comment-body/comment-body.module.ts       |   2 +
 .../comment-list/comment-list.query.gql       |   5 +
 .../comment-popover.component.html            |   4 +-
 .../comment-popover/comment-popover.module.ts |   4 +-
 .../comment-popover/comment-popover.query.gql |   8 +
 .../events/event-feed/event-feed.gql          |   5 +
 .../event-timeline-item-module.ts             |   4 +-
 .../event-timeline-item.component.html        |   4 +-
 .../flag-popover/flag-popover.component.html  |   4 +-
 .../flags/flag-popover/flag-popover.module.ts |   4 +-
 .../flags/flag-popover/flag-popover.query.gql |   8 +
 ...ecular-profile-variant-card.component.html | 304 +++++++++++-------
 .../molecular-profile-variant-card.module.ts  |   2 +
 .../revision-list.component.html              |  16 +-
 .../revision-list/revision-list.module.ts     |   4 +-
 .../revision-popover.component.html           |   4 +-
 .../revision-popover.module.ts                |   4 +-
 .../revision-popover.query.gql                |   8 +
 .../revisions-list-and-filter.query.gql       |  30 ++
 .../feature-variant-tag.component.html        |  10 +
 .../feature-variant-tag.component.less        |   5 +
 .../feature-variant-tag.component.ts          |  55 ++++
 .../feature-variant-tag.module.ts             |  28 ++
 .../variant-group-popover.component.html      |   4 +-
 .../variant-group-popover.module.ts           |   4 +-
 .../variant-group-popover.query.gql           |   6 +
 .../comment-input/comment-input.form.ts       |   4 +-
 .../comment-input/comment-input.mutation.gql  |  25 +-
 .../src/app/generated/civic.apollo-helpers.ts |  11 +-
 client/src/app/generated/civic.apollo.ts      | 237 ++++++++------
 client/src/app/generated/server.model.graphql |   5 +
 client/src/app/generated/server.schema.json   |  60 ++++
 .../molecular-profiles-detail.module.ts       |   4 +-
 .../molecular-profiles-detail.query.gql       |   5 +
 .../molecular-profiles-detail.view.html       |   2 +-
 .../browse_tables/browse_disease_type.rb      |   9 +-
 .../browse_molecular_profile_type.rb          |  23 +-
 .../types/commentable/comment_tag_segment.rb  |   3 +
 .../graphql/types/interfaces/commentable.rb   |   4 +-
 server/app/graphql/types/linkable_tag.rb      |  21 ++
 .../graphql/types/revisions/linkout_data.rb   |   4 +
 .../types/revisions/moderated_field_type.rb   |   4 +
 .../app/models/actions/extract_references.rb  |   3 +
 48 files changed, 734 insertions(+), 349 deletions(-)
 create mode 100644 client/src/app/components/shared/feature-variant-tag/feature-variant-tag.component.html
 create mode 100644 client/src/app/components/shared/feature-variant-tag/feature-variant-tag.component.less
 create mode 100644 client/src/app/components/shared/feature-variant-tag/feature-variant-tag.component.ts
 create mode 100644 client/src/app/components/shared/feature-variant-tag/feature-variant-tag.module.ts
 create mode 100644 server/app/graphql/types/linkable_tag.rb

diff --git a/client/src/app/components/activities/activity-feed/activity-feed.component.html b/client/src/app/components/activities/activity-feed/activity-feed.component.html
index 888d35f10..27ff32791 100644
--- a/client/src/app/components/activities/activity-feed/activity-feed.component.html
+++ b/client/src/app/components/activities/activity-feed/activity-feed.component.html
@@ -8,12 +8,16 @@
           *ngIf="activity"
           [nzDot]="timelineDotTemplate">
           <ng-template #timelineDotTemplate>
-            <nz-avatar nzIcon="user" [nzSrc]="activity.user.profileImagePath"></nz-avatar>
+            <nz-avatar
+              nzIcon="user"
+              [nzSrc]="activity.user.profileImagePath"></nz-avatar>
           </ng-template>
           <nz-collapse
             [nzBordered]="false"
             nzExpandIconPosition="right">
-            <cvc-collapsible-card [header]="activityHeaderTemplate" [contents]="activityContentTemplate"></cvc-collapsible-card>
+            <cvc-collapsible-card
+              [header]="activityHeaderTemplate"
+              [contents]="activityContentTemplate"></cvc-collapsible-card>
           </nz-collapse>
 
           <ng-template #activityContentTemplate>
@@ -21,48 +25,48 @@
           </ng-template>
 
           <ng-template #activityHeaderTemplate>
-
-          <cvc-user-tag [user]="activity.user"></cvc-user-tag>
-          {{ activity.verbiage }}
-          <ng-container
-            [ngSwitch]="activity.subject.__typename">
-            <cvc-feature-tag
-              *ngSwitchCase="'Feature'"
-              [feature]="activity.subject"></cvc-feature-tag>
-            <cvc-assertion-tag
-              *ngSwitchCase="'Assertion'"
-              [assertion]="activity.subject"></cvc-assertion-tag>
-            <cvc-evidence-tag
-              *ngSwitchCase="'EvidenceItem'"
-              [evidence]="activity.subject"></cvc-evidence-tag>
-            <cvc-variant-tag
-              *ngSwitchCase="'Variant'"
-              [variant]="activity.subject"></cvc-variant-tag>
-            <cvc-revision-tag
-              *ngSwitchCase="'Revision'"
-              [revision]="$any(activity.subject)"></cvc-revision-tag>
-            <cvc-variant-group-tag
-              *ngSwitchCase="'VariantGroup'"
-              [variantgroup]="activity.subject"></cvc-variant-group-tag>
-            <cvc-source-tag
-              *ngSwitchCase="'Source'"
-              mode="concise"
-              [source]="$any(activity.subject)"></cvc-source-tag>
-            <cvc-molecular-profile-tag
-              *ngSwitchCase="'MolecularProfile'"
-              [molecularProfile]="activity.subject"></cvc-molecular-profile-tag>
-            <span *ngSwitchDefault>{{ activity.subject.name }}</span>
-          </ng-container>
-          ·
-          <span
-            nz-tooltip
-            nzTooltipPlacement="top"
-            [nzTooltipTitle]="activity.createdAt | date">
-            {{ activity.createdAt | timeAgo }}
-          </span>
+            <cvc-user-tag [user]="activity.user"></cvc-user-tag>
+            {{ activity.verbiage }}
+            <ng-container [ngSwitch]="activity.subject.__typename">
+              <cvc-feature-tag
+                *ngSwitchCase="'Feature'"
+                [feature]="activity.subject"></cvc-feature-tag>
+              <cvc-assertion-tag
+                *ngSwitchCase="'Assertion'"
+                [assertion]="activity.subject"></cvc-assertion-tag>
+              <cvc-evidence-tag
+                *ngSwitchCase="'EvidenceItem'"
+                [evidence]="activity.subject"></cvc-evidence-tag>
+              <cvc-feature-variant-tag
+                *ngSwitchCase="'Variant'"
+                [variant]="activity.subject"></cvc-feature-variant-tag>
+              <cvc-revision-tag
+                *ngSwitchCase="'Revision'"
+                [revision]="$any(activity.subject)"></cvc-revision-tag>
+              <cvc-variant-group-tag
+                *ngSwitchCase="'VariantGroup'"
+                [variantgroup]="activity.subject"></cvc-variant-group-tag>
+              <cvc-source-tag
+                *ngSwitchCase="'Source'"
+                mode="concise"
+                [source]="$any(activity.subject)"></cvc-source-tag>
+              <cvc-molecular-profile-tag
+                *ngSwitchCase="'MolecularProfile'"
+                [molecularProfile]="
+                  activity.subject
+                "></cvc-molecular-profile-tag>
+              <span *ngSwitchDefault>{{ activity.subject.name }}</span>
+            </ng-container>
+            ·
+            <span
+              nz-tooltip
+              nzTooltipPlacement="top"
+              [nzTooltipTitle]="activity.createdAt | date">
+              {{ activity.createdAt | timeAgo }}
+            </span>
           </ng-template>
-    
-<!--           <cvc-event-timeline-item
+
+          <!--           <cvc-event-timeline-item
             [event]="event!"
             [tagDisplay]="tagDisplay"></cvc-event-timeline-item> -->
         </nz-timeline-item>
@@ -70,7 +74,6 @@
     </nz-timeline>
   </ng-container>
 
-
   <!-- <ng-container
     *ngIf="this.unfilteredCount$ | ngrxPush as count; else noEvents">
     <nz-row [nzGutter]="16">
diff --git a/client/src/app/components/activities/activity-feed/activity-feed.component.ts b/client/src/app/components/activities/activity-feed/activity-feed.component.ts
index 95dedff74..242e16571 100644
--- a/client/src/app/components/activities/activity-feed/activity-feed.component.ts
+++ b/client/src/app/components/activities/activity-feed/activity-feed.component.ts
@@ -4,12 +4,9 @@ import {
   ActivityFeedNodeFragment,
   ActivityFeedQuery,
   ActivityFeedQueryVariables,
-  EventAction,
   Maybe,
-  NotificationOrganizationFragment,
   NotificationOriginatingUsersFragment,
   PageInfo,
-  SubscribableQueryInput,
 } from '@app/generated/civic.apollo'
 import { QueryRef } from 'apollo-angular'
 import { ApolloQueryResult } from '@apollo/client/core'
@@ -19,16 +16,9 @@ import {
   filter,
   map,
   pluck,
-  startWith,
-  take,
-  takeUntil,
 } from 'rxjs/operators'
-import { TagLinkableOrganization } from '@app/components/organizations/organization-tag/organization-tag.component'
-import { TagLinkableUser } from '@app/components/users/user-tag/user-tag.component'
-import { environment } from 'environments/environment'
 import { isNonNulled } from 'rxjs-etc'
-import { tag } from 'rxjs-spy/cjs/operators'
-import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy'
+import { UntilDestroy } from '@ngneat/until-destroy'
 
 // interface SelectableAction {
 //   id: EventAction
@@ -130,7 +120,7 @@ export class CvcActivityFeedComponent implements OnInit, OnDestroy {
 
     // this.unfilteredCount$
     //   .pipe(
-    //     take(1), 
+    //     take(1),
     //     untilDestroyed(this))
     //   .subscribe(value => this.originalEventCount = value)
 
diff --git a/client/src/app/components/activities/activity-feed/activity-feed.gql b/client/src/app/components/activities/activity-feed/activity-feed.gql
index 7de04098f..4d0ccb9ee 100644
--- a/client/src/app/components/activities/activity-feed/activity-feed.gql
+++ b/client/src/app/components/activities/activity-feed/activity-feed.gql
@@ -117,6 +117,11 @@ fragment activityFeedNode on ActivityInterface {
     }
     ... on Variant {
       deprecated
+      feature {
+        id
+        name
+        link
+      }
     }
     ... on MolecularProfile {
       deprecated
@@ -125,7 +130,7 @@ fragment activityFeedNode on ActivityInterface {
   }
   ... on FlagEntityActivity {
     flag {
-      id 
+      id
       name
       link
     }
diff --git a/client/src/app/components/activities/activity-feed/activity-feed.module.ts b/client/src/app/components/activities/activity-feed/activity-feed.module.ts
index 3a5b036ea..25aec7a6d 100644
--- a/client/src/app/components/activities/activity-feed/activity-feed.module.ts
+++ b/client/src/app/components/activities/activity-feed/activity-feed.module.ts
@@ -32,6 +32,7 @@ import { NzCollapseModule } from 'ng-zorro-antd/collapse'
 import { CvcActivityCardModule } from '../activity-card/activity-card.module'
 import { CvcCollapsibleCardModule } from '../collapsible-card/collapsible-card.module'
 import { CvcFeatureTagModule } from '@app/components/features/feature-tag/feature-tag.module'
+import { CvcFeatureVariantTagModule } from '@app/components/shared/feature-variant-tag/feature-variant-tag.module'
 
 @NgModule({
   declarations: [CvcActivityFeedComponent],
@@ -69,7 +70,8 @@ import { CvcFeatureTagModule } from '@app/components/features/feature-tag/featur
     CvcMolecularProfileTagModule,
     CvcRevisionTagModule,
     CvcActivityCardModule,
-    CvcCollapsibleCardModule
+    CvcCollapsibleCardModule,
+    CvcFeatureVariantTagModule
   ],
   exports: [CvcActivityFeedComponent],
 })
diff --git a/client/src/app/components/comments/comment-body/comment-body.component.html b/client/src/app/components/comments/comment-body/comment-body.component.html
index 030580c91..1f90da508 100644
--- a/client/src/app/components/comments/comment-body/comment-body.component.html
+++ b/client/src/app/components/comments/comment-body/comment-body.component.html
@@ -33,13 +33,14 @@
           }"></cvc-feature-tag>
       </span>
       <span *ngSwitchCase="'VARIANT'">
-        <cvc-variant-tag
+        <cvc-feature-variant-tag
           [variant]="{
             id: c.entityId,
             name: c.displayName,
             link: c.link,
-            deprecated: c.deprecated
-          }"></cvc-variant-tag>
+            deprecated: c.deprecated,
+            feature: c.feature
+          }"></cvc-feature-variant-tag>
       </span>
       <span *ngSwitchCase="'VARIANT_GROUP'">
         <cvc-variant-group-tag
diff --git a/client/src/app/components/comments/comment-body/comment-body.module.ts b/client/src/app/components/comments/comment-body/comment-body.module.ts
index f9c9a60aa..fc2a173d9 100644
--- a/client/src/app/components/comments/comment-body/comment-body.module.ts
+++ b/client/src/app/components/comments/comment-body/comment-body.module.ts
@@ -12,6 +12,7 @@ import { NzTagModule } from 'ng-zorro-antd/tag'
 import { NzIconModule } from 'ng-zorro-antd/icon'
 import { CvcMolecularProfileTagModule } from '@app/components/molecular-profiles/molecular-profile-tag/molecular-profile-tag.module'
 import { CvcFeatureTagModule } from '@app/components/features/feature-tag/feature-tag.module'
+import { CvcFeatureVariantTagModule } from '@app/components/shared/feature-variant-tag/feature-variant-tag.module'
 
 @NgModule({
   declarations: [CvcCommentBodyComponent],
@@ -29,6 +30,7 @@ import { CvcFeatureTagModule } from '@app/components/features/feature-tag/featur
     CvcUserTagModule,
     CvcOrganizationTagModule,
     CvcMolecularProfileTagModule,
+    CvcFeatureVariantTagModule
   ],
   exports: [CvcCommentBodyComponent],
 })
diff --git a/client/src/app/components/comments/comment-list/comment-list.query.gql b/client/src/app/components/comments/comment-list/comment-list.query.gql
index b923eeb4b..b525bbc20 100644
--- a/client/src/app/components/comments/comment-list/comment-list.query.gql
+++ b/client/src/app/components/comments/comment-list/comment-list.query.gql
@@ -96,6 +96,11 @@ fragment parsedCommentFragment on CommentBodySegment{
       deprecated
       link
       revisionSetId
+      feature {
+        id
+        name
+        link
+      }
       __typename
     }
     ... on CommentTextSegment {
diff --git a/client/src/app/components/comments/comment-popover/comment-popover.component.html b/client/src/app/components/comments/comment-popover/comment-popover.component.html
index 0d1caf79e..7a4a16775 100644
--- a/client/src/app/components/comments/comment-popover/comment-popover.component.html
+++ b/client/src/app/components/comments/comment-popover/comment-popover.component.html
@@ -23,10 +23,10 @@
               *ngSwitchCase="'EvidenceItem'"
               [enablePopover]="false"
               [evidence]="c.commentable"></cvc-evidence-tag>
-            <cvc-variant-tag
+            <cvc-feature-variant-tag
               *ngSwitchCase="'Variant'"
               [enablePopover]="false"
-              [variant]="c.commentable"></cvc-variant-tag>
+              [variant]="c.commentable"></cvc-feature-variant-tag>
             <!-- NOTE: #UPDATE had to use $any here, [revision] attr was complaining about
             missing linkableRevision on c.commentable -->
             <cvc-revision-tag
diff --git a/client/src/app/components/comments/comment-popover/comment-popover.module.ts b/client/src/app/components/comments/comment-popover/comment-popover.module.ts
index b7f5b8dfc..20f63ab4e 100644
--- a/client/src/app/components/comments/comment-popover/comment-popover.module.ts
+++ b/client/src/app/components/comments/comment-popover/comment-popover.module.ts
@@ -5,13 +5,13 @@ import { LetDirective, PushPipe } from '@ngrx/component'
 import { CvcUserTagModule } from '@app/components/users/user-tag/user-tag.module'
 import { CvcAssertionsTagModule } from '@app/components/assertions/assertions-tag/assertions-tag.module'
 import { CvcEvidenceTagModule } from '@app/components/evidence/evidence-tag/evidence-tag.module'
-import { CvcVariantTagModule } from '@app/components/variants/variant-tag/variant-tag.module'
 import { NzCardModule } from 'ng-zorro-antd/card'
 import { NzGridModule } from 'ng-zorro-antd/grid'
 import { CvcRevisionTagModule } from '@app/components/revisions/revision-tag/revision-tag.module'
 import { CvcSourceTagModule } from '@app/components/sources/source-tag/source-tag.module'
 import { CvcPipesModule } from '@app/core/pipes/pipes.module'
 import { CvcFeatureTagModule } from '@app/components/features/feature-tag/feature-tag.module'
+import { CvcFeatureVariantTagModule } from '@app/components/shared/feature-variant-tag/feature-variant-tag.module'
 
 @NgModule({
   declarations: [CvcCommentPopoverComponent],
@@ -26,7 +26,7 @@ import { CvcFeatureTagModule } from '@app/components/features/feature-tag/featur
     CvcAssertionsTagModule,
     CvcEvidenceTagModule,
     CvcEvidenceTagModule,
-    CvcVariantTagModule,
+    CvcFeatureVariantTagModule,
     CvcRevisionTagModule,
     CvcSourceTagModule,
     CvcPipesModule
diff --git a/client/src/app/components/comments/comment-popover/comment-popover.query.gql b/client/src/app/components/comments/comment-popover/comment-popover.query.gql
index a93b8979a..b0986e637 100644
--- a/client/src/app/components/comments/comment-popover/comment-popover.query.gql
+++ b/client/src/app/components/comments/comment-popover/comment-popover.query.gql
@@ -19,6 +19,14 @@ fragment commentPopover on Comment {
     id
     name
     link
+    ...on Variant {
+      deprecated
+      feature {
+        id
+        name
+        link
+      }
+    }
     __typename
   }
 }
diff --git a/client/src/app/components/events/event-feed/event-feed.gql b/client/src/app/components/events/event-feed/event-feed.gql
index d3f64462d..513a7ac11 100644
--- a/client/src/app/components/events/event-feed/event-feed.gql
+++ b/client/src/app/components/events/event-feed/event-feed.gql
@@ -117,6 +117,11 @@ fragment eventFeedNode on Event {
     }
     ... on Variant {
       deprecated
+      feature {
+        id
+        link
+        name
+      }
     }
     ... on MolecularProfile {
       deprecated
diff --git a/client/src/app/components/events/event-timeline-item/event-timeline-item-module.ts b/client/src/app/components/events/event-timeline-item/event-timeline-item-module.ts
index dd39930da..f078110cc 100644
--- a/client/src/app/components/events/event-timeline-item/event-timeline-item-module.ts
+++ b/client/src/app/components/events/event-timeline-item/event-timeline-item-module.ts
@@ -9,7 +9,6 @@ import { CvcCommentTagModule } from '@app/components/comments/comment-tag/commen
 import { CvcFlagTagModule } from '@app/components/flags/flag-tag/flag-tag.module'
 import { CvcAssertionsTagModule } from '@app/components/assertions/assertions-tag/assertions-tag.module'
 import { CvcEvidenceTagModule } from '@app/components/evidence/evidence-tag/evidence-tag.module'
-import { CvcVariantTagModule } from '@app/components/variants/variant-tag/variant-tag.module'
 import { CvcOrganizationTagModule } from '@app/components/organizations/organization-tag/organization-tag.module'
 import { NzToolTipModule } from 'ng-zorro-antd/tooltip'
 import { NzGridModule } from 'ng-zorro-antd/grid'
@@ -21,6 +20,7 @@ import { NzTagModule } from 'ng-zorro-antd/tag'
 import { RouterModule } from '@angular/router'
 import { CvcMolecularProfileTagModule } from '@app/components/molecular-profiles/molecular-profile-tag/molecular-profile-tag.module'
 import { CvcFeatureTagModule } from '@app/components/features/feature-tag/feature-tag.module'
+import { CvcFeatureVariantTagModule } from '@app/components/shared/feature-variant-tag/feature-variant-tag.module'
 
 @NgModule({
   declarations: [CvcEventTimelineItemComponent],
@@ -41,7 +41,7 @@ import { CvcFeatureTagModule } from '@app/components/features/feature-tag/featur
     CvcFeatureTagModule,
     CvcAssertionsTagModule,
     CvcEvidenceTagModule,
-    CvcVariantTagModule,
+    CvcFeatureVariantTagModule,
     CvcOrganizationTagModule,
     CvcSourceTagModule,
     CvcVariantGroupTagModule,
diff --git a/client/src/app/components/events/event-timeline-item/event-timeline-item.component.html b/client/src/app/components/events/event-timeline-item/event-timeline-item.component.html
index 52db91dc5..2e018ae9b 100644
--- a/client/src/app/components/events/event-timeline-item/event-timeline-item.component.html
+++ b/client/src/app/components/events/event-timeline-item/event-timeline-item.component.html
@@ -75,9 +75,9 @@
       <cvc-evidence-tag
         *ngSwitchCase="'EvidenceItem'"
         [evidence]="subject"></cvc-evidence-tag>
-      <cvc-variant-tag
+      <cvc-feature-variant-tag
         *ngSwitchCase="'Variant'"
-        [variant]="subject"></cvc-variant-tag>
+        [variant]="subject"></cvc-feature-variant-tag>
       <cvc-revision-tag
         *ngSwitchCase="'Revision'"
         [revision]="$any(subject)"></cvc-revision-tag>
diff --git a/client/src/app/components/flags/flag-popover/flag-popover.component.html b/client/src/app/components/flags/flag-popover/flag-popover.component.html
index 1a4c98d82..23728522e 100644
--- a/client/src/app/components/flags/flag-popover/flag-popover.component.html
+++ b/client/src/app/components/flags/flag-popover/flag-popover.component.html
@@ -35,10 +35,10 @@
             *ngSwitchCase="'EvidenceItem'"
             [enablePopover]="false"
             [evidence]="f.flaggable"></cvc-evidence-tag>
-          <cvc-variant-tag
+          <cvc-feature-variant-tag
             *ngSwitchCase="'Variant'"
             [enablePopover]="false"
-            [variant]="f.flaggable"></cvc-variant-tag>
+            [variant]="f.flaggable"></cvc-feature-variant-tag>
           <cvc-variant-group-tag
             *ngSwitchCase="'VariantGroup'"
             [enablePopover]="false"
diff --git a/client/src/app/components/flags/flag-popover/flag-popover.module.ts b/client/src/app/components/flags/flag-popover/flag-popover.module.ts
index fc517e5bb..666521844 100644
--- a/client/src/app/components/flags/flag-popover/flag-popover.module.ts
+++ b/client/src/app/components/flags/flag-popover/flag-popover.module.ts
@@ -4,7 +4,6 @@ import { LetDirective, PushPipe } from '@ngrx/component'
 import { CvcUserTagModule } from '@app/components/users/user-tag/user-tag.module'
 import { CvcAssertionsTagModule } from '@app/components/assertions/assertions-tag/assertions-tag.module'
 import { CvcEvidenceTagModule } from '@app/components/evidence/evidence-tag/evidence-tag.module'
-import { CvcVariantTagModule } from '@app/components/variants/variant-tag/variant-tag.module'
 import { NzCardModule } from 'ng-zorro-antd/card'
 import { NzGridModule } from 'ng-zorro-antd/grid'
 import { CvcVariantGroupTagModule } from '@app/components/variant-groups/variant-group-tag/variant-group-tag.module'
@@ -16,6 +15,7 @@ import { CvcFlagPopoverComponent } from './flag-popover.component'
 import { CvcPipesModule } from '@app/core/pipes/pipes.module'
 import { CvcCommentBodyModule } from '@app/components/comments/comment-body/comment-body.module'
 import { CvcFeatureTagModule } from '@app/components/features/feature-tag/feature-tag.module'
+import { CvcFeatureVariantTagModule } from '@app/components/shared/feature-variant-tag/feature-variant-tag.module'
 
 @NgModule({
   declarations: [CvcFlagPopoverComponent],
@@ -33,7 +33,7 @@ import { CvcFeatureTagModule } from '@app/components/features/feature-tag/featur
     CvcUserTagModule,
     CvcAssertionsTagModule,
     CvcEvidenceTagModule,
-    CvcVariantTagModule,
+    CvcFeatureVariantTagModule,
     CvcVariantGroupTagModule,
     CvcStatusTagModule,
     CvcCommentBodyModule
diff --git a/client/src/app/components/flags/flag-popover/flag-popover.query.gql b/client/src/app/components/flags/flag-popover/flag-popover.query.gql
index ddfccfdf9..a66091098 100644
--- a/client/src/app/components/flags/flag-popover/flag-popover.query.gql
+++ b/client/src/app/components/flags/flag-popover/flag-popover.query.gql
@@ -17,6 +17,14 @@ fragment flagPopover on Flag {
     id
     link
     name
+    ...on Variant {
+      deprecated
+      feature {
+        id
+        name
+        link
+      }
+    }
   }
   createdAt
   openActivity {
diff --git a/client/src/app/components/molecular-profiles/molecular-profile-variant-card/molecular-profile-variant-card.component.html b/client/src/app/components/molecular-profiles/molecular-profile-variant-card/molecular-profile-variant-card.component.html
index d5be2c3b3..41b4226a7 100644
--- a/client/src/app/components/molecular-profiles/molecular-profile-variant-card/molecular-profile-variant-card.component.html
+++ b/client/src/app/components/molecular-profiles/molecular-profile-variant-card/molecular-profile-variant-card.component.html
@@ -1,123 +1,203 @@
-<nz-card [nzTitle]="cardTitle" nzType="inner" nzSize="small">
+<nz-card
+  [nzTitle]="cardTitle"
+  nzType="inner"
+  nzSize="small">
   <ng-template #cardTitle>
-          <i nz-icon nzType="civic-variant" nzTheme="twotone" [nzTwotoneColor]="'Variant' | entityColor"></i>
-          {{variant.name}}
+    <i
+      nz-icon
+      nzType="civic-variant"
+      nzTheme="twotone"
+      [nzTwotoneColor]="'Variant' | entityColor"></i>
+    {{ variant.name }}
   </ng-template>
-  <nz-row [nzGutter]="[8,16]">
-      <nz-col [nzSpan]="24">
-          <nz-row [nzGutter]="[8,8]">
-              <!-- gene attributes block -->
-              <nz-col nzSpan="24">
-                  <nz-descriptions nzLayout="horizontal" nzSize="small" [nzColumn]="4" nzBordered="true">
-                      <nz-descriptions-item [nzSpan]="2" nzTitle="Variant">
-                          <cvc-variant-tag [variant]="variant"></cvc-variant-tag>
-                      </nz-descriptions-item>
-                      <nz-descriptions-item [nzSpan]="2" nzTitle="Feature">
-                          <cvc-feature-tag [feature]="variant.feature"></cvc-feature-tag>
-                      </nz-descriptions-item>
-                      <!-- aliases -->
-                      <nz-descriptions-item [nzSpan]="2" nzTitle="Aliases">
-                          <ng-container *ngIf="variant.variantAliases.length > 0; else noAliases">
-                              <cvc-tag-list>
-                                  <nz-tag *ngFor="let alias of variant.variantAliases">{{ alias }}</nz-tag>
-                              </cvc-tag-list>
-                          </ng-container>
-                          <ng-template #noAliases>
-                              <span nz-typography nzType="secondary">None specified</span>
-                          </ng-template>
-                      </nz-descriptions-item>
+  <nz-row [nzGutter]="[8, 16]">
+    <nz-col [nzSpan]="24">
+      <nz-row [nzGutter]="[8, 8]">
+        <!-- gene attributes block -->
+        <nz-col nzSpan="24">
+          <nz-descriptions
+            nzLayout="horizontal"
+            nzSize="small"
+            [nzColumn]="4"
+            nzBordered="true">
+            <nz-descriptions-item
+              [nzSpan]="4"
+              nzTitle="Variant">
+              <cvc-feature-variant-tag
+                [variant]="variant"></cvc-feature-variant-tag>
+            </nz-descriptions-item>
+            <!-- aliases -->
+            <nz-descriptions-item
+              [nzSpan]="2"
+              nzTitle="Aliases">
+              <ng-container
+                *ngIf="variant.variantAliases.length > 0; else noAliases">
+                <cvc-tag-list>
+                  <nz-tag *ngFor="let alias of variant.variantAliases">{{
+                    alias
+                  }}</nz-tag>
+                </cvc-tag-list>
+              </ng-container>
+              <ng-template #noAliases>
+                <span
+                  nz-typography
+                  nzType="secondary"
+                  >None specified</span
+                >
+              </ng-template>
+            </nz-descriptions-item>
 
-                      <!-- variant type(s) -->
-                      <nz-descriptions-item
-                          [nzSpan]="2"
-                          [nzTitle]="variant.variantTypes.length > 1 ? 'Variant Types' : 'Variant Type'">
-                          <ng-container *ngIf="variant.variantTypes.length > 0; else noTypes">
-                              <cvc-tag-list>
-                                  <cvc-variant-type-tag [variantType]="type" *ngFor="let type of variant.variantTypes">
-                                  </cvc-variant-type-tag>
-                              </cvc-tag-list>
-                          </ng-container>
-                          <ng-template #noTypes>
-                              <span nz-typography nzType="secondary">None specified</span>
-                          </ng-template>
-                      </nz-descriptions-item>
+            <!-- variant type(s) -->
+            <nz-descriptions-item
+              [nzSpan]="2"
+              [nzTitle]="
+                variant.variantTypes.length > 1
+                  ? 'Variant Types'
+                  : 'Variant Type'
+              ">
+              <ng-container
+                *ngIf="variant.variantTypes.length > 0; else noTypes">
+                <cvc-tag-list>
+                  <cvc-variant-type-tag
+                    [variantType]="type"
+                    *ngFor="let type of variant.variantTypes">
+                  </cvc-variant-type-tag>
+                </cvc-tag-list>
+              </ng-container>
+              <ng-template #noTypes>
+                <span
+                  nz-typography
+                  nzType="secondary"
+                  >None specified</span
+                >
+              </ng-template>
+            </nz-descriptions-item>
 
-                      <!-- allele reg. id -->
-                      <nz-descriptions-item 
-                          [nzSpan]="2"
-                          nzTitle="Allele Registry ID">
-                          <ng-container *ngIf="variant.alleleRegistryId; else noAlleleRegistry">
-                              <cvc-link-tag 
-                                  [href]="'https://reg.genome.network/allele/' + variant.alleleRegistryId + '.html'"
-                                  tooltip="View on ClinGen Allele Registry">
-                                  {{ variant.alleleRegistryId }}
-                              </cvc-link-tag>
-                          </ng-container>
-                          <ng-template #noAlleleRegistry>
-                              <span nz-typography nzType="secondary">None provided</span>
-                          </ng-template>
-                      </nz-descriptions-item>
+            <!-- allele reg. id -->
+            <nz-descriptions-item
+              [nzSpan]="2"
+              nzTitle="Allele Registry ID">
+              <ng-container
+                *ngIf="variant.alleleRegistryId; else noAlleleRegistry">
+                <cvc-link-tag
+                  [href]="
+                    'https://reg.genome.network/allele/' +
+                    variant.alleleRegistryId +
+                    '.html'
+                  "
+                  tooltip="View on ClinGen Allele Registry">
+                  {{ variant.alleleRegistryId }}
+                </cvc-link-tag>
+              </ng-container>
+              <ng-template #noAlleleRegistry>
+                <span
+                  nz-typography
+                  nzType="secondary"
+                  >None provided</span
+                >
+              </ng-template>
+            </nz-descriptions-item>
 
-                      <!-- clinvar ids-->
-                      <nz-descriptions-item [nzSpan]="2" [nzTitle]="variant.clinvarIds.length > 1 ? 'ClinVar IDs' : 'ClinVar ID'">
-                          <ng-container *ngIf="variant.clinvarIds.length > 0 else noClinvarIds">
-                              <cvc-tag-list *ngIf="variant.clinvarIds[0] !== 'N/A' else clinvarNotApplicable">
-                                  <ng-container *ngFor="let id of variant.clinvarIds">
-                                      <cvc-link-tag [href]="'https://www.ncbi.nlm.nih.gov/clinvar/variation/' + id"
-                                          tooltip="View on ClinVar">
-                                          {{ id }}
-                                      </cvc-link-tag>
-                                  </ng-container>
-                              </cvc-tag-list>
-                          </ng-container>
+            <!-- clinvar ids-->
+            <nz-descriptions-item
+              [nzSpan]="2"
+              [nzTitle]="
+                variant.clinvarIds.length > 1 ? 'ClinVar IDs' : 'ClinVar ID'
+              ">
+              <ng-container
+                *ngIf="variant.clinvarIds.length > 0; else noClinvarIds">
+                <cvc-tag-list
+                  *ngIf="
+                    variant.clinvarIds[0] !== 'N/A';
+                    else clinvarNotApplicable
+                  ">
+                  <ng-container *ngFor="let id of variant.clinvarIds">
+                    <cvc-link-tag
+                      [href]="
+                        'https://www.ncbi.nlm.nih.gov/clinvar/variation/' + id
+                      "
+                      tooltip="View on ClinVar">
+                      {{ id }}
+                    </cvc-link-tag>
+                  </ng-container>
+                </cvc-tag-list>
+              </ng-container>
 
-                          <ng-template #clinvarNotApplicable>
-                              <span nz-typography nzType="secondary">N/A</span>
-                          </ng-template>
+              <ng-template #clinvarNotApplicable>
+                <span
+                  nz-typography
+                  nzType="secondary"
+                  >N/A</span
+                >
+              </ng-template>
 
-                          <ng-template #noClinvarIds>
-                              <span nz-typography nzType="secondary">None provided</span>
-                          </ng-template>
-                      </nz-descriptions-item>
+              <ng-template #noClinvarIds>
+                <span
+                  nz-typography
+                  nzType="secondary"
+                  >None provided</span
+                >
+              </ng-template>
+            </nz-descriptions-item>
 
-                      <nz-descriptions-item
-                          [nzSpan]="2"
-                          nzTitle="OpenCRAVAT">
-                          <cvc-link-tag *ngIf="variant.openCravatUrl; else noCravat"
-                              [href]="variant.openCravatUrl"
-                              tooltip="View on OpenCRAVAT">
-                              Variant Report
-                          </cvc-link-tag>
-                          <ng-template #noCravat>
-                              <span nz-typography nzType="secondary">Allele Registry ID required.</span>
-                          </ng-template>
-                      </nz-descriptions-item>
+            <nz-descriptions-item
+              [nzSpan]="2"
+              nzTitle="OpenCRAVAT">
+              <cvc-link-tag
+                *ngIf="variant.openCravatUrl; else noCravat"
+                [href]="variant.openCravatUrl"
+                tooltip="View on OpenCRAVAT">
+                Variant Report
+              </cvc-link-tag>
+              <ng-template #noCravat>
+                <span
+                  nz-typography
+                  nzType="secondary"
+                  >Allele Registry ID required.</span
+                >
+              </ng-template>
+            </nz-descriptions-item>
 
+            <nz-descriptions-item
+              [nzSpan]="4"
+              *ngIf="this.displayMps.length > 0"
+              nzTitle="Other Molecular Profiles">
+              <cvc-tag-list>
+                <ng-container *ngFor="let mp of this.displayMps">
+                  <cvc-molecular-profile-tag
+                    [molecularProfile]="mp"
+                    [truncateLongName]="true"></cvc-molecular-profile-tag>
+                </ng-container>
+                <ng-container
+                  *ngIf="
+                    variant.molecularProfiles.totalCount >
+                    this.displayMps.length + 1
+                  ">
+                  <a routerLink="/variants/{{ variant.id }}/summary">
+                    + view
+                    {{
+                      variant.molecularProfiles.totalCount -
+                        this.displayMps.length
+                    }}
+                    more
+                  </a>
+                </ng-container>
+              </cvc-tag-list>
+            </nz-descriptions-item>
+          </nz-descriptions>
+        </nz-col>
 
-                      <nz-descriptions-item [nzSpan]="4" *ngIf="this.displayMps.length > 0" nzTitle="Other Molecular Profiles">
-                          <cvc-tag-list>
-                              <ng-container *ngFor="let mp of this.displayMps">
-                                  <cvc-molecular-profile-tag [molecularProfile]="mp" [truncateLongName]="true"></cvc-molecular-profile-tag>
-                              </ng-container>
-                              <ng-container *ngIf="variant.molecularProfiles.totalCount > (this.displayMps.length + 1)">
-                                  <a routerLink="/variants/{{variant.id}}/summary">
-                                     + view {{ variant.molecularProfiles.totalCount - this.displayMps.length}} more
-                                  </a>
-                              </ng-container>
-                          </cvc-tag-list>
-                      </nz-descriptions-item>
-                  </nz-descriptions>
-              </nz-col>
-
-              <!-- coordinates -->
-              <nz-col [nzSpan]="24">
-                  <nz-collapse>
-                      <nz-collapse-panel nzHeader="Representative Variant Coordinates">
-                          <cvc-coordinates-card [displayTitle]="false" [cvcCoordinates]="variant"></cvc-coordinates-card>
-                      </nz-collapse-panel>
-                  </nz-collapse>
-              </nz-col>
-          </nz-row>
-      </nz-col>
+        <!-- coordinates -->
+        <nz-col [nzSpan]="24">
+          <nz-collapse>
+            <nz-collapse-panel nzHeader="Representative Variant Coordinates">
+              <cvc-coordinates-card
+                [displayTitle]="false"
+                [cvcCoordinates]="variant"></cvc-coordinates-card>
+            </nz-collapse-panel>
+          </nz-collapse>
+        </nz-col>
+      </nz-row>
+    </nz-col>
   </nz-row>
-</nz-card>
\ No newline at end of file
+</nz-card>
diff --git a/client/src/app/components/molecular-profiles/molecular-profile-variant-card/molecular-profile-variant-card.module.ts b/client/src/app/components/molecular-profiles/molecular-profile-variant-card/molecular-profile-variant-card.module.ts
index 385e130f8..4ff4d3fd8 100644
--- a/client/src/app/components/molecular-profiles/molecular-profile-variant-card/molecular-profile-variant-card.module.ts
+++ b/client/src/app/components/molecular-profiles/molecular-profile-variant-card/molecular-profile-variant-card.module.ts
@@ -19,6 +19,7 @@ import { NzCollapseModule } from 'ng-zorro-antd/collapse'
 import { CvcCoordinatesCardModule } from '@app/components/variants/coordinates-card/coordinates-card.module'
 import { NzSpaceModule } from 'ng-zorro-antd/space'
 import { CvcFeatureTagModule } from '@app/components/features/feature-tag/feature-tag.module'
+import { CvcFeatureVariantTagModule } from '@app/components/shared/feature-variant-tag/feature-variant-tag.module'
 
 @NgModule({
   declarations: [CvcMolecularProfileVariantCardComponent],
@@ -43,6 +44,7 @@ import { CvcFeatureTagModule } from '@app/components/features/feature-tag/featur
     CvcTagListModule,
     CvcMolecularProfileTagModule,
     CvcCoordinatesCardModule,
+    CvcFeatureVariantTagModule
   ],
   exports: [CvcMolecularProfileVariantCardComponent],
 })
diff --git a/client/src/app/components/revisions/revision-list/revision-list.component.html b/client/src/app/components/revisions/revision-list/revision-list.component.html
index 9dc5725f3..6afe4e006 100644
--- a/client/src/app/components/revisions/revision-list/revision-list.component.html
+++ b/client/src/app/components/revisions/revision-list/revision-list.component.html
@@ -247,12 +247,14 @@
               <ng-template
                 #itemTemplate
                 let-item>
-                <cvc-variant-tag
+                <cvc-feature-variant-tag
                   [variant]="{
                     id: item.id,
                     name: item.displayName,
-                    link: item.link
-                  }"></cvc-variant-tag>
+                    link: item.link,
+                    feature: item.feature,
+                    deprecated: item.deprecated
+                  }"></cvc-feature-variant-tag>
               </ng-template>
             </cvc-revision-list-diff>
           </ng-container>
@@ -263,12 +265,14 @@
               <ng-template
                 #itemTemplate
                 let-item>
-                <cvc-variant-tag
+                <cvc-feature-variant-tag
                   [variant]="{
                     id: item.id,
                     name: item.displayName,
-                    link: item.link
-                  }"></cvc-variant-tag>
+                    link: item.link,
+                    feature: item.feature,
+                    deprecated: item.deprecated
+                  }"></cvc-feature-variant-tag>
               </ng-template>
             </cvc-revision-list-diff>
           </ng-container>
diff --git a/client/src/app/components/revisions/revision-list/revision-list.module.ts b/client/src/app/components/revisions/revision-list/revision-list.module.ts
index 302f58701..72e45a908 100644
--- a/client/src/app/components/revisions/revision-list/revision-list.module.ts
+++ b/client/src/app/components/revisions/revision-list/revision-list.module.ts
@@ -14,7 +14,6 @@ import { NzAvatarModule } from 'ng-zorro-antd/avatar'
 import { CvcUserTagModule } from '@app/components/users/user-tag/user-tag.module'
 import { CvcDiseaseTagModule } from '@app/components/diseases/cvc-disease-tag/cvc-disease-tag.module'
 import { CvcPhenotypeTagModule } from '@app/components/phenotypes/phenotype-tag/phenotype-tag.module'
-import { CvcVariantTagModule } from '@app/components/variants/variant-tag/variant-tag.module'
 import { CvcVariantTypeTagModule } from '@app/components/variant-types/variant-type-tag/variant-type-tag.module'
 import { NzCollapseModule } from 'ng-zorro-antd/collapse'
 import { NzEmptyModule } from 'ng-zorro-antd/empty'
@@ -37,6 +36,7 @@ import { CvcEvidenceTagModule } from '@app/components/evidence/evidence-tag/evid
 import { CvcTherapyTagModule } from '@app/components/therapies/cvc-therapy-tag/cvc-therapy-tag.module'
 import { CvcMolecularProfileTagModule } from '@app/components/molecular-profiles/molecular-profile-tag/molecular-profile-tag.module'
 import { CvcFeatureTagModule } from '@app/components/features/feature-tag/feature-tag.module'
+import { CvcFeatureVariantTagModule } from '@app/components/shared/feature-variant-tag/feature-variant-tag.module'
 
 @NgModule({
   declarations: [RevisionListComponent],
@@ -68,7 +68,7 @@ import { CvcFeatureTagModule } from '@app/components/features/feature-tag/featur
     CvcDiseaseTagModule,
     CvcTherapyTagModule,
     CvcPhenotypeTagModule,
-    CvcVariantTagModule,
+    CvcFeatureVariantTagModule,
     CvcEvidenceTagModule,
     CvcVariantTypeTagModule,
     CvcStatusTagModule,
diff --git a/client/src/app/components/revisions/revision-popover/revision-popover.component.html b/client/src/app/components/revisions/revision-popover/revision-popover.component.html
index 586c58e06..c9594fd01 100644
--- a/client/src/app/components/revisions/revision-popover/revision-popover.component.html
+++ b/client/src/app/components/revisions/revision-popover/revision-popover.component.html
@@ -35,10 +35,10 @@
             *ngSwitchCase="'EvidenceItem'"
             [enablePopover]="false"
             [evidence]="r.subject"></cvc-evidence-tag>
-          <cvc-variant-tag
+          <cvc-feature-variant-tag
             *ngSwitchCase="'Variant'"
             [enablePopover]="false"
-            [variant]="r.subject"></cvc-variant-tag>
+            [variant]="r.subject"></cvc-feature-variant-tag>
           <cvc-variant-group-tag
             *ngSwitchCase="'VariantGroup'"
             [enablePopover]="false"
diff --git a/client/src/app/components/revisions/revision-popover/revision-popover.module.ts b/client/src/app/components/revisions/revision-popover/revision-popover.module.ts
index 5eea118cb..8f4faf0bd 100644
--- a/client/src/app/components/revisions/revision-popover/revision-popover.module.ts
+++ b/client/src/app/components/revisions/revision-popover/revision-popover.module.ts
@@ -5,7 +5,6 @@ import { LetDirective, PushPipe } from '@ngrx/component'
 import { CvcUserTagModule } from '@app/components/users/user-tag/user-tag.module'
 import { CvcAssertionsTagModule } from '@app/components/assertions/assertions-tag/assertions-tag.module'
 import { CvcEvidenceTagModule } from '@app/components/evidence/evidence-tag/evidence-tag.module'
-import { CvcVariantTagModule } from '@app/components/variants/variant-tag/variant-tag.module'
 import { NzCardModule } from 'ng-zorro-antd/card'
 import { NzGridModule } from 'ng-zorro-antd/grid'
 import { CvcVariantGroupTagModule } from '@app/components/variant-groups/variant-group-tag/variant-group-tag.module'
@@ -17,6 +16,7 @@ import { RevisionListDiffModule } from '../revision-list-diff/revision-list-diff
 import { CvcPipesModule } from '@app/core/pipes/pipes.module'
 import { CvcCommentBodyModule } from '@app/components/comments/comment-body/comment-body.module'
 import { CvcFeatureTagModule } from '@app/components/features/feature-tag/feature-tag.module'
+import { CvcFeatureVariantTagModule } from '@app/components/shared/feature-variant-tag/feature-variant-tag.module'
 
 @NgModule({
   declarations: [CvcRevisionPopoverComponent],
@@ -34,7 +34,7 @@ import { CvcFeatureTagModule } from '@app/components/features/feature-tag/featur
     CvcUserTagModule,
     CvcAssertionsTagModule,
     CvcEvidenceTagModule,
-    CvcVariantTagModule,
+    CvcFeatureVariantTagModule,
     CvcVariantGroupTagModule,
     CvcStatusTagModule,
     CvcCommentBodyModule,
diff --git a/client/src/app/components/revisions/revision-popover/revision-popover.query.gql b/client/src/app/components/revisions/revision-popover/revision-popover.query.gql
index 0973f27b7..a0f8efbb9 100644
--- a/client/src/app/components/revisions/revision-popover/revision-popover.query.gql
+++ b/client/src/app/components/revisions/revision-popover/revision-popover.query.gql
@@ -23,6 +23,14 @@ fragment revisionPopover on Revision {
     id
     link
     name
+    ... on Variant {
+      deprecated
+      feature {
+        id
+        name
+        link
+      }
+    }
   }
   createdAt
   linkoutData {
diff --git a/client/src/app/components/revisions/revisions-list-and-filter/revisions-list-and-filter.query.gql b/client/src/app/components/revisions/revisions-list-and-filter/revisions-list-and-filter.query.gql
index 1c6bd2faa..921afacfa 100644
--- a/client/src/app/components/revisions/revisions-list-and-filter/revisions-list-and-filter.query.gql
+++ b/client/src/app/components/revisions/revisions-list-and-filter/revisions-list-and-filter.query.gql
@@ -70,6 +70,12 @@ fragment revision on Revision {
           entityType
           link
           deleted
+          deprecated
+          feature {
+            link
+            id
+            name
+          }
         }
         addedObjects {
           id
@@ -78,6 +84,12 @@ fragment revision on Revision {
           entityType
           link
           deleted
+          deprecated
+          feature {
+            link
+            id
+            name
+          }
         }
         removedObjects {
           id
@@ -86,6 +98,12 @@ fragment revision on Revision {
           entityType
           link
           deleted
+          deprecated
+          feature {
+            link
+            id
+            name
+          }
         }
         keptObjects {
           id
@@ -94,6 +112,12 @@ fragment revision on Revision {
           entityType
           link
           deleted
+          deprecated
+          feature {
+            link
+            id
+            name
+          }
         }
         suggestedObjects {
           id
@@ -102,6 +126,12 @@ fragment revision on Revision {
           entityType
           link
           deleted
+          deprecated
+          feature {
+            link
+            id
+            name
+          }
         }
       }
       ... on ScalarFieldDiff {
diff --git a/client/src/app/components/shared/feature-variant-tag/feature-variant-tag.component.html b/client/src/app/components/shared/feature-variant-tag/feature-variant-tag.component.html
new file mode 100644
index 000000000..2943bc31d
--- /dev/null
+++ b/client/src/app/components/shared/feature-variant-tag/feature-variant-tag.component.html
@@ -0,0 +1,10 @@
+<cvc-tag-group>
+  <cvc-feature-tag
+    [feature]="feature"
+    [enablePopover]="enablePopover"
+    [truncateLongName]="truncateLongName"></cvc-feature-tag>
+  <cvc-variant-tag
+    [variant]="variant"
+    [enablePopover]="enablePopover"
+    [truncateLongName]="truncateLongName"></cvc-variant-tag>
+</cvc-tag-group>
diff --git a/client/src/app/components/shared/feature-variant-tag/feature-variant-tag.component.less b/client/src/app/components/shared/feature-variant-tag/feature-variant-tag.component.less
new file mode 100644
index 000000000..410befe42
--- /dev/null
+++ b/client/src/app/components/shared/feature-variant-tag/feature-variant-tag.component.less
@@ -0,0 +1,5 @@
+@import "themes/overrides/entity-tag-overrides.less";
+
+:host {
+  display: inline-block;
+}
diff --git a/client/src/app/components/shared/feature-variant-tag/feature-variant-tag.component.ts b/client/src/app/components/shared/feature-variant-tag/feature-variant-tag.component.ts
new file mode 100644
index 000000000..f88c37dc1
--- /dev/null
+++ b/client/src/app/components/shared/feature-variant-tag/feature-variant-tag.component.ts
@@ -0,0 +1,55 @@
+import {
+  ChangeDetectionStrategy,
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core'
+import { Maybe } from '@app/generated/civic.apollo'
+
+export interface LinkableFeature {
+  id: number
+  name: string
+  link: string
+}
+
+export interface LinkableVariant {
+  id: number
+  name: string
+  link: string
+  flagged?: boolean
+  deprecated?: boolean
+  feature?: LinkableFeature
+}
+
+@Component({
+  selector: 'cvc-feature-variant-tag',
+  templateUrl: './feature-variant-tag.component.html',
+  styleUrls: ['./feature-variant-tag.component.less'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class CvcFeatureVariantTagComponent implements OnInit {
+  @Input() variant!: LinkableVariant
+  @Input() feature!: LinkableFeature
+  @Input() enablePopover: Maybe<boolean> = true
+  @Input() truncateLongName: Maybe<boolean> = false
+
+  constructor() {
+  }
+
+  ngOnInit() {
+    if (this.variant === undefined) {
+      throw new Error(
+        'cvc-feature-variant-tag requires LinkableVariant input, none supplied.'
+      )
+    }
+    if (this.variant.feature) {
+      this.feature = this.variant.feature
+    }
+    if (this.feature === undefined) {
+      throw new Error(
+        'cvc-feature-variant-tag requires a Feature, either as an input or on the Variant'
+      )
+
+    }
+  }
+}
diff --git a/client/src/app/components/shared/feature-variant-tag/feature-variant-tag.module.ts b/client/src/app/components/shared/feature-variant-tag/feature-variant-tag.module.ts
new file mode 100644
index 000000000..c96c2f0dd
--- /dev/null
+++ b/client/src/app/components/shared/feature-variant-tag/feature-variant-tag.module.ts
@@ -0,0 +1,28 @@
+import { NgModule } from '@angular/core'
+import { CommonModule } from '@angular/common'
+import { RouterModule } from '@angular/router'
+import { NzTagModule } from 'ng-zorro-antd/tag'
+import { NzIconModule } from 'ng-zorro-antd/icon'
+import { NzPopoverModule } from 'ng-zorro-antd/popover'
+import { CvcPipesModule } from '@app/core/pipes/pipes.module'
+import { CvcVariantTagModule } from '@app/components/variants/variant-tag/variant-tag.module'
+import { CvcFeatureTagModule } from '@app/components/features/feature-tag/feature-tag.module'
+import { CvcTagGroupModule } from '../tag-group/tag-group.module'
+import { CvcFeatureVariantTagComponent } from './feature-variant-tag.component'
+
+@NgModule({
+  declarations: [CvcFeatureVariantTagComponent],
+  imports: [
+    CommonModule,
+    RouterModule,
+    NzTagModule,
+    NzPopoverModule,
+    NzIconModule,
+    CvcPipesModule,
+    CvcVariantTagModule,
+    CvcFeatureTagModule,
+    CvcTagGroupModule
+  ],
+  exports: [CvcFeatureVariantTagComponent],
+})
+export class CvcFeatureVariantTagModule {}
diff --git a/client/src/app/components/variant-groups/variant-group-popover/variant-group-popover.component.html b/client/src/app/components/variant-groups/variant-group-popover/variant-group-popover.component.html
index 6da6d97d2..5dab7e42f 100644
--- a/client/src/app/components/variant-groups/variant-group-popover/variant-group-popover.component.html
+++ b/client/src/app/components/variant-groups/variant-group-popover/variant-group-popover.component.html
@@ -25,10 +25,10 @@
           nzSpan="2"
           *ngIf="variantGroup.variants.edges.length > 0">
           <cvc-tag-list>
-            <cvc-variant-tag
+            <cvc-feature-variant-tag
               *ngFor="let variant of variantGroup.variants.edges"
               [enablePopover]="false"
-              [variant]="variant.node!"></cvc-variant-tag>
+              [variant]="variant.node!"></cvc-feature-variant-tag>
           </cvc-tag-list>
         </nz-descriptions-item>
 
diff --git a/client/src/app/components/variant-groups/variant-group-popover/variant-group-popover.module.ts b/client/src/app/components/variant-groups/variant-group-popover/variant-group-popover.module.ts
index 7596cd488..e419d7234 100644
--- a/client/src/app/components/variant-groups/variant-group-popover/variant-group-popover.module.ts
+++ b/client/src/app/components/variant-groups/variant-group-popover/variant-group-popover.module.ts
@@ -1,8 +1,8 @@
 import { CommonModule } from '@angular/common'
 import { NgModule } from '@angular/core'
+import { CvcFeatureVariantTagModule } from '@app/components/shared/feature-variant-tag/feature-variant-tag.module'
 import { CvcTagListModule } from '@app/components/shared/tag-list/tag-list.module'
 import { CvcSourceTagModule } from '@app/components/sources/source-tag/source-tag.module'
-import { CvcVariantTagModule } from '@app/components/variants/variant-tag/variant-tag.module'
 import { CvcPipesModule } from '@app/core/pipes/pipes.module'
 import { LetDirective, PushPipe } from '@ngrx/component'
 import { NzCardModule } from 'ng-zorro-antd/card'
@@ -22,7 +22,7 @@ import { CvcVariantGroupPopoverComponent } from './variant-group-popover.compone
     NzIconModule,
 
     CvcSourceTagModule,
-    CvcVariantTagModule,
+    CvcFeatureVariantTagModule,
     CvcTagListModule,
     CvcPipesModule,
   ],
diff --git a/client/src/app/components/variant-groups/variant-group-popover/variant-group-popover.query.gql b/client/src/app/components/variant-groups/variant-group-popover/variant-group-popover.query.gql
index 6b77e9480..8cb9f1f45 100644
--- a/client/src/app/components/variant-groups/variant-group-popover/variant-group-popover.query.gql
+++ b/client/src/app/components/variant-groups/variant-group-popover/variant-group-popover.query.gql
@@ -14,6 +14,12 @@ fragment variantGroupPopoverFields on VariantGroup {
         id
         name
         link
+        deprecated
+        feature {
+          id
+          name
+          link
+        }
       }
     }
   }
diff --git a/client/src/app/forms/components/comment-input/comment-input.form.ts b/client/src/app/forms/components/comment-input/comment-input.form.ts
index 5f753c975..798a1651d 100644
--- a/client/src/app/forms/components/comment-input/comment-input.form.ts
+++ b/client/src/app/forms/components/comment-input/comment-input.form.ts
@@ -12,7 +12,7 @@ import { Subject, Observable } from 'rxjs'
 
 import {
   PreviewCommentGQL,
-  PreviewCommentFragment,
+  ParsedCommentFragmentFragment,
   UserTypeaheadGQL,
   UserTypeaheadQuery,
   UserTypeaheadQueryVariables,
@@ -47,7 +47,7 @@ export class CvcCommentInputForm implements OnDestroy, OnChanges {
 
   private destroy$ = new Subject<void>()
 
-  previewComment$?: Observable<PreviewCommentFragment[]>
+  previewComment$?: Observable<ParsedCommentFragmentFragment[]>
   previewLoading$?: Observable<boolean>
 
   suggestions: WithDisplayNameAndValue[] = []
diff --git a/client/src/app/forms/components/comment-input/comment-input.mutation.gql b/client/src/app/forms/components/comment-input/comment-input.mutation.gql
index 1b3a995b3..269ac7ae9 100644
--- a/client/src/app/forms/components/comment-input/comment-input.mutation.gql
+++ b/client/src/app/forms/components/comment-input/comment-input.mutation.gql
@@ -1,29 +1,6 @@
 query previewComment($commentText: String!) {
   previewCommentText(commentText: $commentText) {
-    ...previewComment
-  }
-}
-
-fragment previewComment on CommentBodySegment {
-  __typename
-  ... on CommentTagSegment {
-    entityId
-    displayName
-    tagType
-    link
-    status
-    deprecated
-    __typename
-  }
-  ... on CommentTextSegment {
-    text
-    __typename
-  }
-  ... on User {
-    id
-    displayName
-    role
-    __typename
+    ...parsedCommentFragment
   }
 }
 
diff --git a/client/src/app/generated/civic.apollo-helpers.ts b/client/src/app/generated/civic.apollo-helpers.ts
index 01383a7bd..350f2c210 100644
--- a/client/src/app/generated/civic.apollo-helpers.ts
+++ b/client/src/app/generated/civic.apollo-helpers.ts
@@ -494,11 +494,12 @@ export type CommentEdgeFieldPolicy = {
 	cursor?: FieldPolicy<any> | FieldReadFunction<any>,
 	node?: FieldPolicy<any> | FieldReadFunction<any>
 };
-export type CommentTagSegmentKeySpecifier = ('deprecated' | 'displayName' | 'entityId' | 'link' | 'revisionSetId' | 'status' | 'tagType' | CommentTagSegmentKeySpecifier)[];
+export type CommentTagSegmentKeySpecifier = ('deprecated' | 'displayName' | 'entityId' | 'feature' | 'link' | 'revisionSetId' | 'status' | 'tagType' | CommentTagSegmentKeySpecifier)[];
 export type CommentTagSegmentFieldPolicy = {
 	deprecated?: FieldPolicy<any> | FieldReadFunction<any>,
 	displayName?: FieldPolicy<any> | FieldReadFunction<any>,
 	entityId?: FieldPolicy<any> | FieldReadFunction<any>,
+	feature?: FieldPolicy<any> | FieldReadFunction<any>,
 	link?: FieldPolicy<any> | FieldReadFunction<any>,
 	revisionSetId?: FieldPolicy<any> | FieldReadFunction<any>,
 	status?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -1000,8 +1001,10 @@ export type LinkableTherapyFieldPolicy = {
 	link?: FieldPolicy<any> | FieldReadFunction<any>,
 	name?: FieldPolicy<any> | FieldReadFunction<any>
 };
-export type LinkableVariantKeySpecifier = ('id' | 'link' | 'name' | LinkableVariantKeySpecifier)[];
+export type LinkableVariantKeySpecifier = ('deprecated' | 'feature' | 'id' | 'link' | 'name' | LinkableVariantKeySpecifier)[];
 export type LinkableVariantFieldPolicy = {
+	deprecated?: FieldPolicy<any> | FieldReadFunction<any>,
+	feature?: FieldPolicy<any> | FieldReadFunction<any>,
 	id?: FieldPolicy<any> | FieldReadFunction<any>,
 	link?: FieldPolicy<any> | FieldReadFunction<any>,
 	name?: FieldPolicy<any> | FieldReadFunction<any>
@@ -1053,12 +1056,14 @@ export type ModerateEvidenceItemPayloadFieldPolicy = {
 	clientMutationId?: FieldPolicy<any> | FieldReadFunction<any>,
 	evidenceItem?: FieldPolicy<any> | FieldReadFunction<any>
 };
-export type ModeratedObjectFieldKeySpecifier = ('deleted' | 'displayName' | 'displayType' | 'entityType' | 'id' | 'link' | ModeratedObjectFieldKeySpecifier)[];
+export type ModeratedObjectFieldKeySpecifier = ('deleted' | 'deprecated' | 'displayName' | 'displayType' | 'entityType' | 'feature' | 'id' | 'link' | ModeratedObjectFieldKeySpecifier)[];
 export type ModeratedObjectFieldFieldPolicy = {
 	deleted?: FieldPolicy<any> | FieldReadFunction<any>,
+	deprecated?: FieldPolicy<any> | FieldReadFunction<any>,
 	displayName?: FieldPolicy<any> | FieldReadFunction<any>,
 	displayType?: FieldPolicy<any> | FieldReadFunction<any>,
 	entityType?: FieldPolicy<any> | FieldReadFunction<any>,
+	feature?: FieldPolicy<any> | FieldReadFunction<any>,
 	id?: FieldPolicy<any> | FieldReadFunction<any>,
 	link?: FieldPolicy<any> | FieldReadFunction<any>
 };
diff --git a/client/src/app/generated/civic.apollo.ts b/client/src/app/generated/civic.apollo.ts
index 864040b58..30edba0e9 100644
--- a/client/src/app/generated/civic.apollo.ts
+++ b/client/src/app/generated/civic.apollo.ts
@@ -1025,6 +1025,7 @@ export type CommentTagSegment = {
   deprecated?: Maybe<Scalars['Boolean']>;
   displayName: Scalars['String'];
   entityId: Scalars['Int'];
+  feature?: Maybe<LinkableFeature>;
   link: Scalars['String'];
   revisionSetId?: Maybe<Scalars['Int']>;
   status?: Maybe<EvidenceStatus>;
@@ -2399,6 +2400,8 @@ export type LinkableTherapy = {
 
 export type LinkableVariant = {
   __typename: 'LinkableVariant';
+  deprecated?: Maybe<Scalars['Boolean']>;
+  feature?: Maybe<LinkableFeature>;
   id: Scalars['Int'];
   link: Scalars['String'];
   name: Scalars['String'];
@@ -2524,9 +2527,11 @@ export type ModeratedInput = {
 export type ModeratedObjectField = {
   __typename: 'ModeratedObjectField';
   deleted: Scalars['Boolean'];
+  deprecated?: Maybe<Scalars['Boolean']>;
   displayName?: Maybe<Scalars['String']>;
   displayType?: Maybe<Scalars['String']>;
   entityType: Scalars['String'];
+  feature?: Maybe<LinkableFeature>;
   id: Scalars['Int'];
   link?: Maybe<Scalars['String']>;
 };
@@ -5974,41 +5979,41 @@ export type ActivityFeedQueryVariables = Exact<{
 }>;
 
 
-export type ActivityFeedQuery = { __typename: 'Query', activities: { __typename: 'ActivityInterfaceConnection', pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, edges: Array<{ __typename: 'ActivityInterfaceEdge', cursor: string, node?: { __typename: 'AcceptRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CommentActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CreateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CreateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'DeprecateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'DeprecateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'FlagEntityActivity', id: number, verbiage: string, createdAt: any, flag: { __typename: 'Flag', id: number, name: string, link: string }, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ModerateAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ModerateEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'RejectRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ResolveFlagActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SubmitAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SubmitEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SuggestRevisionSetActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SuggestSourceActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'UpdateSourceSuggestionStatusActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | undefined }> } };
+export type ActivityFeedQuery = { __typename: 'Query', activities: { __typename: 'ActivityInterfaceConnection', pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, edges: Array<{ __typename: 'ActivityInterfaceEdge', cursor: string, node?: { __typename: 'AcceptRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CommentActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CreateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CreateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'DeprecateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'DeprecateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'FlagEntityActivity', id: number, verbiage: string, createdAt: any, flag: { __typename: 'Flag', id: number, name: string, link: string }, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ModerateAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ModerateEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'RejectRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ResolveFlagActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SubmitAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SubmitEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SuggestRevisionSetActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SuggestSourceActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'UpdateSourceSuggestionStatusActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | undefined }> } };
 
-export type ActivityFeedFragment = { __typename: 'ActivityInterfaceConnection', pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, edges: Array<{ __typename: 'ActivityInterfaceEdge', cursor: string, node?: { __typename: 'AcceptRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CommentActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CreateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CreateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'DeprecateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'DeprecateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'FlagEntityActivity', id: number, verbiage: string, createdAt: any, flag: { __typename: 'Flag', id: number, name: string, link: string }, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ModerateAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ModerateEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'RejectRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ResolveFlagActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SubmitAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SubmitEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SuggestRevisionSetActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SuggestSourceActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'UpdateSourceSuggestionStatusActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | undefined }> };
+export type ActivityFeedFragment = { __typename: 'ActivityInterfaceConnection', pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, edges: Array<{ __typename: 'ActivityInterfaceEdge', cursor: string, node?: { __typename: 'AcceptRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CommentActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CreateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CreateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'DeprecateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'DeprecateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'FlagEntityActivity', id: number, verbiage: string, createdAt: any, flag: { __typename: 'Flag', id: number, name: string, link: string }, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ModerateAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ModerateEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'RejectRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ResolveFlagActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SubmitAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SubmitEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SuggestRevisionSetActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SuggestSourceActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'UpdateSourceSuggestionStatusActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | undefined }> };
 
-type ActivityFeedNode_AcceptRevisionsActivity_Fragment = { __typename: 'AcceptRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_AcceptRevisionsActivity_Fragment = { __typename: 'AcceptRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_CommentActivity_Fragment = { __typename: 'CommentActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_CommentActivity_Fragment = { __typename: 'CommentActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_CreateComplexMolecularProfileActivity_Fragment = { __typename: 'CreateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_CreateComplexMolecularProfileActivity_Fragment = { __typename: 'CreateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_CreateVariantActivity_Fragment = { __typename: 'CreateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_CreateVariantActivity_Fragment = { __typename: 'CreateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_DeprecateComplexMolecularProfileActivity_Fragment = { __typename: 'DeprecateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_DeprecateComplexMolecularProfileActivity_Fragment = { __typename: 'DeprecateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_DeprecateVariantActivity_Fragment = { __typename: 'DeprecateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_DeprecateVariantActivity_Fragment = { __typename: 'DeprecateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_FlagEntityActivity_Fragment = { __typename: 'FlagEntityActivity', id: number, verbiage: string, createdAt: any, flag: { __typename: 'Flag', id: number, name: string, link: string }, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_FlagEntityActivity_Fragment = { __typename: 'FlagEntityActivity', id: number, verbiage: string, createdAt: any, flag: { __typename: 'Flag', id: number, name: string, link: string }, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_ModerateAssertionActivity_Fragment = { __typename: 'ModerateAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_ModerateAssertionActivity_Fragment = { __typename: 'ModerateAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_ModerateEvidenceItemActivity_Fragment = { __typename: 'ModerateEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_ModerateEvidenceItemActivity_Fragment = { __typename: 'ModerateEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_RejectRevisionsActivity_Fragment = { __typename: 'RejectRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_RejectRevisionsActivity_Fragment = { __typename: 'RejectRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_ResolveFlagActivity_Fragment = { __typename: 'ResolveFlagActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_ResolveFlagActivity_Fragment = { __typename: 'ResolveFlagActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_SubmitAssertionActivity_Fragment = { __typename: 'SubmitAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_SubmitAssertionActivity_Fragment = { __typename: 'SubmitAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_SubmitEvidenceItemActivity_Fragment = { __typename: 'SubmitEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_SubmitEvidenceItemActivity_Fragment = { __typename: 'SubmitEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_SuggestRevisionSetActivity_Fragment = { __typename: 'SuggestRevisionSetActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_SuggestRevisionSetActivity_Fragment = { __typename: 'SuggestRevisionSetActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_SuggestSourceActivity_Fragment = { __typename: 'SuggestSourceActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_SuggestSourceActivity_Fragment = { __typename: 'SuggestSourceActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_UpdateSourceSuggestionStatusActivity_Fragment = { __typename: 'UpdateSourceSuggestionStatusActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_UpdateSourceSuggestionStatusActivity_Fragment = { __typename: 'UpdateSourceSuggestionStatusActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
 export type ActivityFeedNodeFragment = ActivityFeedNode_AcceptRevisionsActivity_Fragment | ActivityFeedNode_CommentActivity_Fragment | ActivityFeedNode_CreateComplexMolecularProfileActivity_Fragment | ActivityFeedNode_CreateVariantActivity_Fragment | ActivityFeedNode_DeprecateComplexMolecularProfileActivity_Fragment | ActivityFeedNode_DeprecateVariantActivity_Fragment | ActivityFeedNode_FlagEntityActivity_Fragment | ActivityFeedNode_ModerateAssertionActivity_Fragment | ActivityFeedNode_ModerateEvidenceItemActivity_Fragment | ActivityFeedNode_RejectRevisionsActivity_Fragment | ActivityFeedNode_ResolveFlagActivity_Fragment | ActivityFeedNode_SubmitAssertionActivity_Fragment | ActivityFeedNode_SubmitEvidenceItemActivity_Fragment | ActivityFeedNode_SuggestRevisionSetActivity_Fragment | ActivityFeedNode_SuggestSourceActivity_Fragment | ActivityFeedNode_UpdateSourceSuggestionStatusActivity_Fragment;
 
@@ -6090,11 +6095,11 @@ export type CommentListQueryVariables = Exact<{
 }>;
 
 
-export type CommentListQuery = { __typename: 'Query', comments: { __typename: 'CommentConnection', totalCount: number, unfilteredCountForSubject?: number | undefined, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasPreviousPage: boolean, hasNextPage: boolean }, uniqueCommenters: Array<{ __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined }>, mentionedUsers: Array<{ __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined }>, mentionedRoles: Array<{ __typename: 'CommentTagSegment', displayName: string, entityId: number, tagType: TaggableEntity, link: string }>, mentionedEntities: Array<{ __typename: 'CommentTagSegment', displayName: string, entityId: number, tagType: TaggableEntity, link: string }>, edges: Array<{ __typename: 'CommentEdge', cursor: string, node?: { __typename: 'Comment', id: number, title?: string | undefined, comment: string, createdAt: any, commenter: { __typename: 'User', id: number, username: string, displayName: string, name?: string | undefined, role: UserRole, profileImagePath?: string | undefined, organizations: Array<{ __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined }> }, parsedComment: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined }> } };
+export type CommentListQuery = { __typename: 'Query', comments: { __typename: 'CommentConnection', totalCount: number, unfilteredCountForSubject?: number | undefined, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasPreviousPage: boolean, hasNextPage: boolean }, uniqueCommenters: Array<{ __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined }>, mentionedUsers: Array<{ __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined }>, mentionedRoles: Array<{ __typename: 'CommentTagSegment', displayName: string, entityId: number, tagType: TaggableEntity, link: string }>, mentionedEntities: Array<{ __typename: 'CommentTagSegment', displayName: string, entityId: number, tagType: TaggableEntity, link: string }>, edges: Array<{ __typename: 'CommentEdge', cursor: string, node?: { __typename: 'Comment', id: number, title?: string | undefined, comment: string, createdAt: any, commenter: { __typename: 'User', id: number, username: string, displayName: string, name?: string | undefined, role: UserRole, profileImagePath?: string | undefined, organizations: Array<{ __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined }> }, parsedComment: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined }> } };
 
-export type CommentListNodeFragment = { __typename: 'Comment', id: number, title?: string | undefined, comment: string, createdAt: any, commenter: { __typename: 'User', id: number, username: string, displayName: string, name?: string | undefined, role: UserRole, profileImagePath?: string | undefined, organizations: Array<{ __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined }> }, parsedComment: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> };
+export type CommentListNodeFragment = { __typename: 'Comment', id: number, title?: string | undefined, comment: string, createdAt: any, commenter: { __typename: 'User', id: number, username: string, displayName: string, name?: string | undefined, role: UserRole, profileImagePath?: string | undefined, organizations: Array<{ __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined }> }, parsedComment: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> };
 
-type ParsedCommentFragment_CommentTagSegment_Fragment = { __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined };
+type ParsedCommentFragment_CommentTagSegment_Fragment = { __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined };
 
 type ParsedCommentFragment_CommentTextSegment_Fragment = { __typename: 'CommentTextSegment', text: string };
 
@@ -6107,9 +6112,9 @@ export type CommentPopoverQueryVariables = Exact<{
 }>;
 
 
-export type CommentPopoverQuery = { __typename: 'Query', comment?: { __typename: 'Comment', id: number, name: string, createdAt: any, title?: string | undefined, comment: string, commenter: { __typename: 'User', id: number, displayName: string, role: UserRole }, commentable: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, name: string, link: string } | { __typename: 'Source', id: number, name: string, link: string } | { __typename: 'SourcePopover', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | { __typename: 'VariantGroup', id: number, name: string, link: string } } | undefined };
+export type CommentPopoverQuery = { __typename: 'Query', comment?: { __typename: 'Comment', id: number, name: string, createdAt: any, title?: string | undefined, comment: string, commenter: { __typename: 'User', id: number, displayName: string, role: UserRole }, commentable: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, name: string, link: string } | { __typename: 'Source', id: number, name: string, link: string } | { __typename: 'SourcePopover', id: number, name: string, link: string } | { __typename: 'Variant', deprecated: boolean, id: number, name: string, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', id: number, name: string, link: string } } | undefined };
 
-export type CommentPopoverFragment = { __typename: 'Comment', id: number, name: string, createdAt: any, title?: string | undefined, comment: string, commenter: { __typename: 'User', id: number, displayName: string, role: UserRole }, commentable: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, name: string, link: string } | { __typename: 'Source', id: number, name: string, link: string } | { __typename: 'SourcePopover', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | { __typename: 'VariantGroup', id: number, name: string, link: string } };
+export type CommentPopoverFragment = { __typename: 'Comment', id: number, name: string, createdAt: any, title?: string | undefined, comment: string, commenter: { __typename: 'User', id: number, displayName: string, role: UserRole }, commentable: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, name: string, link: string } | { __typename: 'Source', id: number, name: string, link: string } | { __typename: 'SourcePopover', id: number, name: string, link: string } | { __typename: 'Variant', deprecated: boolean, id: number, name: string, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', id: number, name: string, link: string } };
 
 export type DiseasePopoverQueryVariables = Exact<{
   diseaseId: Scalars['Int'];
@@ -6165,11 +6170,11 @@ export type EventFeedQueryVariables = Exact<{
 }>;
 
 
-export type EventFeedQuery = { __typename: 'Query', events: { __typename: 'EventConnection', eventTypes?: Array<EventAction>, unfilteredCount: number, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, uniqueParticipants?: Array<{ __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined }>, participatingOrganizations?: Array<{ __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined }>, edges: Array<{ __typename: 'EventEdge', cursor: string, node?: { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined } | undefined }> } };
+export type EventFeedQuery = { __typename: 'Query', events: { __typename: 'EventConnection', eventTypes?: Array<EventAction>, unfilteredCount: number, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, uniqueParticipants?: Array<{ __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined }>, participatingOrganizations?: Array<{ __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined }>, edges: Array<{ __typename: 'EventEdge', cursor: string, node?: { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined } | undefined }> } };
 
-export type EventFeedFragment = { __typename: 'EventConnection', eventTypes?: Array<EventAction>, unfilteredCount: number, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, uniqueParticipants?: Array<{ __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined }>, participatingOrganizations?: Array<{ __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined }>, edges: Array<{ __typename: 'EventEdge', cursor: string, node?: { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined } | undefined }> };
+export type EventFeedFragment = { __typename: 'EventConnection', eventTypes?: Array<EventAction>, unfilteredCount: number, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, uniqueParticipants?: Array<{ __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined }>, participatingOrganizations?: Array<{ __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined }>, edges: Array<{ __typename: 'EventEdge', cursor: string, node?: { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined } | undefined }> };
 
-export type EventFeedNodeFragment = { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined };
+export type EventFeedNodeFragment = { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined };
 
 export type EvidencePopoverQueryVariables = Exact<{
   evidenceId: Scalars['Int'];
@@ -6254,20 +6259,20 @@ export type FlagListQueryVariables = Exact<{
 }>;
 
 
-export type FlagListQuery = { __typename: 'Query', flags: { __typename: 'FlagConnection', totalCount: number, unfilteredCountForSubject?: number | undefined, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, uniqueFlaggingUsers: Array<{ __typename: 'User', username: string, id: number, profileImagePath?: string | undefined }>, uniqueResolvingUsers?: Array<{ __typename: 'User', username: string, id: number, profileImagePath?: string | undefined }> | undefined, edges: Array<{ __typename: 'FlagEdge', node?: { __typename: 'Flag', id: number, state: FlagState, flaggable: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'BrowseFeature', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | { __typename: 'VariantGroup', id: number, name: string, link: string }, openActivity: { __typename: 'FlagEntityActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } }, resolutionActivity?: { __typename: 'ResolveFlagActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined } | undefined }> } };
+export type FlagListQuery = { __typename: 'Query', flags: { __typename: 'FlagConnection', totalCount: number, unfilteredCountForSubject?: number | undefined, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, uniqueFlaggingUsers: Array<{ __typename: 'User', username: string, id: number, profileImagePath?: string | undefined }>, uniqueResolvingUsers?: Array<{ __typename: 'User', username: string, id: number, profileImagePath?: string | undefined }> | undefined, edges: Array<{ __typename: 'FlagEdge', node?: { __typename: 'Flag', id: number, state: FlagState, flaggable: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'BrowseFeature', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | { __typename: 'VariantGroup', id: number, name: string, link: string }, openActivity: { __typename: 'FlagEntityActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } }, resolutionActivity?: { __typename: 'ResolveFlagActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined } | undefined }> } };
 
-export type FlagListFragment = { __typename: 'FlagConnection', totalCount: number, unfilteredCountForSubject?: number | undefined, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, uniqueFlaggingUsers: Array<{ __typename: 'User', username: string, id: number, profileImagePath?: string | undefined }>, uniqueResolvingUsers?: Array<{ __typename: 'User', username: string, id: number, profileImagePath?: string | undefined }> | undefined, edges: Array<{ __typename: 'FlagEdge', node?: { __typename: 'Flag', id: number, state: FlagState, flaggable: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'BrowseFeature', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | { __typename: 'VariantGroup', id: number, name: string, link: string }, openActivity: { __typename: 'FlagEntityActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } }, resolutionActivity?: { __typename: 'ResolveFlagActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined } | undefined }> };
+export type FlagListFragment = { __typename: 'FlagConnection', totalCount: number, unfilteredCountForSubject?: number | undefined, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, uniqueFlaggingUsers: Array<{ __typename: 'User', username: string, id: number, profileImagePath?: string | undefined }>, uniqueResolvingUsers?: Array<{ __typename: 'User', username: string, id: number, profileImagePath?: string | undefined }> | undefined, edges: Array<{ __typename: 'FlagEdge', node?: { __typename: 'Flag', id: number, state: FlagState, flaggable: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'BrowseFeature', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | { __typename: 'VariantGroup', id: number, name: string, link: string }, openActivity: { __typename: 'FlagEntityActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } }, resolutionActivity?: { __typename: 'ResolveFlagActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined } | undefined }> };
 
-export type FlagFragment = { __typename: 'Flag', id: number, state: FlagState, flaggable: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'BrowseFeature', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | { __typename: 'VariantGroup', id: number, name: string, link: string }, openActivity: { __typename: 'FlagEntityActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } }, resolutionActivity?: { __typename: 'ResolveFlagActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined };
+export type FlagFragment = { __typename: 'Flag', id: number, state: FlagState, flaggable: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'BrowseFeature', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | { __typename: 'VariantGroup', id: number, name: string, link: string }, openActivity: { __typename: 'FlagEntityActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } }, resolutionActivity?: { __typename: 'ResolveFlagActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined };
 
 export type FlagPopoverQueryVariables = Exact<{
   flagId: Scalars['Int'];
 }>;
 
 
-export type FlagPopoverQuery = { __typename: 'Query', flag?: { __typename: 'Flag', id: number, name: string, state: FlagState, createdAt: any, flaggingUser: { __typename: 'User', id: number, displayName: string, role: UserRole }, flaggable: { __typename: 'Assertion', id: number, link: string, name: string } | { __typename: 'BrowseFeature', id: number, link: string, name: string } | { __typename: 'EvidenceItem', id: number, link: string, name: string } | { __typename: 'Feature', id: number, link: string, name: string } | { __typename: 'Gene', id: number, link: string, name: string } | { __typename: 'MolecularProfile', id: number, link: string, name: string } | { __typename: 'Variant', id: number, link: string, name: string } | { __typename: 'VariantGroup', id: number, link: string, name: string }, openActivity: { __typename: 'FlagEntityActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } } | undefined };
+export type FlagPopoverQuery = { __typename: 'Query', flag?: { __typename: 'Flag', id: number, name: string, state: FlagState, createdAt: any, flaggingUser: { __typename: 'User', id: number, displayName: string, role: UserRole }, flaggable: { __typename: 'Assertion', id: number, link: string, name: string } | { __typename: 'BrowseFeature', id: number, link: string, name: string } | { __typename: 'EvidenceItem', id: number, link: string, name: string } | { __typename: 'Feature', id: number, link: string, name: string } | { __typename: 'Gene', id: number, link: string, name: string } | { __typename: 'MolecularProfile', id: number, link: string, name: string } | { __typename: 'Variant', deprecated: boolean, id: number, link: string, name: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', id: number, link: string, name: string }, openActivity: { __typename: 'FlagEntityActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } } | undefined };
 
-export type FlagPopoverFragment = { __typename: 'Flag', id: number, name: string, state: FlagState, createdAt: any, flaggingUser: { __typename: 'User', id: number, displayName: string, role: UserRole }, flaggable: { __typename: 'Assertion', id: number, link: string, name: string } | { __typename: 'BrowseFeature', id: number, link: string, name: string } | { __typename: 'EvidenceItem', id: number, link: string, name: string } | { __typename: 'Feature', id: number, link: string, name: string } | { __typename: 'Gene', id: number, link: string, name: string } | { __typename: 'MolecularProfile', id: number, link: string, name: string } | { __typename: 'Variant', id: number, link: string, name: string } | { __typename: 'VariantGroup', id: number, link: string, name: string }, openActivity: { __typename: 'FlagEntityActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } };
+export type FlagPopoverFragment = { __typename: 'Flag', id: number, name: string, state: FlagState, createdAt: any, flaggingUser: { __typename: 'User', id: number, displayName: string, role: UserRole }, flaggable: { __typename: 'Assertion', id: number, link: string, name: string } | { __typename: 'BrowseFeature', id: number, link: string, name: string } | { __typename: 'EvidenceItem', id: number, link: string, name: string } | { __typename: 'Feature', id: number, link: string, name: string } | { __typename: 'Gene', id: number, link: string, name: string } | { __typename: 'MolecularProfile', id: number, link: string, name: string } | { __typename: 'Variant', deprecated: boolean, id: number, link: string, name: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', id: number, link: string, name: string }, openActivity: { __typename: 'FlagEntityActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } };
 
 export type QuicksearchQueryVariables = Exact<{
   query: Scalars['String'];
@@ -6445,9 +6450,9 @@ export type RevisionPopoverQueryVariables = Exact<{
 }>;
 
 
-export type RevisionPopoverQuery = { __typename: 'Query', revision?: { __typename: 'Revision', id: number, name: string, link: string, status: RevisionStatus, createdAt: any, creationActivity?: { __typename: 'SuggestRevisionSetActivity', user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, subject: { __typename: 'Assertion', id: number, link: string, name: string } | { __typename: 'EvidenceItem', id: number, link: string, name: string } | { __typename: 'Feature', id: number, link: string, name: string } | { __typename: 'Flag', id: number, link: string, name: string } | { __typename: 'Gene', id: number, link: string, name: string } | { __typename: 'MolecularProfile', id: number, link: string, name: string } | { __typename: 'Revision', id: number, link: string, name: string } | { __typename: 'RevisionSet', id: number, link: string, name: string } | { __typename: 'Source', id: number, link: string, name: string } | { __typename: 'SourcePopover', id: number, link: string, name: string } | { __typename: 'SourceSuggestion', id: number, link: string, name: string } | { __typename: 'Variant', id: number, link: string, name: string } | { __typename: 'VariantGroup', id: number, link: string, name: string }, linkoutData: { __typename: 'LinkoutData', name: string } } | undefined };
+export type RevisionPopoverQuery = { __typename: 'Query', revision?: { __typename: 'Revision', id: number, name: string, link: string, status: RevisionStatus, createdAt: any, creationActivity?: { __typename: 'SuggestRevisionSetActivity', user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, subject: { __typename: 'Assertion', id: number, link: string, name: string } | { __typename: 'EvidenceItem', id: number, link: string, name: string } | { __typename: 'Feature', id: number, link: string, name: string } | { __typename: 'Flag', id: number, link: string, name: string } | { __typename: 'Gene', id: number, link: string, name: string } | { __typename: 'MolecularProfile', id: number, link: string, name: string } | { __typename: 'Revision', id: number, link: string, name: string } | { __typename: 'RevisionSet', id: number, link: string, name: string } | { __typename: 'Source', id: number, link: string, name: string } | { __typename: 'SourcePopover', id: number, link: string, name: string } | { __typename: 'SourceSuggestion', id: number, link: string, name: string } | { __typename: 'Variant', deprecated: boolean, id: number, link: string, name: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', id: number, link: string, name: string }, linkoutData: { __typename: 'LinkoutData', name: string } } | undefined };
 
-export type RevisionPopoverFragment = { __typename: 'Revision', id: number, name: string, link: string, status: RevisionStatus, createdAt: any, creationActivity?: { __typename: 'SuggestRevisionSetActivity', user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, subject: { __typename: 'Assertion', id: number, link: string, name: string } | { __typename: 'EvidenceItem', id: number, link: string, name: string } | { __typename: 'Feature', id: number, link: string, name: string } | { __typename: 'Flag', id: number, link: string, name: string } | { __typename: 'Gene', id: number, link: string, name: string } | { __typename: 'MolecularProfile', id: number, link: string, name: string } | { __typename: 'Revision', id: number, link: string, name: string } | { __typename: 'RevisionSet', id: number, link: string, name: string } | { __typename: 'Source', id: number, link: string, name: string } | { __typename: 'SourcePopover', id: number, link: string, name: string } | { __typename: 'SourceSuggestion', id: number, link: string, name: string } | { __typename: 'Variant', id: number, link: string, name: string } | { __typename: 'VariantGroup', id: number, link: string, name: string }, linkoutData: { __typename: 'LinkoutData', name: string } };
+export type RevisionPopoverFragment = { __typename: 'Revision', id: number, name: string, link: string, status: RevisionStatus, createdAt: any, creationActivity?: { __typename: 'SuggestRevisionSetActivity', user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, subject: { __typename: 'Assertion', id: number, link: string, name: string } | { __typename: 'EvidenceItem', id: number, link: string, name: string } | { __typename: 'Feature', id: number, link: string, name: string } | { __typename: 'Flag', id: number, link: string, name: string } | { __typename: 'Gene', id: number, link: string, name: string } | { __typename: 'MolecularProfile', id: number, link: string, name: string } | { __typename: 'Revision', id: number, link: string, name: string } | { __typename: 'RevisionSet', id: number, link: string, name: string } | { __typename: 'Source', id: number, link: string, name: string } | { __typename: 'SourcePopover', id: number, link: string, name: string } | { __typename: 'SourceSuggestion', id: number, link: string, name: string } | { __typename: 'Variant', deprecated: boolean, id: number, link: string, name: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', id: number, link: string, name: string }, linkoutData: { __typename: 'LinkoutData', name: string } };
 
 export type RevisionsQueryVariables = Exact<{
   subject?: InputMaybe<ModeratedInput>;
@@ -6463,9 +6468,9 @@ export type RevisionsQueryVariables = Exact<{
 }>;
 
 
-export type RevisionsQuery = { __typename: 'Query', revisions: { __typename: 'RevisionConnection', totalCount: number, unfilteredCountForSubject?: number | undefined, uniqueRevisors: Array<{ __typename: 'User', username: string, id: number, profileImagePath?: string | undefined }>, uniqueResolvers: Array<{ __typename: 'User', username: string, id: number, profileImagePath?: string | undefined }>, revisedFieldNames: Array<{ __typename: 'FieldName', name: string, displayName: string }>, pageInfo: { __typename: 'PageInfo', hasNextPage: boolean, hasPreviousPage: boolean, endCursor?: string | undefined, startCursor?: string | undefined }, edges: Array<{ __typename: 'RevisionEdge', node?: { __typename: 'Revision', id: number, revisionSetId: number, createdAt: any, fieldName: string, currentValue?: any | undefined, suggestedValue?: any | undefined, status: RevisionStatus, linkoutData: { __typename: 'LinkoutData', name: string, diffValue: { __typename: 'ObjectFieldDiff', currentObjects: Array<{ __typename: 'ModeratedObjectField', id: number, displayName?: string | undefined, displayType?: string | undefined, entityType: string, link?: string | undefined, deleted: boolean }>, addedObjects: Array<{ __typename: 'ModeratedObjectField', id: number, displayName?: string | undefined, displayType?: string | undefined, entityType: string, link?: string | undefined, deleted: boolean }>, removedObjects: Array<{ __typename: 'ModeratedObjectField', id: number, displayName?: string | undefined, displayType?: string | undefined, entityType: string, link?: string | undefined, deleted: boolean }>, keptObjects: Array<{ __typename: 'ModeratedObjectField', id: number, displayName?: string | undefined, displayType?: string | undefined, entityType: string, link?: string | undefined, deleted: boolean }>, suggestedObjects: Array<{ __typename: 'ModeratedObjectField', id: number, displayName?: string | undefined, displayType?: string | undefined, entityType: string, link?: string | undefined, deleted: boolean }> } | { __typename: 'ScalarFieldDiff', left: string, right: string } }, creationActivity?: { __typename: 'SuggestRevisionSetActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, resolutionActivity?: { __typename: 'AcceptRevisionsActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'CommentActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'CreateComplexMolecularProfileActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'CreateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'DeprecateComplexMolecularProfileActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'DeprecateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'FlagEntityActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'ModerateAssertionActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'ModerateEvidenceItemActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'RejectRevisionsActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'ResolveFlagActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'SubmitAssertionActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'SubmitEvidenceItemActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'SuggestRevisionSetActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'SuggestSourceActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'UpdateSourceSuggestionStatusActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined } | undefined }> } };
+export type RevisionsQuery = { __typename: 'Query', revisions: { __typename: 'RevisionConnection', totalCount: number, unfilteredCountForSubject?: number | undefined, uniqueRevisors: Array<{ __typename: 'User', username: string, id: number, profileImagePath?: string | undefined }>, uniqueResolvers: Array<{ __typename: 'User', username: string, id: number, profileImagePath?: string | undefined }>, revisedFieldNames: Array<{ __typename: 'FieldName', name: string, displayName: string }>, pageInfo: { __typename: 'PageInfo', hasNextPage: boolean, hasPreviousPage: boolean, endCursor?: string | undefined, startCursor?: string | undefined }, edges: Array<{ __typename: 'RevisionEdge', node?: { __typename: 'Revision', id: number, revisionSetId: number, createdAt: any, fieldName: string, currentValue?: any | undefined, suggestedValue?: any | undefined, status: RevisionStatus, linkoutData: { __typename: 'LinkoutData', name: string, diffValue: { __typename: 'ObjectFieldDiff', currentObjects: Array<{ __typename: 'ModeratedObjectField', id: number, displayName?: string | undefined, displayType?: string | undefined, entityType: string, link?: string | undefined, deleted: boolean, deprecated?: boolean | undefined, feature?: { __typename: 'LinkableFeature', link: string, id: number, name: string } | undefined }>, addedObjects: Array<{ __typename: 'ModeratedObjectField', id: number, displayName?: string | undefined, displayType?: string | undefined, entityType: string, link?: string | undefined, deleted: boolean, deprecated?: boolean | undefined, feature?: { __typename: 'LinkableFeature', link: string, id: number, name: string } | undefined }>, removedObjects: Array<{ __typename: 'ModeratedObjectField', id: number, displayName?: string | undefined, displayType?: string | undefined, entityType: string, link?: string | undefined, deleted: boolean, deprecated?: boolean | undefined, feature?: { __typename: 'LinkableFeature', link: string, id: number, name: string } | undefined }>, keptObjects: Array<{ __typename: 'ModeratedObjectField', id: number, displayName?: string | undefined, displayType?: string | undefined, entityType: string, link?: string | undefined, deleted: boolean, deprecated?: boolean | undefined, feature?: { __typename: 'LinkableFeature', link: string, id: number, name: string } | undefined }>, suggestedObjects: Array<{ __typename: 'ModeratedObjectField', id: number, displayName?: string | undefined, displayType?: string | undefined, entityType: string, link?: string | undefined, deleted: boolean, deprecated?: boolean | undefined, feature?: { __typename: 'LinkableFeature', link: string, id: number, name: string } | undefined }> } | { __typename: 'ScalarFieldDiff', left: string, right: string } }, creationActivity?: { __typename: 'SuggestRevisionSetActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, resolutionActivity?: { __typename: 'AcceptRevisionsActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'CommentActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'CreateComplexMolecularProfileActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'CreateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'DeprecateComplexMolecularProfileActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'DeprecateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'FlagEntityActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'ModerateAssertionActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'ModerateEvidenceItemActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'RejectRevisionsActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'ResolveFlagActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'SubmitAssertionActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'SubmitEvidenceItemActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'SuggestRevisionSetActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'SuggestSourceActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'UpdateSourceSuggestionStatusActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined } | undefined }> } };
 
-export type RevisionFragment = { __typename: 'Revision', id: number, revisionSetId: number, createdAt: any, fieldName: string, currentValue?: any | undefined, suggestedValue?: any | undefined, status: RevisionStatus, linkoutData: { __typename: 'LinkoutData', name: string, diffValue: { __typename: 'ObjectFieldDiff', currentObjects: Array<{ __typename: 'ModeratedObjectField', id: number, displayName?: string | undefined, displayType?: string | undefined, entityType: string, link?: string | undefined, deleted: boolean }>, addedObjects: Array<{ __typename: 'ModeratedObjectField', id: number, displayName?: string | undefined, displayType?: string | undefined, entityType: string, link?: string | undefined, deleted: boolean }>, removedObjects: Array<{ __typename: 'ModeratedObjectField', id: number, displayName?: string | undefined, displayType?: string | undefined, entityType: string, link?: string | undefined, deleted: boolean }>, keptObjects: Array<{ __typename: 'ModeratedObjectField', id: number, displayName?: string | undefined, displayType?: string | undefined, entityType: string, link?: string | undefined, deleted: boolean }>, suggestedObjects: Array<{ __typename: 'ModeratedObjectField', id: number, displayName?: string | undefined, displayType?: string | undefined, entityType: string, link?: string | undefined, deleted: boolean }> } | { __typename: 'ScalarFieldDiff', left: string, right: string } }, creationActivity?: { __typename: 'SuggestRevisionSetActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, resolutionActivity?: { __typename: 'AcceptRevisionsActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'CommentActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'CreateComplexMolecularProfileActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'CreateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'DeprecateComplexMolecularProfileActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'DeprecateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'FlagEntityActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'ModerateAssertionActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'ModerateEvidenceItemActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'RejectRevisionsActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'ResolveFlagActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'SubmitAssertionActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'SubmitEvidenceItemActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'SuggestRevisionSetActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'SuggestSourceActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'UpdateSourceSuggestionStatusActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined };
+export type RevisionFragment = { __typename: 'Revision', id: number, revisionSetId: number, createdAt: any, fieldName: string, currentValue?: any | undefined, suggestedValue?: any | undefined, status: RevisionStatus, linkoutData: { __typename: 'LinkoutData', name: string, diffValue: { __typename: 'ObjectFieldDiff', currentObjects: Array<{ __typename: 'ModeratedObjectField', id: number, displayName?: string | undefined, displayType?: string | undefined, entityType: string, link?: string | undefined, deleted: boolean, deprecated?: boolean | undefined, feature?: { __typename: 'LinkableFeature', link: string, id: number, name: string } | undefined }>, addedObjects: Array<{ __typename: 'ModeratedObjectField', id: number, displayName?: string | undefined, displayType?: string | undefined, entityType: string, link?: string | undefined, deleted: boolean, deprecated?: boolean | undefined, feature?: { __typename: 'LinkableFeature', link: string, id: number, name: string } | undefined }>, removedObjects: Array<{ __typename: 'ModeratedObjectField', id: number, displayName?: string | undefined, displayType?: string | undefined, entityType: string, link?: string | undefined, deleted: boolean, deprecated?: boolean | undefined, feature?: { __typename: 'LinkableFeature', link: string, id: number, name: string } | undefined }>, keptObjects: Array<{ __typename: 'ModeratedObjectField', id: number, displayName?: string | undefined, displayType?: string | undefined, entityType: string, link?: string | undefined, deleted: boolean, deprecated?: boolean | undefined, feature?: { __typename: 'LinkableFeature', link: string, id: number, name: string } | undefined }>, suggestedObjects: Array<{ __typename: 'ModeratedObjectField', id: number, displayName?: string | undefined, displayType?: string | undefined, entityType: string, link?: string | undefined, deleted: boolean, deprecated?: boolean | undefined, feature?: { __typename: 'LinkableFeature', link: string, id: number, name: string } | undefined }> } | { __typename: 'ScalarFieldDiff', left: string, right: string } }, creationActivity?: { __typename: 'SuggestRevisionSetActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, resolutionActivity?: { __typename: 'AcceptRevisionsActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'CommentActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'CreateComplexMolecularProfileActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'CreateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'DeprecateComplexMolecularProfileActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'DeprecateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'FlagEntityActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'ModerateAssertionActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'ModerateEvidenceItemActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'RejectRevisionsActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'ResolveFlagActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'SubmitAssertionActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'SubmitEvidenceItemActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'SuggestRevisionSetActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'SuggestSourceActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'UpdateSourceSuggestionStatusActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined };
 
 export type ContributorAvatarsQueryVariables = Exact<{
   subscribable: SubscribableInput;
@@ -6525,9 +6530,9 @@ export type BrowseSourceSuggestionsQueryVariables = Exact<{
 }>;
 
 
-export type BrowseSourceSuggestionsQuery = { __typename: 'Query', sourceSuggestions: { __typename: 'SourceSuggestionConnection', totalCount: number, filteredCount: number, pageCount: number, pageInfo: { __typename: 'PageInfo', endCursor?: string | undefined, hasNextPage: boolean, startCursor?: string | undefined, hasPreviousPage: boolean }, edges: Array<{ __typename: 'SourceSuggestionEdge', cursor: string, node?: { __typename: 'SourceSuggestion', id: number, status: SourceSuggestionStatus, reason?: string | undefined, createdAt: any, molecularProfile?: { __typename: 'MolecularProfile', id: number, name: string, link: string } | undefined, disease?: { __typename: 'Disease', id: number, name: string, link: string } | undefined, source?: { __typename: 'Source', link: string, id: number, citation?: string | undefined, citationId: string, sourceType: SourceSource, sourceUrl?: string | undefined, displayType: string } | undefined, user?: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } | undefined, creationActivity: { __typename: 'SuggestSourceActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> }, lastStatusUpdateActivity?: { __typename: 'UpdateSourceSuggestionStatusActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined } | undefined }> } };
+export type BrowseSourceSuggestionsQuery = { __typename: 'Query', sourceSuggestions: { __typename: 'SourceSuggestionConnection', totalCount: number, filteredCount: number, pageCount: number, pageInfo: { __typename: 'PageInfo', endCursor?: string | undefined, hasNextPage: boolean, startCursor?: string | undefined, hasPreviousPage: boolean }, edges: Array<{ __typename: 'SourceSuggestionEdge', cursor: string, node?: { __typename: 'SourceSuggestion', id: number, status: SourceSuggestionStatus, reason?: string | undefined, createdAt: any, molecularProfile?: { __typename: 'MolecularProfile', id: number, name: string, link: string } | undefined, disease?: { __typename: 'Disease', id: number, name: string, link: string } | undefined, source?: { __typename: 'Source', link: string, id: number, citation?: string | undefined, citationId: string, sourceType: SourceSource, sourceUrl?: string | undefined, displayType: string } | undefined, user?: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } | undefined, creationActivity: { __typename: 'SuggestSourceActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> }, lastStatusUpdateActivity?: { __typename: 'UpdateSourceSuggestionStatusActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined } | undefined }> } };
 
-export type BrowseSourceSuggestionRowFieldsFragment = { __typename: 'SourceSuggestion', id: number, status: SourceSuggestionStatus, reason?: string | undefined, createdAt: any, molecularProfile?: { __typename: 'MolecularProfile', id: number, name: string, link: string } | undefined, disease?: { __typename: 'Disease', id: number, name: string, link: string } | undefined, source?: { __typename: 'Source', link: string, id: number, citation?: string | undefined, citationId: string, sourceType: SourceSource, sourceUrl?: string | undefined, displayType: string } | undefined, user?: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } | undefined, creationActivity: { __typename: 'SuggestSourceActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> }, lastStatusUpdateActivity?: { __typename: 'UpdateSourceSuggestionStatusActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined };
+export type BrowseSourceSuggestionRowFieldsFragment = { __typename: 'SourceSuggestion', id: number, status: SourceSuggestionStatus, reason?: string | undefined, createdAt: any, molecularProfile?: { __typename: 'MolecularProfile', id: number, name: string, link: string } | undefined, disease?: { __typename: 'Disease', id: number, name: string, link: string } | undefined, source?: { __typename: 'Source', link: string, id: number, citation?: string | undefined, citationId: string, sourceType: SourceSource, sourceUrl?: string | undefined, displayType: string } | undefined, user?: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } | undefined, creationActivity: { __typename: 'SuggestSourceActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> }, lastStatusUpdateActivity?: { __typename: 'UpdateSourceSuggestionStatusActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined };
 
 export type UpdateSourceSuggestionStatusMutationVariables = Exact<{
   input: UpdateSourceSuggestionStatusInput;
@@ -6664,9 +6669,9 @@ export type VariantGroupPopoverQueryVariables = Exact<{
 }>;
 
 
-export type VariantGroupPopoverQuery = { __typename: 'Query', variantGroup?: { __typename: 'VariantGroup', id: number, name: string, description: string, variants: { __typename: 'VariantConnection', edges: Array<{ __typename: 'VariantEdge', node?: { __typename: 'Variant', id: number, name: string, link: string } | undefined }> }, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, sourceType: SourceSource, link: string }> } | undefined };
+export type VariantGroupPopoverQuery = { __typename: 'Query', variantGroup?: { __typename: 'VariantGroup', id: number, name: string, description: string, variants: { __typename: 'VariantConnection', edges: Array<{ __typename: 'VariantEdge', node?: { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean, feature: { __typename: 'Feature', id: number, name: string, link: string } } | undefined }> }, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, sourceType: SourceSource, link: string }> } | undefined };
 
-export type VariantGroupPopoverFieldsFragment = { __typename: 'VariantGroup', id: number, name: string, description: string, variants: { __typename: 'VariantConnection', edges: Array<{ __typename: 'VariantEdge', node?: { __typename: 'Variant', id: number, name: string, link: string } | undefined }> }, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, sourceType: SourceSource, link: string }> };
+export type VariantGroupPopoverFieldsFragment = { __typename: 'VariantGroup', id: number, name: string, description: string, variants: { __typename: 'VariantConnection', edges: Array<{ __typename: 'VariantEdge', node?: { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean, feature: { __typename: 'Feature', id: number, name: string, link: string } } | undefined }> }, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, sourceType: SourceSource, link: string }> };
 
 export type BrowseVariantGroupsQueryVariables = Exact<{
   first?: InputMaybe<Scalars['Int']>;
@@ -6789,22 +6794,14 @@ export type AddCommentMutationVariables = Exact<{
 }>;
 
 
-export type AddCommentMutation = { __typename: 'Mutation', addComment?: { __typename: 'AddCommentPayload', clientMutationId?: string | undefined, comment?: { __typename: 'Comment', id: number, title?: string | undefined, comment: string, createdAt: any, commenter: { __typename: 'User', id: number, username: string, displayName: string, name?: string | undefined, role: UserRole, profileImagePath?: string | undefined, organizations: Array<{ __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined }> }, parsedComment: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined } | undefined };
+export type AddCommentMutation = { __typename: 'Mutation', addComment?: { __typename: 'AddCommentPayload', clientMutationId?: string | undefined, comment?: { __typename: 'Comment', id: number, title?: string | undefined, comment: string, createdAt: any, commenter: { __typename: 'User', id: number, username: string, displayName: string, name?: string | undefined, role: UserRole, profileImagePath?: string | undefined, organizations: Array<{ __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined }> }, parsedComment: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined } | undefined };
 
 export type PreviewCommentQueryVariables = Exact<{
   commentText: Scalars['String'];
 }>;
 
 
-export type PreviewCommentQuery = { __typename: 'Query', previewCommentText: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, link: string, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> };
-
-type PreviewComment_CommentTagSegment_Fragment = { __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, link: string, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined };
-
-type PreviewComment_CommentTextSegment_Fragment = { __typename: 'CommentTextSegment', text: string };
-
-type PreviewComment_User_Fragment = { __typename: 'User', id: number, displayName: string, role: UserRole };
-
-export type PreviewCommentFragment = PreviewComment_CommentTagSegment_Fragment | PreviewComment_CommentTextSegment_Fragment | PreviewComment_User_Fragment;
+export type PreviewCommentQuery = { __typename: 'Query', previewCommentText: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> };
 
 export type UserTypeaheadQueryVariables = Exact<{
   queryTerm: Scalars['String'];
@@ -7441,20 +7438,20 @@ export type AssertionDetailQueryVariables = Exact<{
 }>;
 
 
-export type AssertionDetailQuery = { __typename: 'Query', assertion?: { __typename: 'Assertion', id: number, name: string, status: EvidenceStatus, submissionEvent: { __typename: 'Event', originatingUser: { __typename: 'User', id: number } }, molecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string }, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, submissionActivity: { __typename: 'SubmitAssertionActivity', createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, profileImagePath?: string | undefined } } } | undefined };
+export type AssertionDetailQuery = { __typename: 'Query', assertion?: { __typename: 'Assertion', id: number, name: string, status: EvidenceStatus, submissionEvent: { __typename: 'Event', originatingUser: { __typename: 'User', id: number } }, molecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string }, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, submissionActivity: { __typename: 'SubmitAssertionActivity', createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, profileImagePath?: string | undefined } } } | undefined };
 
-export type AssertionDetailFieldsFragment = { __typename: 'Assertion', id: number, name: string, status: EvidenceStatus, submissionEvent: { __typename: 'Event', originatingUser: { __typename: 'User', id: number } }, molecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string }, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, submissionActivity: { __typename: 'SubmitAssertionActivity', createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, profileImagePath?: string | undefined } } };
+export type AssertionDetailFieldsFragment = { __typename: 'Assertion', id: number, name: string, status: EvidenceStatus, submissionEvent: { __typename: 'Event', originatingUser: { __typename: 'User', id: number } }, molecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string }, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, submissionActivity: { __typename: 'SubmitAssertionActivity', createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, profileImagePath?: string | undefined } } };
 
-export type AssertionSubmissionActivityFragment = { __typename: 'Assertion', submissionActivity: { __typename: 'SubmitAssertionActivity', createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, profileImagePath?: string | undefined } } };
+export type AssertionSubmissionActivityFragment = { __typename: 'Assertion', submissionActivity: { __typename: 'SubmitAssertionActivity', createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, profileImagePath?: string | undefined } } };
 
 export type AssertionSummaryQueryVariables = Exact<{
   assertionId: Scalars['Int'];
 }>;
 
 
-export type AssertionSummaryQuery = { __typename: 'Query', assertion?: { __typename: 'Assertion', id: number, name: string, summary: string, description: string, status: EvidenceStatus, variantOrigin: VariantOrigin, assertionType: AssertionType, assertionDirection: AssertionDirection, significance: AssertionSignificance, therapyInteractionType?: TherapyInteraction | undefined, ampLevel?: AmpLevel | undefined, nccnGuidelineVersion?: string | undefined, regulatoryApproval?: boolean | undefined, regulatoryApprovalLastUpdated?: any | undefined, fdaCompanionTest?: boolean | undefined, fdaCompanionTestLastUpdated?: any | undefined, disease?: { __typename: 'Disease', id: number, name: string, link: string } | undefined, molecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, parsedName: Array<{ __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'MolecularProfileTextSegment', text: string } | { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean }> }, therapies: Array<{ __typename: 'Therapy', ncitId?: string | undefined, name: string, link: string, id: number }>, phenotypes: Array<{ __typename: 'Phenotype', id: number, name: string, link: string }>, acmgCodes: Array<{ __typename: 'AcmgCode', code: string, description: string }>, clingenCodes: Array<{ __typename: 'ClingenCode', id: number, code: string, description: string }>, nccnGuideline?: { __typename: 'NccnGuideline', id: number, name: string } | undefined, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, acceptanceEvent?: { __typename: 'Event', createdAt: any, originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, submissionEvent: { __typename: 'Event', createdAt: any, originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } }, rejectionEvent?: { __typename: 'Event', createdAt: any, originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, submissionActivity: { __typename: 'SubmitAssertionActivity', createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, profileImagePath?: string | undefined } } } | undefined };
+export type AssertionSummaryQuery = { __typename: 'Query', assertion?: { __typename: 'Assertion', id: number, name: string, summary: string, description: string, status: EvidenceStatus, variantOrigin: VariantOrigin, assertionType: AssertionType, assertionDirection: AssertionDirection, significance: AssertionSignificance, therapyInteractionType?: TherapyInteraction | undefined, ampLevel?: AmpLevel | undefined, nccnGuidelineVersion?: string | undefined, regulatoryApproval?: boolean | undefined, regulatoryApprovalLastUpdated?: any | undefined, fdaCompanionTest?: boolean | undefined, fdaCompanionTestLastUpdated?: any | undefined, disease?: { __typename: 'Disease', id: number, name: string, link: string } | undefined, molecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, parsedName: Array<{ __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'MolecularProfileTextSegment', text: string } | { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean }> }, therapies: Array<{ __typename: 'Therapy', ncitId?: string | undefined, name: string, link: string, id: number }>, phenotypes: Array<{ __typename: 'Phenotype', id: number, name: string, link: string }>, acmgCodes: Array<{ __typename: 'AcmgCode', code: string, description: string }>, clingenCodes: Array<{ __typename: 'ClingenCode', id: number, code: string, description: string }>, nccnGuideline?: { __typename: 'NccnGuideline', id: number, name: string } | undefined, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, acceptanceEvent?: { __typename: 'Event', createdAt: any, originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, submissionEvent: { __typename: 'Event', createdAt: any, originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } }, rejectionEvent?: { __typename: 'Event', createdAt: any, originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, submissionActivity: { __typename: 'SubmitAssertionActivity', createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, profileImagePath?: string | undefined } } } | undefined };
 
-export type AssertionSummaryFieldsFragment = { __typename: 'Assertion', id: number, name: string, summary: string, description: string, status: EvidenceStatus, variantOrigin: VariantOrigin, assertionType: AssertionType, assertionDirection: AssertionDirection, significance: AssertionSignificance, therapyInteractionType?: TherapyInteraction | undefined, ampLevel?: AmpLevel | undefined, nccnGuidelineVersion?: string | undefined, regulatoryApproval?: boolean | undefined, regulatoryApprovalLastUpdated?: any | undefined, fdaCompanionTest?: boolean | undefined, fdaCompanionTestLastUpdated?: any | undefined, disease?: { __typename: 'Disease', id: number, name: string, link: string } | undefined, molecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, parsedName: Array<{ __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'MolecularProfileTextSegment', text: string } | { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean }> }, therapies: Array<{ __typename: 'Therapy', ncitId?: string | undefined, name: string, link: string, id: number }>, phenotypes: Array<{ __typename: 'Phenotype', id: number, name: string, link: string }>, acmgCodes: Array<{ __typename: 'AcmgCode', code: string, description: string }>, clingenCodes: Array<{ __typename: 'ClingenCode', id: number, code: string, description: string }>, nccnGuideline?: { __typename: 'NccnGuideline', id: number, name: string } | undefined, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, acceptanceEvent?: { __typename: 'Event', createdAt: any, originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, submissionEvent: { __typename: 'Event', createdAt: any, originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } }, rejectionEvent?: { __typename: 'Event', createdAt: any, originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, submissionActivity: { __typename: 'SubmitAssertionActivity', createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, profileImagePath?: string | undefined } } };
+export type AssertionSummaryFieldsFragment = { __typename: 'Assertion', id: number, name: string, summary: string, description: string, status: EvidenceStatus, variantOrigin: VariantOrigin, assertionType: AssertionType, assertionDirection: AssertionDirection, significance: AssertionSignificance, therapyInteractionType?: TherapyInteraction | undefined, ampLevel?: AmpLevel | undefined, nccnGuidelineVersion?: string | undefined, regulatoryApproval?: boolean | undefined, regulatoryApprovalLastUpdated?: any | undefined, fdaCompanionTest?: boolean | undefined, fdaCompanionTestLastUpdated?: any | undefined, disease?: { __typename: 'Disease', id: number, name: string, link: string } | undefined, molecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, parsedName: Array<{ __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'MolecularProfileTextSegment', text: string } | { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean }> }, therapies: Array<{ __typename: 'Therapy', ncitId?: string | undefined, name: string, link: string, id: number }>, phenotypes: Array<{ __typename: 'Phenotype', id: number, name: string, link: string }>, acmgCodes: Array<{ __typename: 'AcmgCode', code: string, description: string }>, clingenCodes: Array<{ __typename: 'ClingenCode', id: number, code: string, description: string }>, nccnGuideline?: { __typename: 'NccnGuideline', id: number, name: string } | undefined, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, acceptanceEvent?: { __typename: 'Event', createdAt: any, originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, submissionEvent: { __typename: 'Event', createdAt: any, originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } }, rejectionEvent?: { __typename: 'Event', createdAt: any, originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, submissionActivity: { __typename: 'SubmitAssertionActivity', createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, profileImagePath?: string | undefined } } };
 
 export type ClinicalTrialDetailQueryVariables = Exact<{
   clinicalTrialId: Scalars['Int'];
@@ -7493,20 +7490,20 @@ export type EvidenceDetailQueryVariables = Exact<{
 }>;
 
 
-export type EvidenceDetailQuery = { __typename: 'Query', evidenceItem?: { __typename: 'EvidenceItem', id: number, name: string, status: EvidenceStatus, submissionEvent: { __typename: 'Event', originatingUser: { __typename: 'User', id: number } }, molecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string }, assertions: Array<{ __typename: 'Assertion', id: number, name: string, link: string }>, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, submissionActivity: { __typename: 'SubmitEvidenceItemActivity', createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, profileImagePath?: string | undefined } } } | undefined };
+export type EvidenceDetailQuery = { __typename: 'Query', evidenceItem?: { __typename: 'EvidenceItem', id: number, name: string, status: EvidenceStatus, submissionEvent: { __typename: 'Event', originatingUser: { __typename: 'User', id: number } }, molecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string }, assertions: Array<{ __typename: 'Assertion', id: number, name: string, link: string }>, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, submissionActivity: { __typename: 'SubmitEvidenceItemActivity', createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, profileImagePath?: string | undefined } } } | undefined };
 
-export type EvidenceDetailFieldsFragment = { __typename: 'EvidenceItem', id: number, name: string, status: EvidenceStatus, submissionEvent: { __typename: 'Event', originatingUser: { __typename: 'User', id: number } }, molecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string }, assertions: Array<{ __typename: 'Assertion', id: number, name: string, link: string }>, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, submissionActivity: { __typename: 'SubmitEvidenceItemActivity', createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, profileImagePath?: string | undefined } } };
+export type EvidenceDetailFieldsFragment = { __typename: 'EvidenceItem', id: number, name: string, status: EvidenceStatus, submissionEvent: { __typename: 'Event', originatingUser: { __typename: 'User', id: number } }, molecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string }, assertions: Array<{ __typename: 'Assertion', id: number, name: string, link: string }>, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, submissionActivity: { __typename: 'SubmitEvidenceItemActivity', createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, profileImagePath?: string | undefined } } };
 
-export type EvidenceSubmissionActivityFragment = { __typename: 'EvidenceItem', submissionActivity: { __typename: 'SubmitEvidenceItemActivity', createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, profileImagePath?: string | undefined } } };
+export type EvidenceSubmissionActivityFragment = { __typename: 'EvidenceItem', submissionActivity: { __typename: 'SubmitEvidenceItemActivity', createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, profileImagePath?: string | undefined } } };
 
 export type EvidenceSummaryQueryVariables = Exact<{
   evidenceId: Scalars['Int'];
 }>;
 
 
-export type EvidenceSummaryQuery = { __typename: 'Query', evidenceItem?: { __typename: 'EvidenceItem', id: number, name: string, description: string, status: EvidenceStatus, evidenceLevel: EvidenceLevel, evidenceType: EvidenceType, evidenceDirection: EvidenceDirection, significance: EvidenceSignificance, variantOrigin: VariantOrigin, therapyInteractionType?: TherapyInteraction | undefined, evidenceRating?: number | undefined, therapies: Array<{ __typename: 'Therapy', id: number, name: string, link: string }>, disease?: { __typename: 'Disease', id: number, name: string, link: string } | undefined, phenotypes: Array<{ __typename: 'Phenotype', id: number, name: string, link: string }>, source: { __typename: 'Source', id: number, citation?: string | undefined, citationId: string, sourceType: SourceSource, displayType: string, sourceUrl?: string | undefined, ascoAbstractId?: number | undefined, link: string, clinicalTrials?: Array<{ __typename: 'ClinicalTrial', nctId: string, id: number, link: string }> | undefined }, molecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, parsedName: Array<{ __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'MolecularProfileTextSegment', text: string } | { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean }> }, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, submissionActivity: { __typename: 'SubmitEvidenceItemActivity', createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', displayName: string, profileImagePath?: string | undefined, id: number, role: UserRole } }, acceptanceEvent?: { __typename: 'Event', createdAt: any, originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, submissionEvent: { __typename: 'Event', createdAt: any, originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } }, rejectionEvent?: { __typename: 'Event', createdAt: any, originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined } | undefined };
+export type EvidenceSummaryQuery = { __typename: 'Query', evidenceItem?: { __typename: 'EvidenceItem', id: number, name: string, description: string, status: EvidenceStatus, evidenceLevel: EvidenceLevel, evidenceType: EvidenceType, evidenceDirection: EvidenceDirection, significance: EvidenceSignificance, variantOrigin: VariantOrigin, therapyInteractionType?: TherapyInteraction | undefined, evidenceRating?: number | undefined, therapies: Array<{ __typename: 'Therapy', id: number, name: string, link: string }>, disease?: { __typename: 'Disease', id: number, name: string, link: string } | undefined, phenotypes: Array<{ __typename: 'Phenotype', id: number, name: string, link: string }>, source: { __typename: 'Source', id: number, citation?: string | undefined, citationId: string, sourceType: SourceSource, displayType: string, sourceUrl?: string | undefined, ascoAbstractId?: number | undefined, link: string, clinicalTrials?: Array<{ __typename: 'ClinicalTrial', nctId: string, id: number, link: string }> | undefined }, molecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, parsedName: Array<{ __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'MolecularProfileTextSegment', text: string } | { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean }> }, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, submissionActivity: { __typename: 'SubmitEvidenceItemActivity', createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', displayName: string, profileImagePath?: string | undefined, id: number, role: UserRole } }, acceptanceEvent?: { __typename: 'Event', createdAt: any, originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, submissionEvent: { __typename: 'Event', createdAt: any, originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } }, rejectionEvent?: { __typename: 'Event', createdAt: any, originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined } | undefined };
 
-export type EvidenceSummaryFieldsFragment = { __typename: 'EvidenceItem', id: number, name: string, description: string, status: EvidenceStatus, evidenceLevel: EvidenceLevel, evidenceType: EvidenceType, evidenceDirection: EvidenceDirection, significance: EvidenceSignificance, variantOrigin: VariantOrigin, therapyInteractionType?: TherapyInteraction | undefined, evidenceRating?: number | undefined, therapies: Array<{ __typename: 'Therapy', id: number, name: string, link: string }>, disease?: { __typename: 'Disease', id: number, name: string, link: string } | undefined, phenotypes: Array<{ __typename: 'Phenotype', id: number, name: string, link: string }>, source: { __typename: 'Source', id: number, citation?: string | undefined, citationId: string, sourceType: SourceSource, displayType: string, sourceUrl?: string | undefined, ascoAbstractId?: number | undefined, link: string, clinicalTrials?: Array<{ __typename: 'ClinicalTrial', nctId: string, id: number, link: string }> | undefined }, molecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, parsedName: Array<{ __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'MolecularProfileTextSegment', text: string } | { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean }> }, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, submissionActivity: { __typename: 'SubmitEvidenceItemActivity', createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', displayName: string, profileImagePath?: string | undefined, id: number, role: UserRole } }, acceptanceEvent?: { __typename: 'Event', createdAt: any, originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, submissionEvent: { __typename: 'Event', createdAt: any, originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } }, rejectionEvent?: { __typename: 'Event', createdAt: any, originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined };
+export type EvidenceSummaryFieldsFragment = { __typename: 'EvidenceItem', id: number, name: string, description: string, status: EvidenceStatus, evidenceLevel: EvidenceLevel, evidenceType: EvidenceType, evidenceDirection: EvidenceDirection, significance: EvidenceSignificance, variantOrigin: VariantOrigin, therapyInteractionType?: TherapyInteraction | undefined, evidenceRating?: number | undefined, therapies: Array<{ __typename: 'Therapy', id: number, name: string, link: string }>, disease?: { __typename: 'Disease', id: number, name: string, link: string } | undefined, phenotypes: Array<{ __typename: 'Phenotype', id: number, name: string, link: string }>, source: { __typename: 'Source', id: number, citation?: string | undefined, citationId: string, sourceType: SourceSource, displayType: string, sourceUrl?: string | undefined, ascoAbstractId?: number | undefined, link: string, clinicalTrials?: Array<{ __typename: 'ClinicalTrial', nctId: string, id: number, link: string }> | undefined }, molecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, parsedName: Array<{ __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'MolecularProfileTextSegment', text: string } | { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean }> }, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, submissionActivity: { __typename: 'SubmitEvidenceItemActivity', createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', displayName: string, profileImagePath?: string | undefined, id: number, role: UserRole } }, acceptanceEvent?: { __typename: 'Event', createdAt: any, originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, submissionEvent: { __typename: 'Event', createdAt: any, originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } }, rejectionEvent?: { __typename: 'Event', createdAt: any, originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined };
 
 export type FeatureDetailQueryVariables = Exact<{
   featureId: Scalars['Int'];
@@ -7533,9 +7530,9 @@ export type MolecularProfileDetailQueryVariables = Exact<{
 }>;
 
 
-export type MolecularProfileDetailQuery = { __typename: 'Query', molecularProfile?: { __typename: 'MolecularProfile', id: number, name: string, deprecated: boolean, deprecationReason?: MolecularProfileDeprecationReason | undefined, molecularProfileAliases: Array<string>, complexMolecularProfileDeprecationActivity?: { __typename: 'DeprecateComplexMolecularProfileActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, deprecatedVariants: Array<{ __typename: 'Variant', deprecationReason?: VariantDeprecationReason | undefined, id: number, deprecated: boolean, name: string, link: string, deprecationActivity?: { __typename: 'DeprecateVariantActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined }>, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, variants: Array<{ __typename: 'Variant', id: number }> } | undefined };
+export type MolecularProfileDetailQuery = { __typename: 'Query', molecularProfile?: { __typename: 'MolecularProfile', id: number, name: string, deprecated: boolean, deprecationReason?: MolecularProfileDeprecationReason | undefined, molecularProfileAliases: Array<string>, complexMolecularProfileDeprecationActivity?: { __typename: 'DeprecateComplexMolecularProfileActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, deprecatedVariants: Array<{ __typename: 'Variant', deprecationReason?: VariantDeprecationReason | undefined, id: number, deprecated: boolean, name: string, link: string, deprecationActivity?: { __typename: 'DeprecateVariantActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, feature: { __typename: 'Feature', id: number, name: string, link: string } }>, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, variants: Array<{ __typename: 'Variant', id: number }> } | undefined };
 
-export type MolecularProfileDetailFieldsFragment = { __typename: 'MolecularProfile', id: number, name: string, deprecated: boolean, deprecationReason?: MolecularProfileDeprecationReason | undefined, molecularProfileAliases: Array<string>, complexMolecularProfileDeprecationActivity?: { __typename: 'DeprecateComplexMolecularProfileActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, deprecatedVariants: Array<{ __typename: 'Variant', deprecationReason?: VariantDeprecationReason | undefined, id: number, deprecated: boolean, name: string, link: string, deprecationActivity?: { __typename: 'DeprecateVariantActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined }>, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, variants: Array<{ __typename: 'Variant', id: number }> };
+export type MolecularProfileDetailFieldsFragment = { __typename: 'MolecularProfile', id: number, name: string, deprecated: boolean, deprecationReason?: MolecularProfileDeprecationReason | undefined, molecularProfileAliases: Array<string>, complexMolecularProfileDeprecationActivity?: { __typename: 'DeprecateComplexMolecularProfileActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, deprecatedVariants: Array<{ __typename: 'Variant', deprecationReason?: VariantDeprecationReason | undefined, id: number, deprecated: boolean, name: string, link: string, deprecationActivity?: { __typename: 'DeprecateVariantActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, feature: { __typename: 'Feature', id: number, name: string, link: string } }>, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, variants: Array<{ __typename: 'Variant', id: number }> };
 
 export type MolecularProfileSummaryQueryVariables = Exact<{
   mpId: Scalars['Int'];
@@ -7661,7 +7658,7 @@ export type UserNotificationsQueryVariables = Exact<{
 }>;
 
 
-export type UserNotificationsQuery = { __typename: 'Query', notifications: { __typename: 'NotificationConnection', eventTypes: Array<EventAction>, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, notificationSubjects: Array<{ __typename: 'EventSubjectWithCount', occuranceCount: number, subject?: { __typename: 'Assertion', id: number, name: string } | { __typename: 'EvidenceItem', id: number, name: string } | { __typename: 'Feature', id: number, name: string } | { __typename: 'Flag', id: number, name: string } | { __typename: 'Gene', id: number, name: string } | { __typename: 'MolecularProfile', id: number, name: string } | { __typename: 'Revision', id: number, name: string } | { __typename: 'RevisionSet', id: number, name: string } | { __typename: 'Source', id: number, name: string } | { __typename: 'SourcePopover', id: number, name: string } | { __typename: 'SourceSuggestion', id: number, name: string } | { __typename: 'Variant', id: number, name: string } | { __typename: 'VariantGroup', id: number, name: string } | undefined }>, originatingUsers: Array<{ __typename: 'User', id: number, displayName: string }>, organizations: Array<{ __typename: 'Organization', id: number, name: string }>, edges: Array<{ __typename: 'NotificationEdge', node?: { __typename: 'Notification', id: number, type: NotificationReason, seen: boolean, event: { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined }, subscription?: { __typename: 'Subscription', id: number, subscribable: { __typename: 'Assertion', id: number, name: string } | { __typename: 'EvidenceItem', id: number, name: string } | { __typename: 'Feature', id: number, name: string } | { __typename: 'Flag', id: number, name: string } | { __typename: 'Gene', id: number, name: string } | { __typename: 'MolecularProfile', id: number, name: string } | { __typename: 'Revision', id: number, name: string } | { __typename: 'RevisionSet', id: number, name: string } | { __typename: 'Source', id: number, name: string } | { __typename: 'SourcePopover', id: number, name: string } | { __typename: 'SourceSuggestion', id: number, name: string } | { __typename: 'Variant', id: number, name: string } | { __typename: 'VariantGroup', id: number, name: string } } | undefined } | undefined }> } };
+export type UserNotificationsQuery = { __typename: 'Query', notifications: { __typename: 'NotificationConnection', eventTypes: Array<EventAction>, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, notificationSubjects: Array<{ __typename: 'EventSubjectWithCount', occuranceCount: number, subject?: { __typename: 'Assertion', id: number, name: string } | { __typename: 'EvidenceItem', id: number, name: string } | { __typename: 'Feature', id: number, name: string } | { __typename: 'Flag', id: number, name: string } | { __typename: 'Gene', id: number, name: string } | { __typename: 'MolecularProfile', id: number, name: string } | { __typename: 'Revision', id: number, name: string } | { __typename: 'RevisionSet', id: number, name: string } | { __typename: 'Source', id: number, name: string } | { __typename: 'SourcePopover', id: number, name: string } | { __typename: 'SourceSuggestion', id: number, name: string } | { __typename: 'Variant', id: number, name: string } | { __typename: 'VariantGroup', id: number, name: string } | undefined }>, originatingUsers: Array<{ __typename: 'User', id: number, displayName: string }>, organizations: Array<{ __typename: 'Organization', id: number, name: string }>, edges: Array<{ __typename: 'NotificationEdge', node?: { __typename: 'Notification', id: number, type: NotificationReason, seen: boolean, event: { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined }, subscription?: { __typename: 'Subscription', id: number, subscribable: { __typename: 'Assertion', id: number, name: string } | { __typename: 'EvidenceItem', id: number, name: string } | { __typename: 'Feature', id: number, name: string } | { __typename: 'Flag', id: number, name: string } | { __typename: 'Gene', id: number, name: string } | { __typename: 'MolecularProfile', id: number, name: string } | { __typename: 'Revision', id: number, name: string } | { __typename: 'RevisionSet', id: number, name: string } | { __typename: 'Source', id: number, name: string } | { __typename: 'SourcePopover', id: number, name: string } | { __typename: 'SourceSuggestion', id: number, name: string } | { __typename: 'Variant', id: number, name: string } | { __typename: 'VariantGroup', id: number, name: string } } | undefined } | undefined }> } };
 
 export type NotificationOrganizationFragment = { __typename: 'Organization', id: number, name: string };
 
@@ -7669,14 +7666,14 @@ export type NotificationOriginatingUsersFragment = { __typename: 'User', id: num
 
 export type NotificationFeedSubjectsFragment = { __typename: 'EventSubjectWithCount', occuranceCount: number, subject?: { __typename: 'Assertion', id: number, name: string } | { __typename: 'EvidenceItem', id: number, name: string } | { __typename: 'Feature', id: number, name: string } | { __typename: 'Flag', id: number, name: string } | { __typename: 'Gene', id: number, name: string } | { __typename: 'MolecularProfile', id: number, name: string } | { __typename: 'Revision', id: number, name: string } | { __typename: 'RevisionSet', id: number, name: string } | { __typename: 'Source', id: number, name: string } | { __typename: 'SourcePopover', id: number, name: string } | { __typename: 'SourceSuggestion', id: number, name: string } | { __typename: 'Variant', id: number, name: string } | { __typename: 'VariantGroup', id: number, name: string } | undefined };
 
-export type NotificationNodeFragment = { __typename: 'Notification', id: number, type: NotificationReason, seen: boolean, event: { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined }, subscription?: { __typename: 'Subscription', id: number, subscribable: { __typename: 'Assertion', id: number, name: string } | { __typename: 'EvidenceItem', id: number, name: string } | { __typename: 'Feature', id: number, name: string } | { __typename: 'Flag', id: number, name: string } | { __typename: 'Gene', id: number, name: string } | { __typename: 'MolecularProfile', id: number, name: string } | { __typename: 'Revision', id: number, name: string } | { __typename: 'RevisionSet', id: number, name: string } | { __typename: 'Source', id: number, name: string } | { __typename: 'SourcePopover', id: number, name: string } | { __typename: 'SourceSuggestion', id: number, name: string } | { __typename: 'Variant', id: number, name: string } | { __typename: 'VariantGroup', id: number, name: string } } | undefined };
+export type NotificationNodeFragment = { __typename: 'Notification', id: number, type: NotificationReason, seen: boolean, event: { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined }, subscription?: { __typename: 'Subscription', id: number, subscribable: { __typename: 'Assertion', id: number, name: string } | { __typename: 'EvidenceItem', id: number, name: string } | { __typename: 'Feature', id: number, name: string } | { __typename: 'Flag', id: number, name: string } | { __typename: 'Gene', id: number, name: string } | { __typename: 'MolecularProfile', id: number, name: string } | { __typename: 'Revision', id: number, name: string } | { __typename: 'RevisionSet', id: number, name: string } | { __typename: 'Source', id: number, name: string } | { __typename: 'SourcePopover', id: number, name: string } | { __typename: 'SourceSuggestion', id: number, name: string } | { __typename: 'Variant', id: number, name: string } | { __typename: 'VariantGroup', id: number, name: string } } | undefined };
 
 export type UpdateNotificationStatusMutationVariables = Exact<{
   input: UpdateNotificationStatusInput;
 }>;
 
 
-export type UpdateNotificationStatusMutation = { __typename: 'Mutation', updateNotificationStatus?: { __typename: 'UpdateNotificationStatusPayload', notifications: Array<{ __typename: 'Notification', id: number, type: NotificationReason, seen: boolean, event: { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined }, subscription?: { __typename: 'Subscription', id: number, subscribable: { __typename: 'Assertion', id: number, name: string } | { __typename: 'EvidenceItem', id: number, name: string } | { __typename: 'Feature', id: number, name: string } | { __typename: 'Flag', id: number, name: string } | { __typename: 'Gene', id: number, name: string } | { __typename: 'MolecularProfile', id: number, name: string } | { __typename: 'Revision', id: number, name: string } | { __typename: 'RevisionSet', id: number, name: string } | { __typename: 'Source', id: number, name: string } | { __typename: 'SourcePopover', id: number, name: string } | { __typename: 'SourceSuggestion', id: number, name: string } | { __typename: 'Variant', id: number, name: string } | { __typename: 'VariantGroup', id: number, name: string } } | undefined }> } | undefined };
+export type UpdateNotificationStatusMutation = { __typename: 'Mutation', updateNotificationStatus?: { __typename: 'UpdateNotificationStatusPayload', notifications: Array<{ __typename: 'Notification', id: number, type: NotificationReason, seen: boolean, event: { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined }, subscription?: { __typename: 'Subscription', id: number, subscribable: { __typename: 'Assertion', id: number, name: string } | { __typename: 'EvidenceItem', id: number, name: string } | { __typename: 'Feature', id: number, name: string } | { __typename: 'Flag', id: number, name: string } | { __typename: 'Gene', id: number, name: string } | { __typename: 'MolecularProfile', id: number, name: string } | { __typename: 'Revision', id: number, name: string } | { __typename: 'RevisionSet', id: number, name: string } | { __typename: 'Source', id: number, name: string } | { __typename: 'SourcePopover', id: number, name: string } | { __typename: 'SourceSuggestion', id: number, name: string } | { __typename: 'Variant', id: number, name: string } | { __typename: 'VariantGroup', id: number, name: string } } | undefined }> } | undefined };
 
 export type UnsubscribeMutationVariables = Exact<{
   input: UnsubscribeInput;
@@ -7724,9 +7721,9 @@ export type VariantDetailQueryVariables = Exact<{
 }>;
 
 
-export type VariantDetailQuery = { __typename: 'Query', variant?: { __typename: 'Variant', id: number, name: string, deprecated: boolean, deprecationReason?: VariantDeprecationReason | undefined, variantAliases: Array<string>, deprecationActivity?: { __typename: 'DeprecateVariantActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, feature: { __typename: 'Feature', id: number, name: string, link: string }, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number } } | undefined };
+export type VariantDetailQuery = { __typename: 'Query', variant?: { __typename: 'Variant', id: number, name: string, deprecated: boolean, deprecationReason?: VariantDeprecationReason | undefined, variantAliases: Array<string>, deprecationActivity?: { __typename: 'DeprecateVariantActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, feature: { __typename: 'Feature', id: number, name: string, link: string }, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number } } | undefined };
 
-export type VariantDetailFieldsFragment = { __typename: 'Variant', id: number, name: string, deprecated: boolean, deprecationReason?: VariantDeprecationReason | undefined, variantAliases: Array<string>, deprecationActivity?: { __typename: 'DeprecateVariantActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, feature: { __typename: 'Feature', id: number, name: string, link: string }, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number } };
+export type VariantDetailFieldsFragment = { __typename: 'Variant', id: number, name: string, deprecated: boolean, deprecationReason?: VariantDeprecationReason | undefined, variantAliases: Array<string>, deprecationActivity?: { __typename: 'DeprecateVariantActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, feature: { __typename: 'Feature', id: number, name: string, link: string }, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number } };
 
 export type VariantSummaryQueryVariables = Exact<{
   variantId: Scalars['Int'];
@@ -7781,6 +7778,11 @@ export const ActivityFeedNodeFragmentDoc = gql`
     }
     ... on Variant {
       deprecated
+      feature {
+        id
+        name
+        link
+      }
     }
     ... on MolecularProfile {
       deprecated
@@ -7958,6 +7960,11 @@ export const ParsedCommentFragmentFragmentDoc = gql`
     deprecated
     link
     revisionSetId
+    feature {
+      id
+      name
+      link
+    }
     __typename
   }
   ... on CommentTextSegment {
@@ -8010,6 +8017,14 @@ export const CommentPopoverFragmentDoc = gql`
     id
     name
     link
+    ... on Variant {
+      deprecated
+      feature {
+        id
+        name
+        link
+      }
+    }
     __typename
   }
 }
@@ -8068,6 +8083,11 @@ export const EventFeedNodeFragmentDoc = gql`
     }
     ... on Variant {
       deprecated
+      feature {
+        id
+        link
+        name
+      }
     }
     ... on MolecularProfile {
       deprecated
@@ -8328,6 +8348,14 @@ export const FlagPopoverFragmentDoc = gql`
     id
     link
     name
+    ... on Variant {
+      deprecated
+      feature {
+        id
+        name
+        link
+      }
+    }
   }
   createdAt
   openActivity {
@@ -8498,6 +8526,14 @@ export const RevisionPopoverFragmentDoc = gql`
     id
     link
     name
+    ... on Variant {
+      deprecated
+      feature {
+        id
+        name
+        link
+      }
+    }
   }
   createdAt
   linkoutData {
@@ -8524,6 +8560,12 @@ export const RevisionFragmentDoc = gql`
           entityType
           link
           deleted
+          deprecated
+          feature {
+            link
+            id
+            name
+          }
         }
         addedObjects {
           id
@@ -8532,6 +8574,12 @@ export const RevisionFragmentDoc = gql`
           entityType
           link
           deleted
+          deprecated
+          feature {
+            link
+            id
+            name
+          }
         }
         removedObjects {
           id
@@ -8540,6 +8588,12 @@ export const RevisionFragmentDoc = gql`
           entityType
           link
           deleted
+          deprecated
+          feature {
+            link
+            id
+            name
+          }
         }
         keptObjects {
           id
@@ -8548,6 +8602,12 @@ export const RevisionFragmentDoc = gql`
           entityType
           link
           deleted
+          deprecated
+          feature {
+            link
+            id
+            name
+          }
         }
         suggestedObjects {
           id
@@ -8556,6 +8616,12 @@ export const RevisionFragmentDoc = gql`
           entityType
           link
           deleted
+          deprecated
+          feature {
+            link
+            id
+            name
+          }
         }
       }
       ... on ScalarFieldDiff {
@@ -8758,6 +8824,12 @@ export const VariantGroupPopoverFieldsFragmentDoc = gql`
         id
         name
         link
+        deprecated
+        feature {
+          id
+          name
+          link
+        }
       }
     }
   }
@@ -8889,30 +8961,6 @@ export const BrowseVariantsFieldsFragmentDoc = gql`
   }
 }
     `;
-export const PreviewCommentFragmentDoc = gql`
-    fragment previewComment on CommentBodySegment {
-  __typename
-  ... on CommentTagSegment {
-    entityId
-    displayName
-    tagType
-    link
-    status
-    deprecated
-    __typename
-  }
-  ... on CommentTextSegment {
-    text
-    __typename
-  }
-  ... on User {
-    id
-    displayName
-    role
-    __typename
-  }
-}
-    `;
 export const RevisableAssertionFieldsFragmentDoc = gql`
     fragment RevisableAssertionFields on Assertion {
   id
@@ -9763,6 +9811,11 @@ export const MolecularProfileDetailFieldsFragmentDoc = gql`
     deprecated
     name
     link
+    feature {
+      id
+      name
+      link
+    }
   }
   molecularProfileAliases
   flags(state: OPEN) {
@@ -12399,10 +12452,10 @@ export const AddCommentDocument = gql`
 export const PreviewCommentDocument = gql`
     query previewComment($commentText: String!) {
   previewCommentText(commentText: $commentText) {
-    ...previewComment
+    ...parsedCommentFragment
   }
 }
-    ${PreviewCommentFragmentDoc}`;
+    ${ParsedCommentFragmentFragmentDoc}`;
 
   @Injectable({
     providedIn: 'root'
diff --git a/client/src/app/generated/server.model.graphql b/client/src/app/generated/server.model.graphql
index fcbb74768..9a4fbd3bc 100644
--- a/client/src/app/generated/server.model.graphql
+++ b/client/src/app/generated/server.model.graphql
@@ -1652,6 +1652,7 @@ type CommentTagSegment {
   deprecated: Boolean
   displayName: String!
   entityId: Int!
+  feature: LinkableFeature
   link: String!
   revisionSetId: Int
   status: EvidenceStatus
@@ -3961,6 +3962,8 @@ type LinkableTherapy {
 }
 
 type LinkableVariant {
+  deprecated: Boolean
+  feature: LinkableFeature
   id: Int!
   link: String!
   name: String!
@@ -4128,9 +4131,11 @@ input ModeratedInput {
 
 type ModeratedObjectField {
   deleted: Boolean!
+  deprecated: Boolean
   displayName: String
   displayType: String
   entityType: String!
+  feature: LinkableFeature
   id: Int!
   link: String
 }
diff --git a/client/src/app/generated/server.schema.json b/client/src/app/generated/server.schema.json
index 1431ba468..b476a1c90 100644
--- a/client/src/app/generated/server.schema.json
+++ b/client/src/app/generated/server.schema.json
@@ -8261,6 +8261,18 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "feature",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "LinkableFeature",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "link",
               "description": null,
@@ -19015,6 +19027,30 @@
           "name": "LinkableVariant",
           "description": null,
           "fields": [
+            {
+              "name": "deprecated",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "Boolean",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "feature",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "LinkableFeature",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "id",
               "description": null,
@@ -19906,6 +19942,18 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "deprecated",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "Boolean",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "displayName",
               "description": null,
@@ -19946,6 +19994,18 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "feature",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "LinkableFeature",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "id",
               "description": null,
diff --git a/client/src/app/views/molecular-profiles/molecular-profiles-detail/molecular-profiles-detail.module.ts b/client/src/app/views/molecular-profiles/molecular-profiles-detail/molecular-profiles-detail.module.ts
index 39deca4e1..9e0ddaa2a 100644
--- a/client/src/app/views/molecular-profiles/molecular-profiles-detail/molecular-profiles-detail.module.ts
+++ b/client/src/app/views/molecular-profiles/molecular-profiles-detail/molecular-profiles-detail.module.ts
@@ -13,12 +13,12 @@ import { CvcContributorAvatarsModule } from '@app/components/shared/contributor-
 import { CvcEntitySubscriptionButtonModule } from '@app/components/shared/entity-subscription-button/entity-subscription-button.module'
 import { MolecularProfileDetailRoutingModule } from './molecular-profiles-detail-routing.module'
 import { MolecularProfilesDetailView } from './molecular-profiles-detail.view'
-import { CvcVariantTagModule } from '@app/components/variants/variant-tag/variant-tag.module'
 import { CvcPipesModule } from '@app/core/pipes/pipes.module'
 import { NzAlertModule } from 'ng-zorro-antd/alert'
 import { CvcCommentBodyModule } from '@app/components/comments/comment-body/comment-body.module'
 import { ComplexMolecularProfileDeprecateFormModule } from '@app/forms/components/complex-molecular-profile-deprecate/complex-molecular-profile-deprecate.module'
 import { NzPopoverModule } from 'ng-zorro-antd/popover'
+import { CvcFeatureVariantTagModule } from '@app/components/shared/feature-variant-tag/feature-variant-tag.module'
 
 @NgModule({
   declarations: [MolecularProfilesDetailView],
@@ -40,7 +40,7 @@ import { NzPopoverModule } from 'ng-zorro-antd/popover'
     CvcFlaggableModule,
     CvcSectionNavigationModule,
     CvcEntitySubscriptionButtonModule,
-    CvcVariantTagModule,
+    CvcFeatureVariantTagModule,
     CvcPipesModule,
     CvcCommentBodyModule,
     ComplexMolecularProfileDeprecateFormModule,
diff --git a/client/src/app/views/molecular-profiles/molecular-profiles-detail/molecular-profiles-detail.query.gql b/client/src/app/views/molecular-profiles/molecular-profiles-detail/molecular-profiles-detail.query.gql
index 410ce3f42..ac664640d 100644
--- a/client/src/app/views/molecular-profiles/molecular-profiles-detail/molecular-profiles-detail.query.gql
+++ b/client/src/app/views/molecular-profiles/molecular-profiles-detail/molecular-profiles-detail.query.gql
@@ -25,6 +25,11 @@ fragment MolecularProfileDetailFields on MolecularProfile {
     deprecated
     name
     link
+    feature {
+      id
+      name
+      link
+    }
   }
   molecularProfileAliases
   flags(state: OPEN) {
diff --git a/client/src/app/views/molecular-profiles/molecular-profiles-detail/molecular-profiles-detail.view.html b/client/src/app/views/molecular-profiles/molecular-profiles-detail/molecular-profiles-detail.view.html
index 76d02d95a..529a05614 100644
--- a/client/src/app/views/molecular-profiles/molecular-profiles-detail/molecular-profiles-detail.view.html
+++ b/client/src/app/views/molecular-profiles/molecular-profiles-detail/molecular-profiles-detail.view.html
@@ -121,7 +121,7 @@
             underlying variants are deprecated
             <ng-container *ngFor="let v of mp.deprecatedVariants">
               <br />
-              <cvc-variant-tag [variant]="v"></cvc-variant-tag>
+              <cvc-feature-variant-tag [variant]="v"></cvc-feature-variant-tag>
               {{ v.deprecationReason | enumToTitle }}.
               <cvc-comment-body
                 *ngIf="v.deprecationActivity"
diff --git a/server/app/graphql/types/browse_tables/browse_disease_type.rb b/server/app/graphql/types/browse_tables/browse_disease_type.rb
index 5fd5bd2a4..1e2c3cf09 100644
--- a/server/app/graphql/types/browse_tables/browse_disease_type.rb
+++ b/server/app/graphql/types/browse_tables/browse_disease_type.rb
@@ -1,9 +1,6 @@
+require_relative '../linkable_tag.rb'
+
 module Types::BrowseTables
-  class LinkableFeatureType < Types::BaseObject
-    field :id, Int, null: false
-    field :name, String, null: false
-    field :link, String, null: false
-  end
 
   class BrowseDiseaseType < Types::BaseObject
     connection_type_class(Types::Connections::BrowseTableConnection)
@@ -13,7 +10,7 @@ class BrowseDiseaseType < Types::BaseObject
     field :name, String, null: false
     field :doid, String, null: true
     field :disease_url, String, null: true
-    field :features, [Types::BrowseTables::LinkableFeatureType], null: false
+    field :features, [Types::LinkableFeature], null: false
     field :variant_count, Int, null: false
     field :evidence_item_count, Int, null: false
     field :assertion_count, Int, null: false
diff --git a/server/app/graphql/types/browse_tables/browse_molecular_profile_type.rb b/server/app/graphql/types/browse_tables/browse_molecular_profile_type.rb
index 6e27cbf48..f32ff6a7d 100644
--- a/server/app/graphql/types/browse_tables/browse_molecular_profile_type.rb
+++ b/server/app/graphql/types/browse_tables/browse_molecular_profile_type.rb
@@ -1,26 +1,15 @@
+require_relative '../linkable_tag.rb'
+
 module Types::BrowseTables
   class BrowseMolecularProfileType < Types::BaseObject
     connection_type_class(Types::Connections::BrowseTableConnection)
 
-    class LinkableTag < Types::BaseObject
-      field :id, Int, null: false
-      field :link, String, null: false
-      field :name, String, null: false
-    end
-
-    class LinkableVariant < LinkableTag
-    end
-    class LinkableDisease < LinkableTag
-    end
-    class LinkableTherapy < LinkableTag
-    end
-
     field :id, Int, null: false
     field :name, String, null: false
-    field :diseases, [LinkableDisease], null: false
-    field :therapies, [LinkableTherapy], null: false
-    field :features, [LinkableFeatureType], null: false
-    field :variants,[LinkableVariant], null: false
+    field :diseases, [Types::LinkableDisease], null: false
+    field :therapies, [Types::LinkableTherapy], null: false
+    field :features, [Types::LinkableFeature], null: false
+    field :variants,[Types::LinkableVariant], null: false
     field :link, String, null: false
     field :evidence_item_count, Int, null: false
     field :assertion_count, Int, null: false
diff --git a/server/app/graphql/types/commentable/comment_tag_segment.rb b/server/app/graphql/types/commentable/comment_tag_segment.rb
index 07d79d9e0..8bb4db9a4 100644
--- a/server/app/graphql/types/commentable/comment_tag_segment.rb
+++ b/server/app/graphql/types/commentable/comment_tag_segment.rb
@@ -1,3 +1,5 @@
+require_relative '../linkable_tag.rb'
+
 module Types::Commentable
   class CommentTagSegment < Types::BaseObject
     field :entity_id, GraphQL::Types::Int, null: false
@@ -7,5 +9,6 @@ class CommentTagSegment < Types::BaseObject
     field :deprecated, GraphQL::Types::Boolean, null: true
     field :link, GraphQL::Types::String, null: false
     field :revision_set_id, GraphQL::Types::Int, null: true
+    field :feature, Types::LinkableFeature, null: true
   end
 end
diff --git a/server/app/graphql/types/interfaces/commentable.rb b/server/app/graphql/types/interfaces/commentable.rb
index d6cc365de..3ccb3ef24 100644
--- a/server/app/graphql/types/interfaces/commentable.rb
+++ b/server/app/graphql/types/interfaces/commentable.rb
@@ -30,7 +30,9 @@ def resolve_type(object, context)
         when Source
           Types::Entities::SourceType
         when MolecularProfile
-          Types::Entities::MolecularProfile
+          Types::Entities::MolecularProfileType
+        when Feature
+          Types::Entities::FeatureType
         else
           raise "Unexpected Commentable type: #{object.class}"
         end
diff --git a/server/app/graphql/types/linkable_tag.rb b/server/app/graphql/types/linkable_tag.rb
new file mode 100644
index 000000000..5e0e64a35
--- /dev/null
+++ b/server/app/graphql/types/linkable_tag.rb
@@ -0,0 +1,21 @@
+module Types
+  class LinkableTag < Types::BaseObject
+    field :id, Int, null: false
+    field :link, String, null: false
+    field :name, String, null: false
+  end
+
+  class LinkableDisease < LinkableTag
+  end
+
+  class LinkableTherapy < LinkableTag
+  end
+
+  class LinkableFeature < LinkableTag
+  end
+
+  class LinkableVariant < LinkableTag
+    field :deprecated, Boolean, null: true
+    field :feature, LinkableFeature, null: true
+  end
+end
diff --git a/server/app/graphql/types/revisions/linkout_data.rb b/server/app/graphql/types/revisions/linkout_data.rb
index 90b8d3d4a..c28d9f957 100644
--- a/server/app/graphql/types/revisions/linkout_data.rb
+++ b/server/app/graphql/types/revisions/linkout_data.rb
@@ -86,6 +86,8 @@ def self.value_for_set(r, set:)
           display_name: obj.display_name,
           display_type: obj.respond_to?(:display_type) ? obj.display_type : nil,
           link: obj.respond_to?(:link) ? obj.link : "",
+          deprecated: obj.respond_to?(:deprecated) ? obj.deprecated : nil,
+          feature: obj.respond_to?(:feature) ? obj.feature : nil,
           deleted: false
         }
       end
@@ -100,6 +102,8 @@ def self.value_for_set(r, set:)
               display_name: nil,
               display_type: nil,
               link: nil,
+              deprecated: nil,
+              feature: nil,
               deleted: true
             }
           end
diff --git a/server/app/graphql/types/revisions/moderated_field_type.rb b/server/app/graphql/types/revisions/moderated_field_type.rb
index d7f12ba2c..d5980452c 100644
--- a/server/app/graphql/types/revisions/moderated_field_type.rb
+++ b/server/app/graphql/types/revisions/moderated_field_type.rb
@@ -1,3 +1,5 @@
+require_relative '../linkable_tag.rb'
+
 module Types::Revisions
   class ModeratedObjectField < Types::BaseObject
     field :id, Int, null: false
@@ -6,6 +8,8 @@ class ModeratedObjectField < Types::BaseObject
     field :entity_type, String, null: false
     field :link, String, null: true
     field :deleted, Boolean, null: false
+    field :feature, Types::LinkableFeature, null: true
+    field :deprecated, Boolean, null: true
   end
 
   class ScalarFieldType < Types::BaseObject
diff --git a/server/app/models/actions/extract_references.rb b/server/app/models/actions/extract_references.rb
index 591b21d69..c59a3eed8 100644
--- a/server/app/models/actions/extract_references.rb
+++ b/server/app/models/actions/extract_references.rb
@@ -32,6 +32,8 @@ def find_matches
                   deprecated: self.class.deprecation_value_for_referenced_entity(referenced_item),
                   link: referenced_item.link,
                   revision_set_id: referenced_item.respond_to?(:revision_set_id) ? referenced_item.revision_set_id : nil,
+                  feature: referenced_item.respond_to?(:feature) ? referenced_item.feature : nil
+
                 }
               else
                 split_segment
@@ -73,6 +75,7 @@ def self.typeahead_matches(query_term)
             tag_type: tag_type,
             status: status_value_for_referenced_entity(referenced_item),
             deprecated: self.deprecation_value_for_referenced_entity(referenced_item),
+            feature: referenced_item.respond_to?(:feature) ? referenced_item.feature : nil,
           }
           end
         else

From 63a77ff92c7bf5e8fa747e99db75244ddc1dfb69 Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Fri, 5 Jan 2024 09:04:01 -0600
Subject: [PATCH 038/125] display feature name on variant pages

---
 .../features/features-detail/features-detail.view.html     | 7 ++++++-
 .../variants/variants-detail/variants-detail.module.ts     | 2 ++
 .../variants/variants-detail/variants-detail.view.html     | 5 +++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/client/src/app/views/features/features-detail/features-detail.view.html b/client/src/app/views/features/features-detail/features-detail.view.html
index 40181b89d..c896d572b 100644
--- a/client/src/app/views/features/features-detail/features-detail.view.html
+++ b/client/src/app/views/features/features-detail/features-detail.view.html
@@ -9,12 +9,17 @@
       <nz-page-header-title
         cvcFlaggableOptions
         [ngClass]="{ 'flagged': feature.flags.totalCount > 0 }">
+        <span
+          nz-typography
+          style="color: #bbb"
+          >{{ feature.featureInstance.__typename |uppercase }}</span
+        >
         <i
           nz-icon
           nzTheme="twotone"
           [nzTwotoneColor]="'Feature' | entityColor"
           nzType="civic-feature"></i>
-        {{ feature.featureInstance.__typename }} - {{ feature.name }}
+        {{ feature.name }}
       </nz-page-header-title>
 
       <!-- subtitle -->
diff --git a/client/src/app/views/variants/variants-detail/variants-detail.module.ts b/client/src/app/views/variants/variants-detail/variants-detail.module.ts
index 8765923be..5d38fc2c1 100644
--- a/client/src/app/views/variants/variants-detail/variants-detail.module.ts
+++ b/client/src/app/views/variants/variants-detail/variants-detail.module.ts
@@ -17,6 +17,7 @@ import { NzIconModule } from 'ng-zorro-antd/icon'
 import { NzPageHeaderModule } from 'ng-zorro-antd/page-header'
 import { NzPopoverModule } from 'ng-zorro-antd/popover'
 import { NzSpaceModule } from 'ng-zorro-antd/space'
+import { NzTypographyModule } from 'ng-zorro-antd/typography'
 import { VariantsDetailRoutingModule } from './variants-detail-routing.module'
 import { VariantsDetailView } from './variants-detail.view'
 
@@ -35,6 +36,7 @@ import { VariantsDetailView } from './variants-detail.view'
     NzGridModule,
     NzAlertModule,
     NzPopoverModule,
+    NzTypographyModule,
 
     CvcContributorAvatarsModule,
     CvcTabNavigationModule,
diff --git a/client/src/app/views/variants/variants-detail/variants-detail.view.html b/client/src/app/views/variants/variants-detail/variants-detail.view.html
index 837264a50..72190484f 100644
--- a/client/src/app/views/variants/variants-detail/variants-detail.view.html
+++ b/client/src/app/views/variants/variants-detail/variants-detail.view.html
@@ -35,6 +35,11 @@
           nzTheme="twotone"
           [nzTwotoneColor]="'Variant' | entityColor"
           nzType="civic-variant"></i>
+        <span
+          nz-typography
+          style="color: #bbb">
+          {{ variant.feature.name }}
+        </span>
         {{ variant.name }}
       </nz-page-header-title>
 

From 84421dd1dd51d91f1965ef7b42ad894d643cde32 Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Wed, 10 Jan 2024 11:34:48 -0600
Subject: [PATCH 039/125] fix typo in backfill script

---
 server/misc_scripts/features/backfill_gene_feature.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/misc_scripts/features/backfill_gene_feature.rb b/server/misc_scripts/features/backfill_gene_feature.rb
index 983e23a05..eec815bed 100644
--- a/server/misc_scripts/features/backfill_gene_feature.rb
+++ b/server/misc_scripts/features/backfill_gene_feature.rb
@@ -22,7 +22,7 @@
 
   feature.save!
 
-  Variants.where(gene_id: gene.id).find_each do |variant|
+  Variant.where(gene_id: gene.id).find_each do |variant|
     variant.feature = feature
     variant.save
   end

From 556283e6510981590f195790dbdadaecffccfad3 Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Thu, 11 Jan 2024 09:20:15 -0600
Subject: [PATCH 040/125] delegate link to feature

---
 server/app/models/concerns/is_feature_instance.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/server/app/models/concerns/is_feature_instance.rb b/server/app/models/concerns/is_feature_instance.rb
index 7798728c6..ffbc048ab 100644
--- a/server/app/models/concerns/is_feature_instance.rb
+++ b/server/app/models/concerns/is_feature_instance.rb
@@ -25,5 +25,6 @@ module IsFeatureInstance
     delegate :last_accepted_revision_event, to: :feature
     delegate :events, to: :feature
     delegate :last_submitted_revision_event, to: :feature
+    delegate :link, to: :feature
   end
 end

From 13bcdb0ae77601924123c12fd6fd1ff09d6827ca Mon Sep 17 00:00:00 2001
From: Joshua McMichael <jmcmichael@users.noreply.github.com>
Date: Thu, 11 Jan 2024 12:14:32 -0600
Subject: [PATCH 041/125] updating typescript, zone.js as per v16->v17
 checklist

---
 client/package.json |  8 ++---
 client/yarn.lock    | 75 ++++++++++++++++++++++++---------------------
 2 files changed, 44 insertions(+), 39 deletions(-)

diff --git a/client/package.json b/client/package.json
index 99c75d1d8..c93973276 100644
--- a/client/package.json
+++ b/client/package.json
@@ -45,11 +45,11 @@
     "rxjs-spy": "^8.0.2",
     "ts-enum-util": "^4.0.2",
     "ts-mixin-extended": "^1.1.1",
-    "zone.js": "~0.13.1"
+    "zone.js": "0.14.3"
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "^16.1.4",
-    "@angular-eslint/schematics": "^16.1.0",
+    "@angular-eslint/schematics": "^16.1.2",
     "@angular/cli": "^16.1.4",
     "@angular/compiler-cli": "16.1.5",
     "@graphql-codegen/add": "^3.2.3",
@@ -71,7 +71,7 @@
     "ts-node": "~10.9.1",
     "tslib": "^2.3.1",
     "tslint": "~6.1.0",
-    "typescript": "^4.9.4",
+    "typescript": "5.2.2",
     "webpack-bundle-analyzer": "^4.5.0"
   },
   "overrides": {
@@ -79,4 +79,4 @@
       "error-stack-parser": "2.0.6"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/client/yarn.lock b/client/yarn.lock
index 54bbb7efb..3064e4de4 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -128,50 +128,50 @@
     ora "5.4.1"
     rxjs "7.8.1"
 
-"@angular-eslint/bundled-angular-compiler@16.1.0":
-  version "16.1.0"
-  resolved "https://registry.yarnpkg.com/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-16.1.0.tgz#59fd1ff6423b02d6fa7eeb9ea30581a839471f2c"
-  integrity sha512-5EFAWXuFJADr3imo/ZYshY8s0K7U7wyysnE2LXnpT9PAi5rmkzt70UNZNRuamCbXr4tdIiu+fXWOj7tUuJKnnw==
-
-"@angular-eslint/eslint-plugin-template@16.1.0":
-  version "16.1.0"
-  resolved "https://registry.yarnpkg.com/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-16.1.0.tgz#3d88fba2baff4debf2d332fc3d2eea53a32b4efe"
-  integrity sha512-wQHWR5vqWGgO7mqoG5ixXeplIlz/OmxBJE9QMLPTZE8GdaTx8+F/5J37OWh84zCpD3mOa/FHYZxBDm2MfUmA1Q==
-  dependencies:
-    "@angular-eslint/bundled-angular-compiler" "16.1.0"
-    "@angular-eslint/utils" "16.1.0"
+"@angular-eslint/bundled-angular-compiler@16.1.2":
+  version "16.1.2"
+  resolved "https://registry.yarnpkg.com/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-16.1.2.tgz#85a4b185bfc4728bd2bd8b566ab0b473c34ee87a"
+  integrity sha512-wDiHPFsKTijMcQUPNcoHOJ5kezIPCCbmDK6LHH7hAdAC/eDY9NHL5e4zQ2Xkf3/r1PFuwVLGTwwreEHlmeENDw==
+
+"@angular-eslint/eslint-plugin-template@16.1.2":
+  version "16.1.2"
+  resolved "https://registry.yarnpkg.com/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-16.1.2.tgz#64fc98b3305707c630dfb473dce0630ed0fb602f"
+  integrity sha512-2qsoUgPg9Qp4EVUJRwWcJ+8JMxBb0ma3pNBjFmY6LOd59igRYorJKfWep4Nln1EicYRDRsCLzeLHO976+b1yaQ==
+  dependencies:
+    "@angular-eslint/bundled-angular-compiler" "16.1.2"
+    "@angular-eslint/utils" "16.1.2"
     "@typescript-eslint/type-utils" "5.62.0"
     "@typescript-eslint/utils" "5.62.0"
     aria-query "5.3.0"
     axobject-query "3.1.1"
 
-"@angular-eslint/eslint-plugin@16.1.0":
-  version "16.1.0"
-  resolved "https://registry.yarnpkg.com/@angular-eslint/eslint-plugin/-/eslint-plugin-16.1.0.tgz#23492eaad1d44dd90793cf0534c7177a028af226"
-  integrity sha512-BFzzJJlgQgWc8avdSBkaDWAzNSUqcwWy0L1iZSBdXGoIOxj72kLbwe99emb8M+rUfCveljQkeM2pcYu8XLbJIA==
+"@angular-eslint/eslint-plugin@16.1.2":
+  version "16.1.2"
+  resolved "https://registry.yarnpkg.com/@angular-eslint/eslint-plugin/-/eslint-plugin-16.1.2.tgz#215037d73f0edd6e8d9c6740a4465a91db46a676"
+  integrity sha512-lYVvoKUIOg/ez15yfN4zY2A++vnIeJe1xh2ADNTmmjSh2PFV24K9YOgrTbgrY3Ul9kzGDTBkvYqslq+IvMGdIw==
   dependencies:
-    "@angular-eslint/utils" "16.1.0"
+    "@angular-eslint/utils" "16.1.2"
     "@typescript-eslint/utils" "5.62.0"
 
-"@angular-eslint/schematics@^16.1.0":
-  version "16.1.0"
-  resolved "https://registry.yarnpkg.com/@angular-eslint/schematics/-/schematics-16.1.0.tgz#ea6c7634fc781ff49217ffd0e391b3ee2c40be50"
-  integrity sha512-L1tmP3R2krHyveaRXAvn/SeDoBFNpS1VtPPrzZm1NYr1qPcAxf3NtG2nnoyVFu6WZGt59ZGHNQ/dZxnXvm0UGg==
+"@angular-eslint/schematics@^16.1.2":
+  version "16.1.2"
+  resolved "https://registry.yarnpkg.com/@angular-eslint/schematics/-/schematics-16.1.2.tgz#97763cad56d06601d9fa592bb5836b9cf20cc431"
+  integrity sha512-319i47NU6nfaAaQTQYN7k320proTIBCueWGt+fbT11210CMqQriFmD+B85AatCwQgMgLd8Rhs1/F7YL2OOhegA==
   dependencies:
-    "@angular-eslint/eslint-plugin" "16.1.0"
-    "@angular-eslint/eslint-plugin-template" "16.1.0"
+    "@angular-eslint/eslint-plugin" "16.1.2"
+    "@angular-eslint/eslint-plugin-template" "16.1.2"
     "@nx/devkit" "16.5.1"
     ignore "5.2.4"
     nx "16.5.1"
     strip-json-comments "3.1.1"
     tmp "0.2.1"
 
-"@angular-eslint/utils@16.1.0":
-  version "16.1.0"
-  resolved "https://registry.yarnpkg.com/@angular-eslint/utils/-/utils-16.1.0.tgz#46e6aafc8b4ca0f6e86cca9ec36f61034f984974"
-  integrity sha512-u5XscYUq1F/7RuwyVIV2a280QL27lyQz434VYR+Np/oO21NGj5jxoRKb55xhXT9EFVs5Sy4JYeEUp6S75J/cUw==
+"@angular-eslint/utils@16.1.2":
+  version "16.1.2"
+  resolved "https://registry.yarnpkg.com/@angular-eslint/utils/-/utils-16.1.2.tgz#d3cde7f9ade8f58d616c7370ab6795a589c77dde"
+  integrity sha512-2yfEK3BPSJsUhP4JCz0EB6ktu4E4+/zc9qdtZvPWNF/eww2J/oYVPjY47C/HVg4MXpjJTI8vbdkvcnxrICIkfw==
   dependencies:
-    "@angular-eslint/bundled-angular-compiler" "16.1.0"
+    "@angular-eslint/bundled-angular-compiler" "16.1.2"
     "@typescript-eslint/utils" "5.62.0"
 
 "@angular/animations@^16.1.5":
@@ -9147,10 +9147,15 @@ typed-assert@^1.0.8:
   resolved "https://registry.yarnpkg.com/typed-assert/-/typed-assert-1.0.9.tgz#8af9d4f93432c4970ec717e3006f33f135b06213"
   integrity sha512-KNNZtayBCtmnNmbo5mG47p1XsCyrx6iVqomjcZnec/1Y5GGARaxPs6r49RnSPeUP3YjNYiU9sQHAtY4BBvnZwg==
 
+typescript@5.2.2:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.2.2.tgz#5ebb5e5a5b75f085f22bc3f8460fba308310fa78"
+  integrity sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==
+
 typescript@^4.9.4:
-  version "4.9.4"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.4.tgz#a2a3d2756c079abda241d75f149df9d561091e78"
-  integrity sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==
+  version "4.9.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a"
+  integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
 
 typical@^4.0.0:
   version "4.0.0"
@@ -9781,9 +9786,9 @@ zen-observable@0.8.15:
   resolved "https://registry.yarnpkg.com/zen-observable/-/zen-observable-0.8.15.tgz#96415c512d8e3ffd920afd3889604e30b9eaac15"
   integrity sha512-PQ2PC7R9rslx84ndNBZB/Dkv8V8fZEpk83RLgXtYd0fwUgEjseMn1Dgajh2x6S8QbZAFa9p2qVCEuYZNgve0dQ==
 
-zone.js@~0.13.1:
-  version "0.13.1"
-  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.13.1.tgz#ea06f6a80ba8ac0c68e412365ae72e2cd0787982"
-  integrity sha512-+bIeDAFEBYuXRuU3qGQvzdPap+N1zjM4KkBAiiQuVVCrHrhjDuY6VkUhNa5+U27+9w0q3fbKiMCbpJ0XzMmSWA==
+zone.js@0.14.3:
+  version "0.14.3"
+  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.14.3.tgz#ac01000f4eaeec5c06526f6c112ef7d36f426f78"
+  integrity sha512-jYoNqF046Q+JfcZSItRSt+oXFcpXL88yq7XAZjb/NKTS7w2hHpKjRJ3VlFD1k75wMaRRXNUt5vrZVlygiMyHbA==
   dependencies:
     tslib "^2.3.0"

From fd1ed85c280dbbef7af84196aaa1181ce7e63437 Mon Sep 17 00:00:00 2001
From: Joshua McMichael <jmcmichael@users.noreply.github.com>
Date: Thu, 11 Jan 2024 12:24:13 -0600
Subject: [PATCH 042/125] angular updated to v17.0.10

---
 client/angular.json                           |    6 +-
 client/package.json                           |   26 +-
 .../pages/pages-help/pages-help.page.html     |    4 +-
 client/yarn.lock                              | 3087 ++++++++++-------
 4 files changed, 1912 insertions(+), 1211 deletions(-)

diff --git a/client/angular.json b/client/angular.json
index 7d971b247..ec3b6b4a0 100644
--- a/client/angular.json
+++ b/client/angular.json
@@ -99,12 +99,12 @@
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
           "options": {
-            "browserTarget": "main:build",
-            "proxyConfig": "proxy.config.json"
+            "proxyConfig": "proxy.config.json",
+            "buildTarget": "main:build"
           },
           "configurations": {
             "production": {
-              "browserTarget": "main:build:production"
+              "buildTarget": "main:build:production"
             }
           }
         },
diff --git a/client/package.json b/client/package.json
index c93973276..373cbe5f9 100644
--- a/client/package.json
+++ b/client/package.json
@@ -23,15 +23,15 @@
     "error-stack-parser": "2.0.6"
   },
   "dependencies": {
-    "@angular-devkit/schematics": "16.1.4",
-    "@angular/animations": "^16.1.5",
-    "@angular/common": "^16.1.5",
-    "@angular/compiler": "^16.1.5",
-    "@angular/core": "^16.1.5",
-    "@angular/forms": "^16.1.5",
-    "@angular/platform-browser": "^16.1.5",
-    "@angular/platform-browser-dynamic": "^16.1.5",
-    "@angular/router": "^16.1.5",
+    "@angular-devkit/schematics": "17.0.10",
+    "@angular/animations": "^17.0.9",
+    "@angular/common": "^17.0.9",
+    "@angular/compiler": "^17.0.9",
+    "@angular/core": "^17.0.9",
+    "@angular/forms": "^17.0.9",
+    "@angular/platform-browser": "^17.0.9",
+    "@angular/platform-browser-dynamic": "^17.0.9",
+    "@angular/router": "^17.0.9",
     "@apollo/client": "^3.7.17",
     "@ngneat/until-destroy": "^9.1.2",
     "@ngrx/component": "^16.1.0",
@@ -48,10 +48,10 @@
     "zone.js": "0.14.3"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^16.1.4",
+    "@angular-devkit/build-angular": "^17.0.10",
     "@angular-eslint/schematics": "^16.1.2",
-    "@angular/cli": "^16.1.4",
-    "@angular/compiler-cli": "16.1.5",
+    "@angular/cli": "^17.0.10",
+    "@angular/compiler-cli": "17.0.9",
     "@graphql-codegen/add": "^3.2.3",
     "@graphql-codegen/cli": "^2.16.4",
     "@graphql-codegen/fragment-matcher": "^3.3.3",
@@ -79,4 +79,4 @@
       "error-stack-parser": "2.0.6"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/client/src/app/views/pages/pages-help/pages-help.page.html b/client/src/app/views/pages/pages-help/pages-help.page.html
index 24f9dcdcd..6a3b0c1ac 100644
--- a/client/src/app/views/pages/pages-help/pages-help.page.html
+++ b/client/src/app/views/pages/pages-help/pages-help.page.html
@@ -124,7 +124,7 @@
                   <a
                     href="https://twitter.com/CIViCdb"
                     target="_blank"
-                    >@CIViCdb</a
+                    >&#64;CIViCdb</a
                   >.
                 </nz-card>
               </nz-col>
@@ -137,7 +137,7 @@
                   <a
                     href="mailto:help@civicdb.org"
                     target="_blank"
-                    >help@civicdb.org</a
+                    >help&#64;civicdb.org</a
                   >.
                 </nz-card>
               </nz-col>
diff --git a/client/yarn.lock b/client/yarn.lock
index 3064e4de4..f4e285b64 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -18,113 +18,115 @@
     "@jridgewell/gen-mapping" "^0.1.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@angular-devkit/architect@0.1601.4":
-  version "0.1601.4"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1601.4.tgz#9fc88461cb65e28508067d93acc1aba69ca7a9ec"
-  integrity sha512-OOSbNlDy+Q3jY0oFHaq8kkna9HYI1zaS8IHeCIDP6T/ZIAVad4+HqXAL4SKQrKJikkoBQv1Z/eaDBL5XPFK9Bw==
+"@angular-devkit/architect@0.1700.10":
+  version "0.1700.10"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1700.10.tgz#cf3bb2dfca17bb7d78639b7e55e13bb16627fa62"
+  integrity sha512-JD/3jkdN1jrFMIDEk9grKdbjutIoxUDMRazq1LZooWjTkzlYk09i/s6HwvIPao7zvxJfelD6asTPspgkjOMP5A==
   dependencies:
-    "@angular-devkit/core" "16.1.4"
+    "@angular-devkit/core" "17.0.10"
     rxjs "7.8.1"
 
-"@angular-devkit/build-angular@^16.1.4":
-  version "16.1.4"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-16.1.4.tgz#81d5430b2d694b454553669f75b2732dc49ee870"
-  integrity sha512-LiHM7R20fTHg/eM+Iabotj08edP5wVBQahRfVNLxERo8X6VJgSjVChnsh3AQJkRywlGuFe20AOQYpyLyN367Ug==
+"@angular-devkit/build-angular@^17.0.10":
+  version "17.0.10"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-17.0.10.tgz#d18b6d4609f6d971805ebace94732355938dcf6d"
+  integrity sha512-RWVu5Pdg6VdO3v1i0oI+HGr/NE4rhbNelM43w+9TqrzDtwmvckWsadSp0H88cPhQ4YGY5ldGKyQufO1UItR26w==
   dependencies:
     "@ampproject/remapping" "2.2.1"
-    "@angular-devkit/architect" "0.1601.4"
-    "@angular-devkit/build-webpack" "0.1601.4"
-    "@angular-devkit/core" "16.1.4"
-    "@babel/core" "7.22.5"
-    "@babel/generator" "7.22.7"
+    "@angular-devkit/architect" "0.1700.10"
+    "@angular-devkit/build-webpack" "0.1700.10"
+    "@angular-devkit/core" "17.0.10"
+    "@babel/core" "7.23.2"
+    "@babel/generator" "7.23.0"
     "@babel/helper-annotate-as-pure" "7.22.5"
-    "@babel/helper-split-export-declaration" "7.22.5"
-    "@babel/plugin-proposal-async-generator-functions" "7.20.7"
+    "@babel/helper-split-export-declaration" "7.22.6"
+    "@babel/plugin-transform-async-generator-functions" "7.23.2"
     "@babel/plugin-transform-async-to-generator" "7.22.5"
-    "@babel/plugin-transform-runtime" "7.22.5"
-    "@babel/preset-env" "7.22.5"
-    "@babel/runtime" "7.22.5"
-    "@babel/template" "7.22.5"
+    "@babel/plugin-transform-runtime" "7.23.2"
+    "@babel/preset-env" "7.23.2"
+    "@babel/runtime" "7.23.2"
     "@discoveryjs/json-ext" "0.5.7"
-    "@ngtools/webpack" "16.1.4"
+    "@ngtools/webpack" "17.0.10"
     "@vitejs/plugin-basic-ssl" "1.0.1"
     ansi-colors "4.1.3"
-    autoprefixer "10.4.14"
-    babel-loader "9.1.2"
+    autoprefixer "10.4.16"
+    babel-loader "9.1.3"
     babel-plugin-istanbul "6.1.1"
+    browser-sync "2.29.3"
     browserslist "^4.21.5"
-    cacache "17.1.3"
     chokidar "3.5.3"
     copy-webpack-plugin "11.0.0"
-    critters "0.0.19"
+    critters "0.0.20"
     css-loader "6.8.1"
-    esbuild-wasm "0.17.19"
-    fast-glob "3.2.12"
-    https-proxy-agent "5.0.1"
-    inquirer "8.2.4"
+    esbuild-wasm "0.19.5"
+    fast-glob "3.3.1"
+    http-proxy-middleware "2.0.6"
+    https-proxy-agent "7.0.2"
+    inquirer "9.2.11"
     jsonc-parser "3.2.0"
     karma-source-map-support "1.4.0"
-    less "4.1.3"
+    less "4.2.0"
     less-loader "11.1.0"
     license-webpack-plugin "4.0.2"
     loader-utils "3.2.1"
-    magic-string "0.30.0"
+    magic-string "0.30.5"
     mini-css-extract-plugin "2.7.6"
     mrmime "1.0.1"
     open "8.4.2"
     ora "5.4.1"
     parse5-html-rewriting-stream "7.0.0"
-    picomatch "2.3.1"
-    piscina "3.2.0"
-    postcss "8.4.24"
-    postcss-loader "7.3.2"
+    picomatch "3.0.1"
+    piscina "4.1.0"
+    postcss "8.4.31"
+    postcss-loader "7.3.3"
     resolve-url-loader "5.0.0"
     rxjs "7.8.1"
-    sass "1.63.2"
-    sass-loader "13.3.1"
-    semver "7.5.3"
+    sass "1.69.5"
+    sass-loader "13.3.2"
+    semver "7.5.4"
     source-map-loader "4.0.1"
     source-map-support "0.5.21"
-    terser "5.17.7"
+    terser "5.24.0"
     text-table "0.2.0"
     tree-kill "1.2.2"
-    tslib "2.5.3"
-    vite "4.3.9"
-    webpack "5.86.0"
+    tslib "2.6.2"
+    undici "5.27.2"
+    vite "4.5.1"
+    webpack "5.89.0"
     webpack-dev-middleware "6.1.1"
-    webpack-dev-server "4.15.0"
-    webpack-merge "5.9.0"
+    webpack-dev-server "4.15.1"
+    webpack-merge "5.10.0"
     webpack-subresource-integrity "5.1.0"
   optionalDependencies:
-    esbuild "0.17.19"
+    esbuild "0.19.5"
 
-"@angular-devkit/build-webpack@0.1601.4":
-  version "0.1601.4"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.1601.4.tgz#170534d977b19e439687772a0106bcebe3fbc0d8"
-  integrity sha512-GC1y//ScAYbYQ68Wri2QgTEekC4hRxBC+xEkYL9OFiAMQ4mcN+eYvbkQBX8enJwDMXpkYfLR6VV8cChjAVYIgg==
+"@angular-devkit/build-webpack@0.1700.10":
+  version "0.1700.10"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.1700.10.tgz#c3837bd15735caef3b4bd651f01dec23dbeb84cd"
+  integrity sha512-jjcH5zGWre+adnVqjBdAr04Yto8oG6j7fFWuoiBVWEtK8AmesukGJQY8+QKX5UcrsyjP7COsfbz5WeJk3g1KOg==
   dependencies:
-    "@angular-devkit/architect" "0.1601.4"
+    "@angular-devkit/architect" "0.1700.10"
     rxjs "7.8.1"
 
-"@angular-devkit/core@16.1.4":
-  version "16.1.4"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-16.1.4.tgz#033ff3ab4d024ee3d8f4c6f809eed10d716ad0ab"
-  integrity sha512-WCAzNi9LxpFIi2WVPaJQd2kHPqCnCexWzUZN05ltJuBGCQL1O+LgRHGwnQ4WZoqmrF5tcWt2a3GFtJ3DgMc1hw==
+"@angular-devkit/core@17.0.10":
+  version "17.0.10"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-17.0.10.tgz#dce8b3cd4b90d694ed5ccf405c8f25e45938b310"
+  integrity sha512-93N6oHnmtRt0hL3AXxvnk47sN1rHndfj+pqI5haEY41AGWzIWv9cSBsqlM0PWltNpo6VivcExZESvbLJ71wqbQ==
   dependencies:
     ajv "8.12.0"
     ajv-formats "2.1.1"
     jsonc-parser "3.2.0"
+    picomatch "3.0.1"
     rxjs "7.8.1"
     source-map "0.7.4"
 
-"@angular-devkit/schematics@16.1.4":
-  version "16.1.4"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-16.1.4.tgz#91d4d82ee273dd7f24c17b9c7fbbfff11d7cab63"
-  integrity sha512-yjRgwHAfFaeuimgbQtjwSUyXzEHpMSdTRb2zg+TOp6skoGvHOG8xXFJ7DjBkSMeAQdFF0fkxhPS9YmlxqNc+7A==
+"@angular-devkit/schematics@17.0.10":
+  version "17.0.10"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-17.0.10.tgz#700067a2db9cd89883ec838b674c111c9cafdcc4"
+  integrity sha512-hjf4gaMx2uB6ZhBstBSH0Q2hzfp6kxI4IiJ5i1QrxPNE1MdGnb2h+LgPTRCdO72a7PGeWcSxFRE7cxrXeQy19g==
   dependencies:
-    "@angular-devkit/core" "16.1.4"
+    "@angular-devkit/core" "17.0.10"
     jsonc-parser "3.2.0"
-    magic-string "0.30.0"
+    magic-string "0.30.5"
     ora "5.4.1"
     rxjs "7.8.1"
 
@@ -174,10 +176,10 @@
     "@angular-eslint/bundled-angular-compiler" "16.1.2"
     "@typescript-eslint/utils" "5.62.0"
 
-"@angular/animations@^16.1.5":
-  version "16.1.5"
-  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-16.1.5.tgz#4ec04e025b9650921357db9091c43e0b6d65bb47"
-  integrity sha512-CUm81m1N00EIza8LH81BJ+PoR23HzfoD+8ltASya9D0VurB6hlv0Axa5kQ0o02PQwCAU1a6RUUTsTjODc/mUYA==
+"@angular/animations@^17.0.9":
+  version "17.0.9"
+  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-17.0.9.tgz#0e5a6a47d037a9a75b982fcd25596a55c1b1561e"
+  integrity sha512-TcAdBQyGqglgbxdiJcaHc7FcDNkzTXGRtZuPOcr4sYmBvryBu2q18edwzo6+QDYFaoGredFhE5RnOIw+M4A3Xw==
   dependencies:
     tslib "^2.3.0"
 
@@ -190,43 +192,43 @@
   optionalDependencies:
     parse5 "^7.1.2"
 
-"@angular/cli@^16.1.4":
-  version "16.1.4"
-  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-16.1.4.tgz#b32de345b6fdb4e975f957b0f9cbcafdcf184f8a"
-  integrity sha512-coSOLVLpOCOD5q9K9EAFFMrTES+HtdJiLy/iI9kdKNCKWUJpm8/svZ3JZOej3vPxYEp0AokXNOwORQnX21/qZQ==
+"@angular/cli@^17.0.10":
+  version "17.0.10"
+  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-17.0.10.tgz#24a9cdbdf2d19eb4138c9ccada5eebd4202014b4"
+  integrity sha512-52rd8KmOMe3NJDp/wA+Mwj21qd4HR8fuLtfrErgVnZaJZKX2Bzi/z7FHQD3gdgMAdzUiG0OJWGM0h75Ls9X6Gw==
   dependencies:
-    "@angular-devkit/architect" "0.1601.4"
-    "@angular-devkit/core" "16.1.4"
-    "@angular-devkit/schematics" "16.1.4"
-    "@schematics/angular" "16.1.4"
+    "@angular-devkit/architect" "0.1700.10"
+    "@angular-devkit/core" "17.0.10"
+    "@angular-devkit/schematics" "17.0.10"
+    "@schematics/angular" "17.0.10"
     "@yarnpkg/lockfile" "1.1.0"
     ansi-colors "4.1.3"
     ini "4.1.1"
-    inquirer "8.2.4"
+    inquirer "9.2.11"
     jsonc-parser "3.2.0"
-    npm-package-arg "10.1.0"
-    npm-pick-manifest "8.0.1"
+    npm-package-arg "11.0.1"
+    npm-pick-manifest "9.0.0"
     open "8.4.2"
     ora "5.4.1"
-    pacote "15.2.0"
-    resolve "1.22.2"
-    semver "7.5.3"
+    pacote "17.0.4"
+    resolve "1.22.8"
+    semver "7.5.4"
     symbol-observable "4.0.0"
     yargs "17.7.2"
 
-"@angular/common@^16.1.5":
-  version "16.1.5"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-16.1.5.tgz#a1855c625697f0ac380f4ef475bca73d44748e73"
-  integrity sha512-XQVIpICniWXXMoXsr6X7Q3pVcYBeQ0FZF06BNNolkkkVuReYpqr3TwWrZfuB9TUmxdF6R5WZ+M3NAdXodDDUNA==
+"@angular/common@^17.0.9":
+  version "17.0.9"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-17.0.9.tgz#f8b591b3db8ff8eb188f38110d7d7f3c27853f90"
+  integrity sha512-xNS7DDfvFqfLr6xeZNJ+jORuGXP6hhv2HsYD3jb6ZQ8+QuMg+3MDij4a0L5npn72gH/Zz4JRKZ3Bt4Cq6cUqUA==
   dependencies:
     tslib "^2.3.0"
 
-"@angular/compiler-cli@16.1.5":
-  version "16.1.5"
-  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-16.1.5.tgz#d0ac8a6bceb137c466bf2a896cbb30f7557bc860"
-  integrity sha512-j20hmPyM+rLJDU1y0ta9Uf7+o2oGjvGWGpyANbpuTlAfA1+VN5G3xD53FnNcmO6LZuAw0wDw6NDAyy+G55o8xQ==
+"@angular/compiler-cli@17.0.9":
+  version "17.0.9"
+  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-17.0.9.tgz#c5e1055af604a1e7b20ba40534cef62a69c001b2"
+  integrity sha512-fpbs8ZuHi2Z/uOIAxEICzQ1aYbc8Z2TOjB0PDP1RJ1kQmtlWNWxgMqV/uJ59sJO9AMYxc496msMtmOa3OByPYQ==
   dependencies:
-    "@babel/core" "7.22.5"
+    "@babel/core" "7.23.2"
     "@jridgewell/sourcemap-codec" "^1.4.14"
     chokidar "^3.0.0"
     convert-source-map "^1.5.1"
@@ -235,45 +237,45 @@
     tslib "^2.3.0"
     yargs "^17.2.1"
 
-"@angular/compiler@^16.1.5":
-  version "16.1.5"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-16.1.5.tgz#201e09f5396dca1b64f1482339d2b47c968e6088"
-  integrity sha512-QNyisdr9lEN43v/e/fjS0H1vrJBMY8lIGpxVY1OOERFjA1clfMhaz5fiPE3vWFV5TOm3/ym9z2xuRXM6UoyWoA==
+"@angular/compiler@^17.0.9":
+  version "17.0.9"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-17.0.9.tgz#fce96ccc6cb4603978d1d95da71678b6f6a37d95"
+  integrity sha512-xf0JChGttVoYPh0PRV3KnbujtlNFavcYzElS6W8iW64O+2HaSxaquWnolcgL5QT1rNGp4s/TxsttloLhbqxNmw==
   dependencies:
     tslib "^2.3.0"
 
-"@angular/core@^16.1.5":
-  version "16.1.5"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-16.1.5.tgz#578eb00a38adc7e4d9294b8ab25b374cc601b5a4"
-  integrity sha512-xmk+WeL3qtFb3BM2hsEq/kGHJinqaTNVJkK/m4TiGArY+hjJwfCOeuTss7nOkKXvhRkZxU9VP0tej1w3QV5Yzw==
+"@angular/core@^17.0.9":
+  version "17.0.9"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-17.0.9.tgz#407f8ee879af777f092f64886fc7b82ccf6e8b80"
+  integrity sha512-LtDWzyx19XNmAjXju9xjw//rDZPUFu2bllHqzS6NVO1bE4PwJHIs0zfvygh0j46ubKp1gUICNk3jvYK9FMVinA==
   dependencies:
     tslib "^2.3.0"
 
-"@angular/forms@^16.1.5":
-  version "16.1.5"
-  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-16.1.5.tgz#034ef3b7646de401ee3dae79b94a70d664f16d07"
-  integrity sha512-4E/5msvODs5tixlkB1iHPsRv7jHj189WMpN2n7LKXT+l+jA3/rD2AbGnYVKR04gymN2x/HQ/qOrbvrqv3E1NBw==
+"@angular/forms@^17.0.9":
+  version "17.0.9"
+  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-17.0.9.tgz#9edb3298714354197fc9dfaed46c40cdb646d870"
+  integrity sha512-UCZhJH5FCRPGmYHfKCTGbOXqz4SEs9bVkAQGwhHzhM3Bwn3cZ/LKN2UfOglIcwkqKXxKnRx+VkJ2M1KfZJAvLQ==
   dependencies:
     tslib "^2.3.0"
 
-"@angular/platform-browser-dynamic@^16.1.5":
-  version "16.1.5"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-16.1.5.tgz#c1e14462b1fe5f567e8760ff706fa62f9a7ff69f"
-  integrity sha512-ugdIXeN5IVj9o15ywH32hxNI0ZLyakpBGqMTHZSeEhU/uN6ajAJX7z6okdMbJ7dlTyBO8eFV1KDX3aAz+sK9bg==
+"@angular/platform-browser-dynamic@^17.0.9":
+  version "17.0.9"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-17.0.9.tgz#08b145faf325cea971cd9ce9e9dc2908ce186e1e"
+  integrity sha512-44wIecNzxEUi3T/bggeJsgK+iD7Snu64sqQg00ewsuFCMpaWwyC80LnTIff/QnBVoggAjXvEql6vwr3AZNTcuQ==
   dependencies:
     tslib "^2.3.0"
 
-"@angular/platform-browser@^16.1.5":
-  version "16.1.5"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-16.1.5.tgz#a0ea6b0355167a6cd805b56bd777b90b44e92399"
-  integrity sha512-TLM29KPr0A0pQ0YEmSy0JUOkfBXfwfBFzXQSt9SOiUs0wgDVVLMdGOpR/tbvBx2QfrSU3qgOX8P1FXIPJch6TQ==
+"@angular/platform-browser@^17.0.9":
+  version "17.0.9"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-17.0.9.tgz#a33bcfdfa96d5ca4ba738f64c10e3bfe8a8ec84a"
+  integrity sha512-Edz039lTJ9tHR6VEPHXUcQHqdCXAhJcdPoWSWsUBJ30eZFx0VlxQEb4ujlz8LBgIVvthp5WYhHMjd/ueWzEINw==
   dependencies:
     tslib "^2.3.0"
 
-"@angular/router@^16.1.5":
-  version "16.1.5"
-  resolved "https://registry.yarnpkg.com/@angular/router/-/router-16.1.5.tgz#49231d995442a56fa82ace92dd949f333e5a9da5"
-  integrity sha512-L1gyWA16U+XgcxWmemWjy08/OPCjch9sBEiHaikuW8i9Ys0nx9ic3wh8Fyu6cVKQE9aQZ7xLYT5CdPPwYxclTw==
+"@angular/router@^17.0.9":
+  version "17.0.9"
+  resolved "https://registry.yarnpkg.com/@angular/router/-/router-17.0.9.tgz#933c748773db353e5098e037fab8457ea32e7a79"
+  integrity sha512-kQHtPVh06g1AWA0Ntn/1Z2PX79hLwRQsTMcbU4ej1oka50C8Y97cAOMtmX9v3kqSN5fL/MEpBb44zi/X8SfPeA==
   dependencies:
     tslib "^2.3.0"
 
@@ -368,36 +370,49 @@
   dependencies:
     "@babel/highlight" "^7.22.5"
 
+"@babel/code-frame@^7.23.5":
+  version "7.23.5"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.23.5.tgz#9009b69a8c602293476ad598ff53e4562e15c244"
+  integrity sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==
+  dependencies:
+    "@babel/highlight" "^7.23.4"
+    chalk "^2.4.2"
+
 "@babel/compat-data@^7.20.5":
   version "7.20.10"
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.10.tgz#9d92fa81b87542fff50e848ed585b4212c1d34ec"
   integrity sha512-sEnuDPpOJR/fcafHMjpcpGN5M2jbUGUHwmuWKM/YdPzeEDJg8bgmbcWQFUfE32MQjti1koACvoPVsDe8Uq+idg==
 
-"@babel/compat-data@^7.22.5", "@babel/compat-data@^7.22.6", "@babel/compat-data@^7.22.9":
+"@babel/compat-data@^7.22.6", "@babel/compat-data@^7.22.9":
   version "7.22.9"
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.22.9.tgz#71cdb00a1ce3a329ce4cbec3a44f9fef35669730"
   integrity sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ==
 
-"@babel/core@7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.22.5.tgz#d67d9747ecf26ee7ecd3ebae1ee22225fe902a89"
-  integrity sha512-SBuTAjg91A3eKOvD+bPEz3LlhHZRNu1nFOVts9lzDJTXshHTjII0BAtDS3Y2DAkdZdDKWVZGVwkDfc4Clxn1dg==
+"@babel/compat-data@^7.23.2", "@babel/compat-data@^7.23.3", "@babel/compat-data@^7.23.5":
+  version "7.23.5"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.23.5.tgz#ffb878728bb6bdcb6f4510aa51b1be9afb8cfd98"
+  integrity sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==
+
+"@babel/core@7.23.2":
+  version "7.23.2"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.2.tgz#ed10df0d580fff67c5f3ee70fd22e2e4c90a9f94"
+  integrity sha512-n7s51eWdaWZ3vGT2tD4T7J6eJs3QoBXydv7vkUM06Bf1cbVD2Kc2UrkzhiQwobfV7NwOnQXYL7UBJ5VPU+RGoQ==
   dependencies:
     "@ampproject/remapping" "^2.2.0"
-    "@babel/code-frame" "^7.22.5"
-    "@babel/generator" "^7.22.5"
-    "@babel/helper-compilation-targets" "^7.22.5"
-    "@babel/helper-module-transforms" "^7.22.5"
-    "@babel/helpers" "^7.22.5"
-    "@babel/parser" "^7.22.5"
-    "@babel/template" "^7.22.5"
-    "@babel/traverse" "^7.22.5"
-    "@babel/types" "^7.22.5"
-    convert-source-map "^1.7.0"
+    "@babel/code-frame" "^7.22.13"
+    "@babel/generator" "^7.23.0"
+    "@babel/helper-compilation-targets" "^7.22.15"
+    "@babel/helper-module-transforms" "^7.23.0"
+    "@babel/helpers" "^7.23.2"
+    "@babel/parser" "^7.23.0"
+    "@babel/template" "^7.22.15"
+    "@babel/traverse" "^7.23.2"
+    "@babel/types" "^7.23.0"
+    convert-source-map "^2.0.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
-    json5 "^2.2.2"
-    semver "^6.3.0"
+    json5 "^2.2.3"
+    semver "^6.3.1"
 
 "@babel/core@^7.12.3", "@babel/core@^7.14.0":
   version "7.20.12"
@@ -420,12 +435,12 @@
     json5 "^2.2.2"
     semver "^6.3.0"
 
-"@babel/generator@7.22.7":
-  version "7.22.7"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.22.7.tgz#a6b8152d5a621893f2c9dacf9a4e286d520633d5"
-  integrity sha512-p+jPjMG+SI8yvIaxGgeW24u7q9+5+TGpZh8/CuB7RhBKd7RCy8FayNEFNNKrNK/eUcY/4ExQqLmyrvBXKsIcwQ==
+"@babel/generator@7.23.0", "@babel/generator@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.0.tgz#df5c386e2218be505b34837acbcb874d7a983420"
+  integrity sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==
   dependencies:
-    "@babel/types" "^7.22.5"
+    "@babel/types" "^7.23.0"
     "@jridgewell/gen-mapping" "^0.3.2"
     "@jridgewell/trace-mapping" "^0.3.17"
     jsesc "^2.5.1"
@@ -439,22 +454,12 @@
     "@jridgewell/gen-mapping" "^0.3.2"
     jsesc "^2.5.1"
 
-"@babel/generator@^7.22.5":
-  version "7.22.9"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.22.9.tgz#572ecfa7a31002fa1de2a9d91621fd895da8493d"
-  integrity sha512-KtLMbmicyuK2Ak/FTCJVbDnkN1SlT8/kceFTiuDiiRUUSMnHMidxSCdG4ndkTOHHpoomWe/4xkvHkEOncwjYIw==
+"@babel/generator@^7.23.6":
+  version "7.23.6"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.6.tgz#9e1fca4811c77a10580d17d26b57b036133f3c2e"
+  integrity sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==
   dependencies:
-    "@babel/types" "^7.22.5"
-    "@jridgewell/gen-mapping" "^0.3.2"
-    "@jridgewell/trace-mapping" "^0.3.17"
-    jsesc "^2.5.1"
-
-"@babel/generator@^7.23.0":
-  version "7.23.0"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.0.tgz#df5c386e2218be505b34837acbcb874d7a983420"
-  integrity sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==
-  dependencies:
-    "@babel/types" "^7.23.0"
+    "@babel/types" "^7.23.6"
     "@jridgewell/gen-mapping" "^0.3.2"
     "@jridgewell/trace-mapping" "^0.3.17"
     jsesc "^2.5.1"
@@ -491,6 +496,17 @@
     lru-cache "^5.1.1"
     semver "^6.3.0"
 
+"@babel/helper-compilation-targets@^7.22.15", "@babel/helper-compilation-targets@^7.23.6":
+  version "7.23.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz#4d79069b16cbcf1461289eccfbbd81501ae39991"
+  integrity sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==
+  dependencies:
+    "@babel/compat-data" "^7.23.5"
+    "@babel/helper-validator-option" "^7.23.5"
+    browserslist "^4.22.2"
+    lru-cache "^5.1.1"
+    semver "^6.3.1"
+
 "@babel/helper-compilation-targets@^7.22.5", "@babel/helper-compilation-targets@^7.22.6":
   version "7.22.9"
   resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.9.tgz#f9d0a7aaaa7cd32a3f31c9316a69f5a9bcacb892"
@@ -516,6 +532,21 @@
     "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0"
     "@babel/helper-split-export-declaration" "^7.18.6"
 
+"@babel/helper-create-class-features-plugin@^7.22.15":
+  version "7.23.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.23.7.tgz#b2e6826e0e20d337143655198b79d58fdc9bd43d"
+  integrity sha512-xCoqR/8+BoNnXOY7RVSgv6X+o7pmT5q1d+gGcRlXYkI+9B31glE4jeejhKVpA04O1AtzOt7OSQ6VYKP5FcRl9g==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-function-name" "^7.23.0"
+    "@babel/helper-member-expression-to-functions" "^7.23.0"
+    "@babel/helper-optimise-call-expression" "^7.22.5"
+    "@babel/helper-replace-supers" "^7.22.20"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.6"
+    semver "^6.3.1"
+
 "@babel/helper-create-class-features-plugin@^7.22.5":
   version "7.22.9"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.9.tgz#c36ea240bb3348f942f08b0fbe28d6d979fab236"
@@ -548,10 +579,10 @@
     regexpu-core "^5.3.1"
     semver "^6.3.1"
 
-"@babel/helper-define-polyfill-provider@^0.4.1":
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.1.tgz#af1429c4a83ac316a6a8c2cc8ff45cb5d2998d3a"
-  integrity sha512-kX4oXixDxG197yhX+J3Wp+NpL2wuCFjWQAr6yX2jtCnflK9ulMI51ULFGIrWiX1jGfvAxdHp+XQCcP2bZGPs9A==
+"@babel/helper-define-polyfill-provider@^0.4.4":
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.4.tgz#64df615451cb30e94b59a9696022cffac9a10088"
+  integrity sha512-QcJMILQCu2jm5TFPGA3lCpJJTeEP+mqeXooG/NZbg/h5FTFi6V0+99ahlRsW8/kRLyb24LZVCCiclDedhLKcBA==
   dependencies:
     "@babel/helper-compilation-targets" "^7.22.6"
     "@babel/helper-plugin-utils" "^7.22.5"
@@ -612,6 +643,13 @@
   dependencies:
     "@babel/types" "^7.20.7"
 
+"@babel/helper-member-expression-to-functions@^7.22.15", "@babel/helper-member-expression-to-functions@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz#9263e88cc5e41d39ec18c9a3e0eced59a3e7d366"
+  integrity sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==
+  dependencies:
+    "@babel/types" "^7.23.0"
+
 "@babel/helper-member-expression-to-functions@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.5.tgz#0a7c56117cad3372fbf8d2fb4bf8f8d64a1e76b2"
@@ -626,6 +664,13 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
+"@babel/helper-module-imports@^7.22.15":
+  version "7.22.15"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz#16146307acdc40cc00c3b2c647713076464bdbf0"
+  integrity sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==
+  dependencies:
+    "@babel/types" "^7.22.15"
+
 "@babel/helper-module-imports@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz#1a8f4c9f4027d23f520bd76b364d44434a72660c"
@@ -658,6 +703,17 @@
     "@babel/helper-split-export-declaration" "^7.22.6"
     "@babel/helper-validator-identifier" "^7.22.5"
 
+"@babel/helper-module-transforms@^7.23.0", "@babel/helper-module-transforms@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz#d7d12c3c5d30af5b3c0fcab2a6d5217773e2d0f1"
+  integrity sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==
+  dependencies:
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-module-imports" "^7.22.15"
+    "@babel/helper-simple-access" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.6"
+    "@babel/helper-validator-identifier" "^7.22.20"
+
 "@babel/helper-optimise-call-expression@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz#9369aa943ee7da47edab2cb4e838acf09d290ffe"
@@ -682,15 +738,14 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz#dd7ee3735e8a313b9f7b05a773d892e88e6d7295"
   integrity sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==
 
-"@babel/helper-remap-async-to-generator@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz#997458a0e3357080e54e1d79ec347f8a8cd28519"
-  integrity sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==
+"@babel/helper-remap-async-to-generator@^7.22.20":
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.20.tgz#7b68e1cb4fa964d2996fd063723fb48eca8498e0"
+  integrity sha512-pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.18.6"
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-wrap-function" "^7.18.9"
-    "@babel/types" "^7.18.9"
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-wrap-function" "^7.22.20"
 
 "@babel/helper-remap-async-to-generator@^7.22.5":
   version "7.22.9"
@@ -713,6 +768,15 @@
     "@babel/traverse" "^7.20.7"
     "@babel/types" "^7.20.7"
 
+"@babel/helper-replace-supers@^7.22.20":
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.22.20.tgz#e37d367123ca98fe455a9887734ed2e16eb7a793"
+  integrity sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw==
+  dependencies:
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-member-expression-to-functions" "^7.22.15"
+    "@babel/helper-optimise-call-expression" "^7.22.5"
+
 "@babel/helper-replace-supers@^7.22.5", "@babel/helper-replace-supers@^7.22.9":
   version "7.22.9"
   resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.22.9.tgz#cbdc27d6d8d18cd22c81ae4293765a5d9afd0779"
@@ -750,10 +814,10 @@
   dependencies:
     "@babel/types" "^7.22.5"
 
-"@babel/helper-split-export-declaration@7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.5.tgz#88cf11050edb95ed08d596f7a044462189127a08"
-  integrity sha512-thqK5QFghPKWLhAV321lxF95yCg2K3Ob5yw+M3VHWfdia0IkPXUtoLH8x/6Fh486QUvzhb8YOWHChTVen2/PoQ==
+"@babel/helper-split-export-declaration@7.22.6", "@babel/helper-split-export-declaration@^7.22.6":
+  version "7.22.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c"
+  integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==
   dependencies:
     "@babel/types" "^7.22.5"
 
@@ -764,13 +828,6 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-split-export-declaration@^7.22.6":
-  version "7.22.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c"
-  integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==
-  dependencies:
-    "@babel/types" "^7.22.5"
-
 "@babel/helper-string-parser@^7.19.4":
   version "7.19.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz#38d3acb654b4701a9b77fb0615a96f775c3a9e63"
@@ -781,6 +838,11 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz#533f36457a25814cf1df6488523ad547d784a99f"
   integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==
 
+"@babel/helper-string-parser@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz#9478c707febcbbe1ddb38a3d91a2e054ae622d83"
+  integrity sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==
+
 "@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1":
   version "7.19.1"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2"
@@ -801,20 +863,24 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz#bf0d2b5a509b1f336099e4ff36e1a63aa5db4db8"
   integrity sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==
 
+"@babel/helper-validator-option@^7.22.15", "@babel/helper-validator-option@^7.23.5":
+  version "7.23.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz#907a3fbd4523426285365d1206c423c4c5520307"
+  integrity sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==
+
 "@babel/helper-validator-option@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz#de52000a15a177413c8234fa3a8af4ee8102d0ac"
   integrity sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==
 
-"@babel/helper-wrap-function@^7.18.9":
-  version "7.20.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.20.5.tgz#75e2d84d499a0ab3b31c33bcfe59d6b8a45f62e3"
-  integrity sha512-bYMxIWK5mh+TgXGVqAtnu5Yn1un+v8DDZtqyzKRLUzrh70Eal2O3aZ7aPYiMADO4uKlkzOiRiZ6GX5q3qxvW9Q==
+"@babel/helper-wrap-function@^7.22.20":
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.22.20.tgz#15352b0b9bfb10fc9c76f79f6342c00e3411a569"
+  integrity sha512-pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw==
   dependencies:
-    "@babel/helper-function-name" "^7.19.0"
-    "@babel/template" "^7.18.10"
-    "@babel/traverse" "^7.20.5"
-    "@babel/types" "^7.20.5"
+    "@babel/helper-function-name" "^7.22.5"
+    "@babel/template" "^7.22.15"
+    "@babel/types" "^7.22.19"
 
 "@babel/helper-wrap-function@^7.22.9":
   version "7.22.9"
@@ -834,14 +900,14 @@
     "@babel/traverse" "^7.20.7"
     "@babel/types" "^7.20.7"
 
-"@babel/helpers@^7.22.5":
-  version "7.22.6"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.22.6.tgz#8e61d3395a4f0c5a8060f309fb008200969b5ecd"
-  integrity sha512-YjDs6y/fVOYFV8hAf1rxd1QvR9wJe1pDBZ2AREKq/SDayfPzgk0PBnVuTCE5X1acEpMMNOVUqoe+OwiZGJ+OaA==
+"@babel/helpers@^7.23.2":
+  version "7.23.8"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.23.8.tgz#fc6b2d65b16847fd50adddbd4232c76378959e34"
+  integrity sha512-KDqYz4PiOWvDFrdHLPhKtCThtIcKVy6avWD2oG4GEvyQ+XDZwHD4YQd+H2vNMnq2rkdxsDkU82T+Vk8U/WXHRQ==
   dependencies:
-    "@babel/template" "^7.22.5"
-    "@babel/traverse" "^7.22.6"
-    "@babel/types" "^7.22.5"
+    "@babel/template" "^7.22.15"
+    "@babel/traverse" "^7.23.7"
+    "@babel/types" "^7.23.6"
 
 "@babel/highlight@^7.18.6":
   version "7.18.6"
@@ -870,6 +936,15 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
+"@babel/highlight@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.23.4.tgz#edaadf4d8232e1a961432db785091207ead0621b"
+  integrity sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.22.20"
+    chalk "^2.4.2"
+    js-tokens "^4.0.0"
+
 "@babel/parser@^7.10.3", "@babel/parser@^7.14.0", "@babel/parser@^7.14.7", "@babel/parser@^7.16.8", "@babel/parser@^7.20.7":
   version "7.20.7"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.7.tgz#66fe23b3c8569220817d5feb8b9dcdc95bb4f71b"
@@ -885,31 +960,26 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.7.tgz#df8cf085ce92ddbdbf668a7f186ce848c9036cae"
   integrity sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q==
 
-"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.5.tgz#87245a21cd69a73b0b81bcda98d443d6df08f05e"
-  integrity sha512-NP1M5Rf+u2Gw9qfSO4ihjcTGW5zXTi36ITLd4/EoAcEhIZ0yjMqmftDNl3QC19CX7olhrjpyU454g/2W7X0jvQ==
+"@babel/parser@^7.23.6":
+  version "7.23.6"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.6.tgz#ba1c9e512bda72a47e285ae42aff9d2a635a9e3b"
+  integrity sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ==
+
+"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.22.15":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.23.3.tgz#5cd1c87ba9380d0afb78469292c954fee5d2411a"
+  integrity sha512-iRkKcCqb7iGnq9+3G6rZ+Ciz5VywC4XNRHe57lKM+jOeYAoR0lVqdeeDRfh0tQcTfw/+vBhHn926FmQhLtlFLQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.5.tgz#fef09f9499b1f1c930da8a0c419db42167d792ca"
-  integrity sha512-31Bb65aZaUwqCbWMnZPduIZxCBngHFlzyN6Dq6KAJjtx+lx6ohKHubc61OomYi7XwVD4Ol0XCVz4h+pYFR048g==
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.22.15":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.23.3.tgz#f6652bb16b94f8f9c20c50941e16e9756898dc5d"
+  integrity sha512-WwlxbfMNdVEpQjZmK5mhm7oSwD3dS6eU+Iwsi4Knl9wAletWem7kaRsGOG+8UEbRyqxY4SS5zvtfXwX+jMxUwQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
-    "@babel/plugin-transform-optional-chaining" "^7.22.5"
-
-"@babel/plugin-proposal-async-generator-functions@7.20.7":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.7.tgz#bfb7276d2d573cb67ba379984a2334e262ba5326"
-  integrity sha512-xMbiLsn/8RK7Wq7VeVytytS2L6qE69bXPB10YCmMdDZbKF4okCqY74pI/jJQ/8U0b/F6NrT2+14b8/P9/3AMGA==
-  dependencies:
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-remap-async-to-generator" "^7.18.9"
-    "@babel/plugin-syntax-async-generators" "^7.8.4"
+    "@babel/plugin-transform-optional-chaining" "^7.23.3"
 
 "@babel/plugin-proposal-class-properties@^7.0.0":
   version "7.18.6"
@@ -935,14 +1005,6 @@
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz#7844f9289546efa9febac2de4cfe358a050bd703"
   integrity sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==
 
-"@babel/plugin-proposal-unicode-property-regex@^7.4.4":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz#af613d2cd5e643643b65cded64207b15c85cb78e"
-  integrity sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
-
 "@babel/plugin-syntax-async-generators@^7.8.4":
   version "7.8.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
@@ -1105,14 +1167,24 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-async-generator-functions@^7.22.5":
-  version "7.22.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.7.tgz#053e76c0a903b72b573cb1ab7d6882174d460a1b"
-  integrity sha512-7HmE7pk/Fmke45TODvxvkxRMV9RazV+ZZzhOL9AG8G29TLrr3jkjwF7uJfxZ30EoXpO+LJkq4oA8NjO2DTnEDg==
+"@babel/plugin-transform-async-generator-functions@7.23.2":
+  version "7.23.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.2.tgz#054afe290d64c6f576f371ccc321772c8ea87ebb"
+  integrity sha512-BBYVGxbDVHfoeXbOwcagAkOQAm9NxoTdMGfTqghu1GrvadSaw6iW3Je6IcL5PNOw8VwjxqBECXy50/iCQSY/lQ==
   dependencies:
-    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-environment-visitor" "^7.22.20"
     "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-remap-async-to-generator" "^7.22.5"
+    "@babel/helper-remap-async-to-generator" "^7.22.20"
+    "@babel/plugin-syntax-async-generators" "^7.8.4"
+
+"@babel/plugin-transform-async-generator-functions@^7.23.2":
+  version "7.23.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.7.tgz#3aa0b4f2fa3788b5226ef9346cf6d16ec61f99cd"
+  integrity sha512-PdxEpL71bJp1byMG0va5gwQcXHxuEYC/BgI/e88mGTtohbZN28O5Yit0Plkkm/dBzCF/BxmbNcses1RH1T+urA==
+  dependencies:
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-remap-async-to-generator" "^7.22.20"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
 
 "@babel/plugin-transform-async-to-generator@7.22.5", "@babel/plugin-transform-async-to-generator@^7.22.5":
@@ -1145,10 +1217,10 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.20.2"
 
-"@babel/plugin-transform-block-scoping@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.5.tgz#8bfc793b3a4b2742c0983fadc1480d843ecea31b"
-  integrity sha512-EcACl1i5fSQ6bt+YGuU/XGCeZKStLmyVGytWkpyhCLeQVA0eu6Wtiw92V+I1T/hnezUv7j74dA/Ro69gWcU+hg==
+"@babel/plugin-transform-block-scoping@^7.23.0":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.4.tgz#b2d38589531c6c80fbe25e6b58e763622d2d3cf5"
+  integrity sha512-0QqbP6B6HOh7/8iNR4CQU2Th/bbRtBp4KS9vcaZd1fZ0wSh5Fyssg0UCIHwxh+ka+pNDREbVLQnHCMHKZfPwfw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
@@ -1160,12 +1232,12 @@
     "@babel/helper-create-class-features-plugin" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-class-static-block@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.5.tgz#3e40c46f048403472d6f4183116d5e46b1bff5ba"
-  integrity sha512-SPToJ5eYZLxlnp1UzdARpOGeC2GbHvr9d/UV0EukuVx8atktg194oe+C5BqQ8jRTkgLRVOPYeXRSBg1IlMoVRA==
+"@babel/plugin-transform-class-static-block@^7.22.11":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.23.4.tgz#2a202c8787a8964dd11dfcedf994d36bfc844ab5"
+  integrity sha512-nsWu/1M+ggti1SOALj3hfx5FXzAY06fwPJsUZD4/A5e1bWi46VUIWtD+kOX6/IdhXGsXBWllLFDSnqSCdUNydQ==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.22.5"
+    "@babel/helper-create-class-features-plugin" "^7.22.15"
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-class-static-block" "^7.14.5"
 
@@ -1184,18 +1256,17 @@
     "@babel/helper-split-export-declaration" "^7.18.6"
     globals "^11.1.0"
 
-"@babel/plugin-transform-classes@^7.22.5":
-  version "7.22.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.6.tgz#e04d7d804ed5b8501311293d1a0e6d43e94c3363"
-  integrity sha512-58EgM6nuPNG6Py4Z3zSuu0xWu2VfodiMi72Jt5Kj2FECmaYk1RrTXA45z6KBFsu9tRgwQDwIiY4FXTt+YsSFAQ==
+"@babel/plugin-transform-classes@^7.22.15":
+  version "7.23.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.23.8.tgz#d08ae096c240347badd68cdf1b6d1624a6435d92"
+  integrity sha512-yAYslGsY1bX6Knmg46RjiCiNSwJKv2IUC8qOdYKqMMr0491SXFhcHqOdRDeCRohOOIzwN/90C6mQ9qAKgrP7dg==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.22.5"
-    "@babel/helper-compilation-targets" "^7.22.6"
-    "@babel/helper-environment-visitor" "^7.22.5"
-    "@babel/helper-function-name" "^7.22.5"
-    "@babel/helper-optimise-call-expression" "^7.22.5"
+    "@babel/helper-compilation-targets" "^7.23.6"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-function-name" "^7.23.0"
     "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-replace-supers" "^7.22.5"
+    "@babel/helper-replace-supers" "^7.22.20"
     "@babel/helper-split-export-declaration" "^7.22.6"
     globals "^11.1.0"
 
@@ -1222,10 +1293,10 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.20.2"
 
-"@babel/plugin-transform-destructuring@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.5.tgz#d3aca7438f6c26c78cdd0b0ba920a336001b27cc"
-  integrity sha512-GfqcFuGW8vnEqTUBM7UtPd5A4q797LTvvwKxXTgRsFjoqaJiEg9deBG6kWeQYkVEL569NpnmpC0Pkr/8BLKGnQ==
+"@babel/plugin-transform-destructuring@^7.23.0":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.3.tgz#8c9ee68228b12ae3dff986e56ed1ba4f3c446311"
+  integrity sha512-n225npDqjDIr967cMScVKHXJs7rout1q+tt50inyBCPkyZ8KxeI6d+GIbSBTT/w/9WdlWDOej3V9HE5Lgk57gw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
@@ -1237,14 +1308,6 @@
     "@babel/helper-create-regexp-features-plugin" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-dotall-regex@^7.4.4":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz#b286b3e7aae6c7b861e45bed0a2fafd6b1a4fef8"
-  integrity sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
-
 "@babel/plugin-transform-duplicate-keys@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.22.5.tgz#b6e6428d9416f5f0bba19c70d1e6e7e0b88ab285"
@@ -1252,10 +1315,10 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-dynamic-import@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.5.tgz#d6908a8916a810468c4edff73b5b75bda6ad393e"
-  integrity sha512-0MC3ppTB1AMxd8fXjSrbPa7LT9hrImt+/fcj+Pg5YMD7UQyWp/02+JWpdnCymmsXwIx5Z+sYn1bwCn4ZJNvhqQ==
+"@babel/plugin-transform-dynamic-import@^7.22.11":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.23.4.tgz#c7629e7254011ac3630d47d7f34ddd40ca535143"
+  integrity sha512-V6jIbLhdJK86MaLh4Jpghi8ho5fGzt3imHOBu/x0jlBaPYqDoWz4RDXjmMOfnh+JWNaQleEAByZLV0QzBT4YQQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-dynamic-import" "^7.8.3"
@@ -1268,10 +1331,10 @@
     "@babel/helper-builder-binary-assignment-operator-visitor" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-export-namespace-from@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.5.tgz#57c41cb1d0613d22f548fddd8b288eedb9973a5b"
-  integrity sha512-X4hhm7FRnPgd4nDA4b/5V280xCx6oL7Oob5+9qVS5C13Zq4bh1qq7LU0GgRU6b5dBWBvhGaXYVB4AcN6+ol6vg==
+"@babel/plugin-transform-export-namespace-from@^7.22.11":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.23.4.tgz#084c7b25e9a5c8271e987a08cf85807b80283191"
+  integrity sha512-GzuSBcKkx62dGzZI1WVgTWvkkz84FZO5TC5T8dl/Tht/rAla6Dg/Mz9Yhypg+ezVACf/rgDuQt3kbWEv7LdUDQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
@@ -1291,12 +1354,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-for-of@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.5.tgz#ab1b8a200a8f990137aff9a084f8de4099ab173f"
-  integrity sha512-3kxQjX1dU9uudwSshyLeEipvrLjBCVthCgeTp6CzE/9JYrlAIaeekVxRpCWsDDfYTfRZRoCeZatCQvwo+wvK8A==
+"@babel/plugin-transform-for-of@^7.22.15":
+  version "7.23.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.23.6.tgz#81c37e24171b37b370ba6aaffa7ac86bcb46f94e"
+  integrity sha512-aYH4ytZ0qSuBbpfhuofbg/e96oQ7U2w1Aw/UQmKT+1l39uEhUPoFS3fHevDc1G0OvewyDudfMKY1OulczHzWIw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
 
 "@babel/plugin-transform-function-name@^7.0.0":
   version "7.18.9"
@@ -1316,10 +1380,10 @@
     "@babel/helper-function-name" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-json-strings@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.5.tgz#14b64352fdf7e1f737eed68de1a1468bd2a77ec0"
-  integrity sha512-DuCRB7fu8MyTLbEQd1ew3R85nx/88yMoqo2uPSjevMj3yoN7CDM8jkgrY0wmVxfJZyJ/B9fE1iq7EQppWQmR5A==
+"@babel/plugin-transform-json-strings@^7.22.11":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.23.4.tgz#a871d9b6bd171976efad2e43e694c961ffa3714d"
+  integrity sha512-81nTOqM1dMwZ/aRXQ59zVubN9wHGqk6UtqRK+/q+ciXmRy8fSolhGVvG09HHRGo4l6fr/c4ZhXUQH0uFW7PZbg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-json-strings" "^7.8.3"
@@ -1338,10 +1402,10 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-logical-assignment-operators@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.5.tgz#66ae5f068fd5a9a5dc570df16f56c2a8462a9d6c"
-  integrity sha512-MQQOUW1KL8X0cDWfbwYP+TbVbZm16QmQXJQ+vndPtH/BoO0lOKpVoEDMI7+PskYxH+IiE0tS8xZye0qr1lGzSA==
+"@babel/plugin-transform-logical-assignment-operators@^7.22.11":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.23.4.tgz#e599f82c51d55fac725f62ce55d3a0886279ecb5"
+  integrity sha512-Mc/ALf1rmZTP4JKKEhUwiORU+vcfarFVLfcFiolKUo6sewoxSEgl36ak5t+4WamRsNr6nzjZXQjM35WsU+9vbg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
@@ -1360,12 +1424,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-modules-amd@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.22.5.tgz#4e045f55dcf98afd00f85691a68fc0780704f526"
-  integrity sha512-R+PTfLTcYEmb1+kK7FNkhQ1gP4KgjpSO6HfH9+f8/yfp2Nt3ggBjiVpRwmwTlfqZLafYKJACy36yDXlEmI9HjQ==
+"@babel/plugin-transform-modules-amd@^7.23.0":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.3.tgz#e19b55436a1416829df0a1afc495deedfae17f7d"
+  integrity sha512-vJYQGxeKM4t8hYCKVBlZX/gtIY2I7mRGFNcm85sgXGMTBcoV3QdVtdpbcWEbzbfUIUZKwvgFT82mRvaQIebZzw==
   dependencies:
-    "@babel/helper-module-transforms" "^7.22.5"
+    "@babel/helper-module-transforms" "^7.23.3"
     "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-transform-modules-commonjs@^7.0.0":
@@ -1377,24 +1441,24 @@
     "@babel/helper-plugin-utils" "^7.20.2"
     "@babel/helper-simple-access" "^7.20.2"
 
-"@babel/plugin-transform-modules-commonjs@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.5.tgz#7d9875908d19b8c0536085af7b053fd5bd651bfa"
-  integrity sha512-B4pzOXj+ONRmuaQTg05b3y/4DuFz3WcCNAXPLb2Q0GT0TrGKGxNKV4jwsXts+StaM0LQczZbOpj8o1DLPDJIiA==
+"@babel/plugin-transform-modules-commonjs@^7.23.0":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.3.tgz#661ae831b9577e52be57dd8356b734f9700b53b4"
+  integrity sha512-aVS0F65LKsdNOtcz6FRCpE4OgsP2OFnW46qNxNIX9h3wuzaNcSQsJysuMwqSibC98HPrf2vCgtxKNwS0DAlgcA==
   dependencies:
-    "@babel/helper-module-transforms" "^7.22.5"
+    "@babel/helper-module-transforms" "^7.23.3"
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/helper-simple-access" "^7.22.5"
 
-"@babel/plugin-transform-modules-systemjs@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.22.5.tgz#18c31410b5e579a0092638f95c896c2a98a5d496"
-  integrity sha512-emtEpoaTMsOs6Tzz+nbmcePl6AKVtS1yC4YNAeMun9U8YCsgadPNxnOPQ8GhHFB2qdx+LZu9LgoC0Lthuu05DQ==
+"@babel/plugin-transform-modules-systemjs@^7.23.0":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.3.tgz#fa7e62248931cb15b9404f8052581c302dd9de81"
+  integrity sha512-ZxyKGTkF9xT9YJuKQRo19ewf3pXpopuYQd8cDXqNzc3mUNbOME0RKMoZxviQk74hwzfQsEe66dE92MaZbdHKNQ==
   dependencies:
     "@babel/helper-hoist-variables" "^7.22.5"
-    "@babel/helper-module-transforms" "^7.22.5"
+    "@babel/helper-module-transforms" "^7.23.3"
     "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-validator-identifier" "^7.22.5"
+    "@babel/helper-validator-identifier" "^7.22.20"
 
 "@babel/plugin-transform-modules-umd@^7.22.5":
   version "7.22.5"
@@ -1419,32 +1483,32 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-nullish-coalescing-operator@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.5.tgz#f8872c65776e0b552e0849d7596cddd416c3e381"
-  integrity sha512-6CF8g6z1dNYZ/VXok5uYkkBBICHZPiGEl7oDnAx2Mt1hlHVHOSIKWJaXHjQJA5VB43KZnXZDIexMchY4y2PGdA==
+"@babel/plugin-transform-nullish-coalescing-operator@^7.22.11":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.23.4.tgz#45556aad123fc6e52189ea749e33ce090637346e"
+  integrity sha512-jHE9EVVqHKAQx+VePv5LLGHjmHSJR76vawFPTdlxR/LVJPfOEGxREQwQfjuZEOPTwG92X3LINSh3M40Rv4zpVA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
 
-"@babel/plugin-transform-numeric-separator@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.22.5.tgz#57226a2ed9e512b9b446517ab6fa2d17abb83f58"
-  integrity sha512-NbslED1/6M+sXiwwtcAB/nieypGw02Ejf4KtDeMkCEpP6gWFMX1wI9WKYua+4oBneCCEmulOkRpwywypVZzs/g==
+"@babel/plugin-transform-numeric-separator@^7.22.11":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.23.4.tgz#03d08e3691e405804ecdd19dd278a40cca531f29"
+  integrity sha512-mps6auzgwjRrwKEZA05cOwuDc9FAzoyFS4ZsG/8F43bTLf/TgkJg7QXOrPO1JO599iA3qgK9MXdMGOEC8O1h6Q==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
-"@babel/plugin-transform-object-rest-spread@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.5.tgz#9686dc3447df4753b0b2a2fae7e8bc33cdc1f2e1"
-  integrity sha512-Kk3lyDmEslH9DnvCDA1s1kkd3YWQITiBOHngOtDL9Pt6BZjzqb6hiOlb8VfjiiQJ2unmegBqZu0rx5RxJb5vmQ==
+"@babel/plugin-transform-object-rest-spread@^7.22.15":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.23.4.tgz#2b9c2d26bf62710460bdc0d1730d4f1048361b83"
+  integrity sha512-9x9K1YyeQVw0iOXJlIzwm8ltobIIv7j2iLyP2jIhEbqPRQ7ScNgwQufU2I0Gq11VjyG4gI4yMXt2VFags+1N3g==
   dependencies:
-    "@babel/compat-data" "^7.22.5"
-    "@babel/helper-compilation-targets" "^7.22.5"
+    "@babel/compat-data" "^7.23.3"
+    "@babel/helper-compilation-targets" "^7.22.15"
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.22.5"
+    "@babel/plugin-transform-parameters" "^7.23.3"
 
 "@babel/plugin-transform-object-super@^7.0.0":
   version "7.18.6"
@@ -1462,18 +1526,18 @@
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/helper-replace-supers" "^7.22.5"
 
-"@babel/plugin-transform-optional-catch-binding@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.5.tgz#842080be3076703be0eaf32ead6ac8174edee333"
-  integrity sha512-pH8orJahy+hzZje5b8e2QIlBWQvGpelS76C63Z+jhZKsmzfNaPQ+LaW6dcJ9bxTpo1mtXbgHwy765Ro3jftmUg==
+"@babel/plugin-transform-optional-catch-binding@^7.22.11":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.23.4.tgz#318066de6dacce7d92fa244ae475aa8d91778017"
+  integrity sha512-XIq8t0rJPHf6Wvmbn9nFxU6ao4c7WhghTR5WyV8SrJfUFzyxhCm4nhC+iAp3HFhbAKLfYpgzhJ6t4XCtVwqO5A==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
 
-"@babel/plugin-transform-optional-chaining@^7.22.5":
-  version "7.22.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.6.tgz#4bacfe37001fe1901117672875e931d439811564"
-  integrity sha512-Vd5HiWml0mDVtcLHIoEU5sw6HOUW/Zk0acLs/SAeuLzkGNOPc9DB4nkUajemhCmTIz3eiaKREZn2hQQqF79YTg==
+"@babel/plugin-transform-optional-chaining@^7.23.0", "@babel/plugin-transform-optional-chaining@^7.23.3":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.4.tgz#6acf61203bdfc4de9d4e52e64490aeb3e52bd017"
+  integrity sha512-ZU8y5zWOfjM5vZ+asjgAPwDaBjJzgufjES89Rs4Lpq63O300R/kOz30WCLo6BxxX6QVEilwSlpClnG5cZaikTA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
@@ -1486,10 +1550,10 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.20.2"
 
-"@babel/plugin-transform-parameters@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.5.tgz#c3542dd3c39b42c8069936e48717a8d179d63a18"
-  integrity sha512-AVkFUBurORBREOmHRKo06FjHYgjrabpdqRSwq6+C7R5iTCZOsM4QbcB27St0a4U6fffyAOqh3s/qEfybAhfivg==
+"@babel/plugin-transform-parameters@^7.22.15", "@babel/plugin-transform-parameters@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.23.3.tgz#83ef5d1baf4b1072fa6e54b2b0999a7b2527e2af"
+  integrity sha512-09lMt6UsUb3/34BbECKVbVwrT9bO6lILWln237z7sLaWnMsTi7Yc9fhX5DLpkJzAGfaReXI22wP41SZmnAA3Vw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
@@ -1501,13 +1565,13 @@
     "@babel/helper-create-class-features-plugin" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-private-property-in-object@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.5.tgz#07a77f28cbb251546a43d175a1dda4cf3ef83e32"
-  integrity sha512-/9xnaTTJcVoBtSSmrVyhtSvO3kbqS2ODoh2juEU72c3aYonNF0OMGiaz2gjukyKM2wBBYJP38S4JiE0Wfb5VMQ==
+"@babel/plugin-transform-private-property-in-object@^7.22.11":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.23.4.tgz#3ec711d05d6608fd173d9b8de39872d8dbf68bf5"
+  integrity sha512-9G3K1YqTq3F4Vt88Djx1UZ79PDyj+yKRnUy7cZGSMe+a7jkwD259uKKuUzQlPkGam7R+8RJwh5z4xO27fA1o2A==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.22.5"
-    "@babel/helper-create-class-features-plugin" "^7.22.5"
+    "@babel/helper-create-class-features-plugin" "^7.22.15"
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
 
@@ -1543,13 +1607,13 @@
     "@babel/plugin-syntax-jsx" "^7.18.6"
     "@babel/types" "^7.20.7"
 
-"@babel/plugin-transform-regenerator@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.5.tgz#cd8a68b228a5f75fa01420e8cc2fc400f0fc32aa"
-  integrity sha512-rR7KePOE7gfEtNTh9Qw+iO3Q/e4DEsoQ+hdvM6QUDH7JRJ5qxq5AA52ZzBWbI5i9lfNuvySgOGP8ZN7LAmaiPw==
+"@babel/plugin-transform-regenerator@^7.22.10":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.23.3.tgz#141afd4a2057298602069fce7f2dc5173e6c561c"
+  integrity sha512-KP+75h0KghBMcVpuKisx3XTu9Ncut8Q8TuvGO4IhY+9D5DFEckQefOuIsB/gQ2tG71lCke4NMrtIPS8pOj18BQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
-    regenerator-transform "^0.15.1"
+    regenerator-transform "^0.15.2"
 
 "@babel/plugin-transform-reserved-words@^7.22.5":
   version "7.22.5"
@@ -1558,17 +1622,17 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-runtime@7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.22.5.tgz#ca975fb5e260044473c8142e1b18b567d33c2a3b"
-  integrity sha512-bg4Wxd1FWeFx3daHFTWk1pkSWK/AyQuiyAoeZAOkAOUBjnZPH6KT7eMxouV47tQ6hl6ax2zyAWBdWZXbrvXlaw==
+"@babel/plugin-transform-runtime@7.23.2":
+  version "7.23.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.23.2.tgz#c956a3f8d1aa50816ff6c30c6288d66635c12990"
+  integrity sha512-XOntj6icgzMS58jPVtQpiuF6ZFWxQiJavISGx5KGjRj+3gqZr8+N6Kx+N9BApWzgS+DOjIZfXXj0ZesenOWDyA==
   dependencies:
-    "@babel/helper-module-imports" "^7.22.5"
+    "@babel/helper-module-imports" "^7.22.15"
     "@babel/helper-plugin-utils" "^7.22.5"
-    babel-plugin-polyfill-corejs2 "^0.4.3"
-    babel-plugin-polyfill-corejs3 "^0.8.1"
-    babel-plugin-polyfill-regenerator "^0.5.0"
-    semver "^6.3.0"
+    babel-plugin-polyfill-corejs2 "^0.4.6"
+    babel-plugin-polyfill-corejs3 "^0.8.5"
+    babel-plugin-polyfill-regenerator "^0.5.3"
+    semver "^6.3.1"
 
 "@babel/plugin-transform-shorthand-properties@^7.0.0":
   version "7.18.6"
@@ -1628,10 +1692,10 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-unicode-escapes@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.5.tgz#ce0c248522b1cb22c7c992d88301a5ead70e806c"
-  integrity sha512-biEmVg1IYB/raUO5wT1tgfacCef15Fbzhkx493D3urBI++6hpJ+RFG4SrWMn0NEZLfvilqKf3QDrRVZHo08FYg==
+"@babel/plugin-transform-unicode-escapes@^7.22.10":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.23.3.tgz#1f66d16cab01fab98d784867d24f70c1ca65b925"
+  integrity sha512-OMCUx/bU6ChE3r4+ZdylEqAjaQgHAgipgW8nsCfu5pGqDcFytVd91AwRvUJSBZDz0exPGgnjoqhgRYLRjFZc9Q==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
@@ -1659,17 +1723,17 @@
     "@babel/helper-create-regexp-features-plugin" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/preset-env@7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.22.5.tgz#3da66078b181f3d62512c51cf7014392c511504e"
-  integrity sha512-fj06hw89dpiZzGZtxn+QybifF07nNiZjZ7sazs2aVDcysAZVGjW7+7iFYxg6GLNM47R/thYfLdrXc+2f11Vi9A==
+"@babel/preset-env@7.23.2":
+  version "7.23.2"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.23.2.tgz#1f22be0ff0e121113260337dbc3e58fafce8d059"
+  integrity sha512-BW3gsuDD+rvHL2VO2SjAUNTBe5YrjsTiDyqamPDWY723na3/yPQ65X5oQkFVJZ0o50/2d+svm1rkPoJeR1KxVQ==
   dependencies:
-    "@babel/compat-data" "^7.22.5"
-    "@babel/helper-compilation-targets" "^7.22.5"
+    "@babel/compat-data" "^7.23.2"
+    "@babel/helper-compilation-targets" "^7.22.15"
     "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-validator-option" "^7.22.5"
-    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.22.5"
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.22.5"
+    "@babel/helper-validator-option" "^7.22.15"
+    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.22.15"
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.22.15"
     "@babel/plugin-proposal-private-property-in-object" "7.21.0-placeholder-for-preset-env.2"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
     "@babel/plugin-syntax-class-properties" "^7.12.13"
@@ -1690,69 +1754,67 @@
     "@babel/plugin-syntax-top-level-await" "^7.14.5"
     "@babel/plugin-syntax-unicode-sets-regex" "^7.18.6"
     "@babel/plugin-transform-arrow-functions" "^7.22.5"
-    "@babel/plugin-transform-async-generator-functions" "^7.22.5"
+    "@babel/plugin-transform-async-generator-functions" "^7.23.2"
     "@babel/plugin-transform-async-to-generator" "^7.22.5"
     "@babel/plugin-transform-block-scoped-functions" "^7.22.5"
-    "@babel/plugin-transform-block-scoping" "^7.22.5"
+    "@babel/plugin-transform-block-scoping" "^7.23.0"
     "@babel/plugin-transform-class-properties" "^7.22.5"
-    "@babel/plugin-transform-class-static-block" "^7.22.5"
-    "@babel/plugin-transform-classes" "^7.22.5"
+    "@babel/plugin-transform-class-static-block" "^7.22.11"
+    "@babel/plugin-transform-classes" "^7.22.15"
     "@babel/plugin-transform-computed-properties" "^7.22.5"
-    "@babel/plugin-transform-destructuring" "^7.22.5"
+    "@babel/plugin-transform-destructuring" "^7.23.0"
     "@babel/plugin-transform-dotall-regex" "^7.22.5"
     "@babel/plugin-transform-duplicate-keys" "^7.22.5"
-    "@babel/plugin-transform-dynamic-import" "^7.22.5"
+    "@babel/plugin-transform-dynamic-import" "^7.22.11"
     "@babel/plugin-transform-exponentiation-operator" "^7.22.5"
-    "@babel/plugin-transform-export-namespace-from" "^7.22.5"
-    "@babel/plugin-transform-for-of" "^7.22.5"
+    "@babel/plugin-transform-export-namespace-from" "^7.22.11"
+    "@babel/plugin-transform-for-of" "^7.22.15"
     "@babel/plugin-transform-function-name" "^7.22.5"
-    "@babel/plugin-transform-json-strings" "^7.22.5"
+    "@babel/plugin-transform-json-strings" "^7.22.11"
     "@babel/plugin-transform-literals" "^7.22.5"
-    "@babel/plugin-transform-logical-assignment-operators" "^7.22.5"
+    "@babel/plugin-transform-logical-assignment-operators" "^7.22.11"
     "@babel/plugin-transform-member-expression-literals" "^7.22.5"
-    "@babel/plugin-transform-modules-amd" "^7.22.5"
-    "@babel/plugin-transform-modules-commonjs" "^7.22.5"
-    "@babel/plugin-transform-modules-systemjs" "^7.22.5"
+    "@babel/plugin-transform-modules-amd" "^7.23.0"
+    "@babel/plugin-transform-modules-commonjs" "^7.23.0"
+    "@babel/plugin-transform-modules-systemjs" "^7.23.0"
     "@babel/plugin-transform-modules-umd" "^7.22.5"
     "@babel/plugin-transform-named-capturing-groups-regex" "^7.22.5"
     "@babel/plugin-transform-new-target" "^7.22.5"
-    "@babel/plugin-transform-nullish-coalescing-operator" "^7.22.5"
-    "@babel/plugin-transform-numeric-separator" "^7.22.5"
-    "@babel/plugin-transform-object-rest-spread" "^7.22.5"
+    "@babel/plugin-transform-nullish-coalescing-operator" "^7.22.11"
+    "@babel/plugin-transform-numeric-separator" "^7.22.11"
+    "@babel/plugin-transform-object-rest-spread" "^7.22.15"
     "@babel/plugin-transform-object-super" "^7.22.5"
-    "@babel/plugin-transform-optional-catch-binding" "^7.22.5"
-    "@babel/plugin-transform-optional-chaining" "^7.22.5"
-    "@babel/plugin-transform-parameters" "^7.22.5"
+    "@babel/plugin-transform-optional-catch-binding" "^7.22.11"
+    "@babel/plugin-transform-optional-chaining" "^7.23.0"
+    "@babel/plugin-transform-parameters" "^7.22.15"
     "@babel/plugin-transform-private-methods" "^7.22.5"
-    "@babel/plugin-transform-private-property-in-object" "^7.22.5"
+    "@babel/plugin-transform-private-property-in-object" "^7.22.11"
     "@babel/plugin-transform-property-literals" "^7.22.5"
-    "@babel/plugin-transform-regenerator" "^7.22.5"
+    "@babel/plugin-transform-regenerator" "^7.22.10"
     "@babel/plugin-transform-reserved-words" "^7.22.5"
     "@babel/plugin-transform-shorthand-properties" "^7.22.5"
     "@babel/plugin-transform-spread" "^7.22.5"
     "@babel/plugin-transform-sticky-regex" "^7.22.5"
     "@babel/plugin-transform-template-literals" "^7.22.5"
     "@babel/plugin-transform-typeof-symbol" "^7.22.5"
-    "@babel/plugin-transform-unicode-escapes" "^7.22.5"
+    "@babel/plugin-transform-unicode-escapes" "^7.22.10"
     "@babel/plugin-transform-unicode-property-regex" "^7.22.5"
     "@babel/plugin-transform-unicode-regex" "^7.22.5"
     "@babel/plugin-transform-unicode-sets-regex" "^7.22.5"
-    "@babel/preset-modules" "^0.1.5"
-    "@babel/types" "^7.22.5"
-    babel-plugin-polyfill-corejs2 "^0.4.3"
-    babel-plugin-polyfill-corejs3 "^0.8.1"
-    babel-plugin-polyfill-regenerator "^0.5.0"
-    core-js-compat "^3.30.2"
-    semver "^6.3.0"
+    "@babel/preset-modules" "0.1.6-no-external-plugins"
+    "@babel/types" "^7.23.0"
+    babel-plugin-polyfill-corejs2 "^0.4.6"
+    babel-plugin-polyfill-corejs3 "^0.8.5"
+    babel-plugin-polyfill-regenerator "^0.5.3"
+    core-js-compat "^3.31.0"
+    semver "^6.3.1"
 
-"@babel/preset-modules@^0.1.5":
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.5.tgz#ef939d6e7f268827e1841638dc6ff95515e115d9"
-  integrity sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==
+"@babel/preset-modules@0.1.6-no-external-plugins":
+  version "0.1.6-no-external-plugins"
+  resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz#ccb88a2c49c817236861fee7826080573b8a923a"
+  integrity sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.4.4"
-    "@babel/plugin-transform-dotall-regex" "^7.4.4"
     "@babel/types" "^7.4.4"
     esutils "^2.0.2"
 
@@ -1761,12 +1823,12 @@
   resolved "https://registry.yarnpkg.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310"
   integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==
 
-"@babel/runtime@7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.5.tgz#8564dd588182ce0047d55d7a75e93921107b57ec"
-  integrity sha512-ecjvYlnAaZ/KVneE/OdKYBYfgXV3Ptu6zQWmgEF7vwKhQnvVS6bjMD2XYgj+SNvQ1GfK/pjgokfPkC/2CO8CuA==
+"@babel/runtime@7.23.2":
+  version "7.23.2"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.2.tgz#062b0ac103261d68a966c4c7baf2ae3e62ec3885"
+  integrity sha512-mM8eg4yl5D6i3lu2QKPuPH4FArvJ8KhTofbE7jwMUv9KX5mBvwPAqnV3MlyBNqdp9RyRKP6Yck8TrfYrPvX3bg==
   dependencies:
-    regenerator-runtime "^0.13.11"
+    regenerator-runtime "^0.14.0"
 
 "@babel/runtime@^7.0.0", "@babel/runtime@^7.8.4":
   version "7.20.7"
@@ -1775,15 +1837,6 @@
   dependencies:
     regenerator-runtime "^0.13.11"
 
-"@babel/template@7.22.5", "@babel/template@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.5.tgz#0c8c4d944509875849bd0344ff0050756eefc6ec"
-  integrity sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==
-  dependencies:
-    "@babel/code-frame" "^7.22.5"
-    "@babel/parser" "^7.22.5"
-    "@babel/types" "^7.22.5"
-
 "@babel/template@^7.18.10", "@babel/template@^7.20.7":
   version "7.20.7"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz#a15090c2839a83b02aa996c0b4994005841fd5a8"
@@ -1802,7 +1855,16 @@
     "@babel/parser" "^7.22.15"
     "@babel/types" "^7.22.15"
 
-"@babel/traverse@^7.10.3", "@babel/traverse@^7.14.0", "@babel/traverse@^7.16.8", "@babel/traverse@^7.20.10", "@babel/traverse@^7.20.12", "@babel/traverse@^7.20.5", "@babel/traverse@^7.20.7", "@babel/traverse@^7.22.5", "@babel/traverse@^7.22.6":
+"@babel/template@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.5.tgz#0c8c4d944509875849bd0344ff0050756eefc6ec"
+  integrity sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==
+  dependencies:
+    "@babel/code-frame" "^7.22.5"
+    "@babel/parser" "^7.22.5"
+    "@babel/types" "^7.22.5"
+
+"@babel/traverse@^7.10.3", "@babel/traverse@^7.14.0", "@babel/traverse@^7.16.8", "@babel/traverse@^7.20.10", "@babel/traverse@^7.20.12", "@babel/traverse@^7.20.7":
   version "7.23.2"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.2.tgz#329c7a06735e144a506bdb2cad0268b7f46f4ad8"
   integrity sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==
@@ -1818,7 +1880,23 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.10.3", "@babel/types@^7.16.8", "@babel/types@^7.18.13", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.20.0", "@babel/types@^7.20.2", "@babel/types@^7.20.5", "@babel/types@^7.20.7", "@babel/types@^7.4.4":
+"@babel/traverse@^7.23.2", "@babel/traverse@^7.23.7":
+  version "7.23.7"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.7.tgz#9a7bf285c928cb99b5ead19c3b1ce5b310c9c305"
+  integrity sha512-tY3mM8rH9jM0YHFGyfC0/xf+SB5eKUu7HPj7/k3fpi9dAlsMc5YbQvDi0Sh2QTPXqMhyaAtzAr807TIyfQrmyg==
+  dependencies:
+    "@babel/code-frame" "^7.23.5"
+    "@babel/generator" "^7.23.6"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-function-name" "^7.23.0"
+    "@babel/helper-hoist-variables" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.6"
+    "@babel/parser" "^7.23.6"
+    "@babel/types" "^7.23.6"
+    debug "^4.3.1"
+    globals "^11.1.0"
+
+"@babel/types@^7.0.0", "@babel/types@^7.10.3", "@babel/types@^7.16.8", "@babel/types@^7.18.13", "@babel/types@^7.18.6", "@babel/types@^7.19.0", "@babel/types@^7.20.0", "@babel/types@^7.20.2", "@babel/types@^7.20.7", "@babel/types@^7.4.4":
   version "7.20.7"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.7.tgz#54ec75e252318423fc07fb644dc6a58a64c09b7f"
   integrity sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg==
@@ -1836,6 +1914,15 @@
     "@babel/helper-validator-identifier" "^7.22.20"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.22.19", "@babel/types@^7.23.6":
+  version "7.23.6"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.6.tgz#be33fdb151e1f5a56877d704492c240fc71c7ccd"
+  integrity sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg==
+  dependencies:
+    "@babel/helper-string-parser" "^7.23.4"
+    "@babel/helper-validator-identifier" "^7.22.20"
+    to-fast-properties "^2.0.0"
+
 "@babel/types@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.22.5.tgz#cd93eeaab025880a3a47ec881f4b096a5b786fbe"
@@ -1862,115 +1949,225 @@
   resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70"
   integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==
 
-"@esbuild/android-arm64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.17.19.tgz#bafb75234a5d3d1b690e7c2956a599345e84a2fd"
-  integrity sha512-KBMWvEZooR7+kzY0BtbTQn0OAYY7CsiydT63pVEaPtVYF0hXbUaOyZog37DKxK7NF3XacBJOpYT4adIJh+avxA==
-
-"@esbuild/android-arm@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.17.19.tgz#5898f7832c2298bc7d0ab53701c57beb74d78b4d"
-  integrity sha512-rIKddzqhmav7MSmoFCmDIb6e2W57geRsM94gV2l38fzhXMwq7hZoClug9USI2pFRGL06f4IOPHHpFNOkWieR8A==
-
-"@esbuild/android-x64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.17.19.tgz#658368ef92067866d95fb268719f98f363d13ae1"
-  integrity sha512-uUTTc4xGNDT7YSArp/zbtmbhO0uEEK9/ETW29Wk1thYUJBz3IVnvgEiEwEa9IeLyvnpKrWK64Utw2bgUmDveww==
-
-"@esbuild/darwin-arm64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.17.19.tgz#584c34c5991b95d4d48d333300b1a4e2ff7be276"
-  integrity sha512-80wEoCfF/hFKM6WE1FyBHc9SfUblloAWx6FJkFWTWiCoht9Mc0ARGEM47e67W9rI09YoUxJL68WHfDRYEAvOhg==
-
-"@esbuild/darwin-x64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.17.19.tgz#7751d236dfe6ce136cce343dce69f52d76b7f6cb"
-  integrity sha512-IJM4JJsLhRYr9xdtLytPLSH9k/oxR3boaUIYiHkAawtwNOXKE8KoU8tMvryogdcT8AU+Bflmh81Xn6Q0vTZbQw==
-
-"@esbuild/freebsd-arm64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.19.tgz#cacd171665dd1d500f45c167d50c6b7e539d5fd2"
-  integrity sha512-pBwbc7DufluUeGdjSU5Si+P3SoMF5DQ/F/UmTSb8HXO80ZEAJmrykPyzo1IfNbAoaqw48YRpv8shwd1NoI0jcQ==
-
-"@esbuild/freebsd-x64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.17.19.tgz#0769456eee2a08b8d925d7c00b79e861cb3162e4"
-  integrity sha512-4lu+n8Wk0XlajEhbEffdy2xy53dpR06SlzvhGByyg36qJw6Kpfk7cp45DR/62aPH9mtJRmIyrXAS5UWBrJT6TQ==
-
-"@esbuild/linux-arm64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.17.19.tgz#38e162ecb723862c6be1c27d6389f48960b68edb"
-  integrity sha512-ct1Tg3WGwd3P+oZYqic+YZF4snNl2bsnMKRkb3ozHmnM0dGWuxcPTTntAF6bOP0Sp4x0PjSF+4uHQ1xvxfRKqg==
-
-"@esbuild/linux-arm@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.17.19.tgz#1a2cd399c50040184a805174a6d89097d9d1559a"
-  integrity sha512-cdmT3KxjlOQ/gZ2cjfrQOtmhG4HJs6hhvm3mWSRDPtZ/lP5oe8FWceS10JaSJC13GBd4eH/haHnqf7hhGNLerA==
-
-"@esbuild/linux-ia32@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.17.19.tgz#e28c25266b036ce1cabca3c30155222841dc035a"
-  integrity sha512-w4IRhSy1VbsNxHRQpeGCHEmibqdTUx61Vc38APcsRbuVgK0OPEnQ0YD39Brymn96mOx48Y2laBQGqgZ0j9w6SQ==
-
-"@esbuild/linux-loong64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.17.19.tgz#0f887b8bb3f90658d1a0117283e55dbd4c9dcf72"
-  integrity sha512-2iAngUbBPMq439a+z//gE+9WBldoMp1s5GWsUSgqHLzLJ9WoZLZhpwWuym0u0u/4XmZ3gpHmzV84PonE+9IIdQ==
-
-"@esbuild/linux-mips64el@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.17.19.tgz#f5d2a0b8047ea9a5d9f592a178ea054053a70289"
-  integrity sha512-LKJltc4LVdMKHsrFe4MGNPp0hqDFA1Wpt3jE1gEyM3nKUvOiO//9PheZZHfYRfYl6AwdTH4aTcXSqBerX0ml4A==
-
-"@esbuild/linux-ppc64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.17.19.tgz#876590e3acbd9fa7f57a2c7d86f83717dbbac8c7"
-  integrity sha512-/c/DGybs95WXNS8y3Ti/ytqETiW7EU44MEKuCAcpPto3YjQbyK3IQVKfF6nbghD7EcLUGl0NbiL5Rt5DMhn5tg==
-
-"@esbuild/linux-riscv64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.17.19.tgz#7f49373df463cd9f41dc34f9b2262d771688bf09"
-  integrity sha512-FC3nUAWhvFoutlhAkgHf8f5HwFWUL6bYdvLc/TTuxKlvLi3+pPzdZiFKSWz/PF30TB1K19SuCxDTI5KcqASJqA==
-
-"@esbuild/linux-s390x@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.17.19.tgz#e2afd1afcaf63afe2c7d9ceacd28ec57c77f8829"
-  integrity sha512-IbFsFbxMWLuKEbH+7sTkKzL6NJmG2vRyy6K7JJo55w+8xDk7RElYn6xvXtDW8HCfoKBFK69f3pgBJSUSQPr+4Q==
-
-"@esbuild/linux-x64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.17.19.tgz#8a0e9738b1635f0c53389e515ae83826dec22aa4"
-  integrity sha512-68ngA9lg2H6zkZcyp22tsVt38mlhWde8l3eJLWkyLrp4HwMUr3c1s/M2t7+kHIhvMjglIBrFpncX1SzMckomGw==
-
-"@esbuild/netbsd-x64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.17.19.tgz#c29fb2453c6b7ddef9a35e2c18b37bda1ae5c462"
-  integrity sha512-CwFq42rXCR8TYIjIfpXCbRX0rp1jo6cPIUPSaWwzbVI4aOfX96OXY8M6KNmtPcg7QjYeDmN+DD0Wp3LaBOLf4Q==
-
-"@esbuild/openbsd-x64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.17.19.tgz#95e75a391403cb10297280d524d66ce04c920691"
-  integrity sha512-cnq5brJYrSZ2CF6c35eCmviIN3k3RczmHz8eYaVlNasVqsNY+JKohZU5MKmaOI+KkllCdzOKKdPs762VCPC20g==
-
-"@esbuild/sunos-x64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.17.19.tgz#722eaf057b83c2575937d3ffe5aeb16540da7273"
-  integrity sha512-vCRT7yP3zX+bKWFeP/zdS6SqdWB8OIpaRq/mbXQxTGHnIxspRtigpkUcDMlSCOejlHowLqII7K2JKevwyRP2rg==
-
-"@esbuild/win32-arm64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.17.19.tgz#9aa9dc074399288bdcdd283443e9aeb6b9552b6f"
-  integrity sha512-yYx+8jwowUstVdorcMdNlzklLYhPxjniHWFKgRqH7IFlUEa0Umu3KuYplf1HUZZ422e3NU9F4LGb+4O0Kdcaag==
-
-"@esbuild/win32-ia32@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.17.19.tgz#95ad43c62ad62485e210f6299c7b2571e48d2b03"
-  integrity sha512-eggDKanJszUtCdlVs0RB+h35wNlb5v4TWEkq4vZcmVt5u/HiDZrTXe2bWFQUez3RgNHwx/x4sk5++4NSSicKkw==
-
-"@esbuild/win32-x64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.17.19.tgz#8cfaf2ff603e9aabb910e9c0558c26cf32744061"
-  integrity sha512-lAhycmKnVOuRYNtRtatQR1LPQf2oYCkRGkSFnseDAKPl8lu5SOsK/e1sXe5a0Pc5kHIHe6P2I/ilntNv2xf3cA==
+"@esbuild/android-arm64@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz#984b4f9c8d0377443cc2dfcef266d02244593622"
+  integrity sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==
+
+"@esbuild/android-arm64@0.19.5":
+  version "0.19.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.19.5.tgz#276c5f99604054d3dbb733577e09adae944baa90"
+  integrity sha512-5d1OkoJxnYQfmC+Zd8NBFjkhyCNYwM4n9ODrycTFY6Jk1IGiZ+tjVJDDSwDt77nK+tfpGP4T50iMtVi4dEGzhQ==
+
+"@esbuild/android-arm@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.18.20.tgz#fedb265bc3a589c84cc11f810804f234947c3682"
+  integrity sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==
+
+"@esbuild/android-arm@0.19.5":
+  version "0.19.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.19.5.tgz#4a3cbf14758166abaae8ba9c01a80e68342a4eec"
+  integrity sha512-bhvbzWFF3CwMs5tbjf3ObfGqbl/17ict2/uwOSfr3wmxDE6VdS2GqY/FuzIPe0q0bdhj65zQsvqfArI9MY6+AA==
+
+"@esbuild/android-x64@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.18.20.tgz#35cf419c4cfc8babe8893d296cd990e9e9f756f2"
+  integrity sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==
+
+"@esbuild/android-x64@0.19.5":
+  version "0.19.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.19.5.tgz#21a3d11cd4613d2d3c5ccb9e746c254eb9265b0a"
+  integrity sha512-9t+28jHGL7uBdkBjL90QFxe7DVA+KGqWlHCF8ChTKyaKO//VLuoBricQCgwhOjA1/qOczsw843Fy4cbs4H3DVA==
+
+"@esbuild/darwin-arm64@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz#08172cbeccf95fbc383399a7f39cfbddaeb0d7c1"
+  integrity sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==
+
+"@esbuild/darwin-arm64@0.19.5":
+  version "0.19.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.19.5.tgz#714cb839f467d6a67b151ee8255886498e2b9bf6"
+  integrity sha512-mvXGcKqqIqyKoxq26qEDPHJuBYUA5KizJncKOAf9eJQez+L9O+KfvNFu6nl7SCZ/gFb2QPaRqqmG0doSWlgkqw==
+
+"@esbuild/darwin-x64@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz#d70d5790d8bf475556b67d0f8b7c5bdff053d85d"
+  integrity sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==
+
+"@esbuild/darwin-x64@0.19.5":
+  version "0.19.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.19.5.tgz#2c553e97a6d2b4ae76a884e35e6cbab85a990bbf"
+  integrity sha512-Ly8cn6fGLNet19s0X4unjcniX24I0RqjPv+kurpXabZYSXGM4Pwpmf85WHJN3lAgB8GSth7s5A0r856S+4DyiA==
+
+"@esbuild/freebsd-arm64@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz#98755cd12707f93f210e2494d6a4b51b96977f54"
+  integrity sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==
+
+"@esbuild/freebsd-arm64@0.19.5":
+  version "0.19.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.5.tgz#d554f556718adb31917a0da24277bf84b6ee87f3"
+  integrity sha512-GGDNnPWTmWE+DMchq1W8Sd0mUkL+APvJg3b11klSGUDvRXh70JqLAO56tubmq1s2cgpVCSKYywEiKBfju8JztQ==
+
+"@esbuild/freebsd-x64@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz#c1eb2bff03915f87c29cece4c1a7fa1f423b066e"
+  integrity sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==
+
+"@esbuild/freebsd-x64@0.19.5":
+  version "0.19.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.19.5.tgz#288f7358a3bb15d99e73c65c9adaa3dabb497432"
+  integrity sha512-1CCwDHnSSoA0HNwdfoNY0jLfJpd7ygaLAp5EHFos3VWJCRX9DMwWODf96s9TSse39Br7oOTLryRVmBoFwXbuuQ==
+
+"@esbuild/linux-arm64@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz#bad4238bd8f4fc25b5a021280c770ab5fc3a02a0"
+  integrity sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==
+
+"@esbuild/linux-arm64@0.19.5":
+  version "0.19.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.19.5.tgz#95933ae86325c93cb6b5e8333d22120ecfdc901b"
+  integrity sha512-o3vYippBmSrjjQUCEEiTZ2l+4yC0pVJD/Dl57WfPwwlvFkrxoSO7rmBZFii6kQB3Wrn/6GwJUPLU5t52eq2meA==
+
+"@esbuild/linux-arm@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz#3e617c61f33508a27150ee417543c8ab5acc73b0"
+  integrity sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==
+
+"@esbuild/linux-arm@0.19.5":
+  version "0.19.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.19.5.tgz#0acef93aa3e0579e46d33b666627bddb06636664"
+  integrity sha512-lrWXLY/vJBzCPC51QN0HM71uWgIEpGSjSZZADQhq7DKhPcI6NH1IdzjfHkDQws2oNpJKpR13kv7/pFHBbDQDwQ==
+
+"@esbuild/linux-ia32@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz#699391cccba9aee6019b7f9892eb99219f1570a7"
+  integrity sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==
+
+"@esbuild/linux-ia32@0.19.5":
+  version "0.19.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.19.5.tgz#b6e5c9e80b42131cbd6b1ddaa48c92835f1ed67f"
+  integrity sha512-MkjHXS03AXAkNp1KKkhSKPOCYztRtK+KXDNkBa6P78F8Bw0ynknCSClO/ztGszILZtyO/lVKpa7MolbBZ6oJtQ==
+
+"@esbuild/linux-loong64@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz#e6fccb7aac178dd2ffb9860465ac89d7f23b977d"
+  integrity sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==
+
+"@esbuild/linux-loong64@0.19.5":
+  version "0.19.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.19.5.tgz#e5f0cf95a180158b01ff5f417da796a1c09dfbea"
+  integrity sha512-42GwZMm5oYOD/JHqHska3Jg0r+XFb/fdZRX+WjADm3nLWLcIsN27YKtqxzQmGNJgu0AyXg4HtcSK9HuOk3v1Dw==
+
+"@esbuild/linux-mips64el@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz#eeff3a937de9c2310de30622a957ad1bd9183231"
+  integrity sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==
+
+"@esbuild/linux-mips64el@0.19.5":
+  version "0.19.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.19.5.tgz#ae36fb86c7d5f641f3a0c8472e83dcb6ea36a408"
+  integrity sha512-kcjndCSMitUuPJobWCnwQ9lLjiLZUR3QLQmlgaBfMX23UEa7ZOrtufnRds+6WZtIS9HdTXqND4yH8NLoVVIkcg==
+
+"@esbuild/linux-ppc64@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz#2f7156bde20b01527993e6881435ad79ba9599fb"
+  integrity sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==
+
+"@esbuild/linux-ppc64@0.19.5":
+  version "0.19.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.19.5.tgz#7960cb1666f0340ddd9eef7b26dcea3835d472d0"
+  integrity sha512-yJAxJfHVm0ZbsiljbtFFP1BQKLc8kUF6+17tjQ78QjqjAQDnhULWiTA6u0FCDmYT1oOKS9PzZ2z0aBI+Mcyj7Q==
+
+"@esbuild/linux-riscv64@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz#6628389f210123d8b4743045af8caa7d4ddfc7a6"
+  integrity sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==
+
+"@esbuild/linux-riscv64@0.19.5":
+  version "0.19.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.19.5.tgz#32207df26af60a3a9feea1783fc21b9817bade19"
+  integrity sha512-5u8cIR/t3gaD6ad3wNt1MNRstAZO+aNyBxu2We8X31bA8XUNyamTVQwLDA1SLoPCUehNCymhBhK3Qim1433Zag==
+
+"@esbuild/linux-s390x@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz#255e81fb289b101026131858ab99fba63dcf0071"
+  integrity sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==
+
+"@esbuild/linux-s390x@0.19.5":
+  version "0.19.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.19.5.tgz#b38d5681db89a3723862dfa792812397b1510a7d"
+  integrity sha512-Z6JrMyEw/EmZBD/OFEFpb+gao9xJ59ATsoTNlj39jVBbXqoZm4Xntu6wVmGPB/OATi1uk/DB+yeDPv2E8PqZGw==
+
+"@esbuild/linux-x64@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz#c7690b3417af318a9b6f96df3031a8865176d338"
+  integrity sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==
+
+"@esbuild/linux-x64@0.19.5":
+  version "0.19.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.19.5.tgz#46feba2ad041a241379d150f415b472fe3885075"
+  integrity sha512-psagl+2RlK1z8zWZOmVdImisMtrUxvwereIdyJTmtmHahJTKb64pAcqoPlx6CewPdvGvUKe2Jw+0Z/0qhSbG1A==
+
+"@esbuild/netbsd-x64@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz#30e8cd8a3dded63975e2df2438ca109601ebe0d1"
+  integrity sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==
+
+"@esbuild/netbsd-x64@0.19.5":
+  version "0.19.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.19.5.tgz#3b5c1fb068f26bfc681d31f682adf1bea4ef0702"
+  integrity sha512-kL2l+xScnAy/E/3119OggX8SrWyBEcqAh8aOY1gr4gPvw76la2GlD4Ymf832UCVbmuWeTf2adkZDK+h0Z/fB4g==
+
+"@esbuild/openbsd-x64@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz#7812af31b205055874c8082ea9cf9ab0da6217ae"
+  integrity sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==
+
+"@esbuild/openbsd-x64@0.19.5":
+  version "0.19.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.19.5.tgz#ca6830316ca68056c5c88a875f103ad3235e00db"
+  integrity sha512-sPOfhtzFufQfTBgRnE1DIJjzsXukKSvZxloZbkJDG383q0awVAq600pc1nfqBcl0ice/WN9p4qLc39WhBShRTA==
+
+"@esbuild/sunos-x64@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz#d5c275c3b4e73c9b0ecd38d1ca62c020f887ab9d"
+  integrity sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==
+
+"@esbuild/sunos-x64@0.19.5":
+  version "0.19.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.19.5.tgz#9efc4eb9539a7be7d5a05ada52ee43cda0d8e2dd"
+  integrity sha512-dGZkBXaafuKLpDSjKcB0ax0FL36YXCvJNnztjKV+6CO82tTYVDSH2lifitJ29jxRMoUhgkg9a+VA/B03WK5lcg==
+
+"@esbuild/win32-arm64@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz#73bc7f5a9f8a77805f357fab97f290d0e4820ac9"
+  integrity sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==
+
+"@esbuild/win32-arm64@0.19.5":
+  version "0.19.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.19.5.tgz#29f8184afa7a02a956ebda4ed638099f4b8ff198"
+  integrity sha512-dWVjD9y03ilhdRQ6Xig1NWNgfLtf2o/STKTS+eZuF90fI2BhbwD6WlaiCGKptlqXlURVB5AUOxUj09LuwKGDTg==
+
+"@esbuild/win32-ia32@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz#ec93cbf0ef1085cc12e71e0d661d20569ff42102"
+  integrity sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==
+
+"@esbuild/win32-ia32@0.19.5":
+  version "0.19.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.19.5.tgz#f3de07afb292ecad651ae4bb8727789de2d95b05"
+  integrity sha512-4liggWIA4oDgUxqpZwrDhmEfAH4d0iljanDOK7AnVU89T6CzHon/ony8C5LeOdfgx60x5cnQJFZwEydVlYx4iw==
+
+"@esbuild/win32-x64@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz#786c5f41f043b07afb1af37683d7c33668858f6d"
+  integrity sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==
+
+"@esbuild/win32-x64@0.19.5":
+  version "0.19.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.19.5.tgz#faad84c41ba12e3a0acb52571df9bff37bee75f6"
+  integrity sha512-czTrygUsB/jlM8qEW5MD8bgYU2Xg14lo6kBDXW6HdxKjh8M5PzETGiSHaz9MtbXBYDloHNUAUW2tMiKW4KM9Mw==
 
 "@eslint-community/eslint-utils@^4.2.0":
   version "4.4.0"
@@ -1984,11 +2181,6 @@
   resolved "https://registry.yarnpkg.com/@fastify/busboy/-/busboy-2.0.0.tgz#f22824caff3ae506b18207bad4126dbc6ccdb6b8"
   integrity sha512-JUFJad5lv7jxj926GPgymrWQxxjPYuJNiNjNMzqT+HiuP6Vl3dk5xzG+8sTX96np0ZAluvaMzPsjhHZ5rNuNQQ==
 
-"@gar/promisify@^1.1.3":
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
-  integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
-
 "@graphql-codegen/add@^3.2.3":
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/@graphql-codegen/add/-/add-3.2.3.tgz#f1ecee085987e7c21841edc4b1fd48877c663e1a"
@@ -2547,11 +2739,16 @@
     "@jridgewell/gen-mapping" "^0.3.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@jridgewell/sourcemap-codec@1.4.14", "@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.13", "@jridgewell/sourcemap-codec@^1.4.14":
+"@jridgewell/sourcemap-codec@1.4.14", "@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.14":
   version "1.4.14"
   resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24"
   integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
 
+"@jridgewell/sourcemap-codec@^1.4.15":
+  version "1.4.15"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32"
+  integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==
+
 "@jridgewell/trace-mapping@0.3.9":
   version "0.3.9"
   resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz#6534fd5933a53ba7cbf3a17615e273a0d1273ff9"
@@ -2581,6 +2778,13 @@
   resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz#b2ac626d6cb9c8718ab459166d4bb405b8ffa78b"
   integrity sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==
 
+"@ljharb/through@^2.3.9":
+  version "2.3.11"
+  resolved "https://registry.yarnpkg.com/@ljharb/through/-/through-2.3.11.tgz#783600ff12c06f21a76cc26e33abd0b1595092f9"
+  integrity sha512-ccfcIDlogiXNq5KcbAwbaO7lMh3Tm1i3khMPYpxlK8hH/W53zN81KM9coerRLOnTGu3nfXIniAmQbRI9OxbC0w==
+  dependencies:
+    call-bind "^1.0.2"
+
 "@ngneat/until-destroy@^9.1.2":
   version "9.2.3"
   resolved "https://registry.yarnpkg.com/@ngneat/until-destroy/-/until-destroy-9.2.3.tgz#c435b686b6c714c9004e82b23a341595a49ba5b5"
@@ -2595,10 +2799,10 @@
   dependencies:
     tslib "^2.0.0"
 
-"@ngtools/webpack@16.1.4":
-  version "16.1.4"
-  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-16.1.4.tgz#2e29bdf590c8b5505ffd744f12075b14ed972fc8"
-  integrity sha512-+8bfavDH8eWxjlJFYr6bkjcRHhy95j+f8oNn7/sGLNu4L96nuE2AZ011XIu2dJahCnNiBvwc1EpkKa92t9rkaA==
+"@ngtools/webpack@17.0.10":
+  version "17.0.10"
+  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-17.0.10.tgz#5e6d5ec4a2c89be5b79513b7317519a8c457d471"
+  integrity sha512-UCiLrV2aLrtR7Wr/jJi0nH2Xzb7ETenrPWU/EcW9V3lnlDun5g1J0y01jRzvcipxNTOmFfI4lqv288nKSmSOAA==
 
 "@ngx-formly/core@^6.2.2":
   version "6.2.2"
@@ -2614,11 +2818,6 @@
   dependencies:
     tslib "^2.0.0"
 
-"@nicolo-ribaudo/semver-v6@^6.3.3":
-  version "6.3.3"
-  resolved "https://registry.yarnpkg.com/@nicolo-ribaudo/semver-v6/-/semver-v6-6.3.3.tgz#ea6d23ade78a325f7a52750aab1526b02b628c29"
-  integrity sha512-3Yc1fUTs69MG/uZbJlLSI3JISMn2UV2rg+1D/vROUqZyh3l6iYHCs7GMp+M40ZD7yOdDbYjJcU1oTJhrc+dGKg==
-
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
@@ -2640,13 +2839,16 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
-"@npmcli/fs@^2.1.0":
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-2.1.2.tgz#a9e2541a4a2fec2e69c29b35e6060973da79b865"
-  integrity sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ==
+"@npmcli/agent@^2.0.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/agent/-/agent-2.2.0.tgz#e81f00fdb2a670750ff7731bbefb47ecbf0ccf44"
+  integrity sha512-2yThA1Es98orMkpSLVqlDZAMPK3jHJhifP2gnNUdk1754uZ8yI5c+ulCoVG+WlntQA6MzhrURMXjSd9Z7dJ2/Q==
   dependencies:
-    "@gar/promisify" "^1.1.3"
-    semver "^7.3.5"
+    agent-base "^7.1.0"
+    http-proxy-agent "^7.0.0"
+    https-proxy-agent "^7.0.1"
+    lru-cache "^10.0.1"
+    socks-proxy-agent "^8.0.1"
 
 "@npmcli/fs@^3.1.0":
   version "3.1.0"
@@ -2655,20 +2857,19 @@
   dependencies:
     semver "^7.3.5"
 
-"@npmcli/git@^4.0.0":
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/@npmcli/git/-/git-4.0.3.tgz#354db5fe1f29696303638e191d8538ee9b01b4bb"
-  integrity sha512-8cXNkDIbnXPVbhXMmQ7/bklCAjtmPaXfI9aEM4iH+xSuEHINLMHhlfESvVwdqmHJRJkR48vNJTSUvoF6GRPSFA==
+"@npmcli/git@^5.0.0":
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/@npmcli/git/-/git-5.0.4.tgz#d18c50f99649e6e89e8b427318134f582498700c"
+  integrity sha512-nr6/WezNzuYUppzXRaYu/W4aT5rLxdXqEFupbh6e/ovlYFQ8hpu1UUPV3Ir/YTl+74iXl2ZOMlGzudh9ZPUchQ==
   dependencies:
-    "@npmcli/promise-spawn" "^6.0.0"
-    lru-cache "^7.4.4"
-    mkdirp "^1.0.4"
-    npm-pick-manifest "^8.0.0"
+    "@npmcli/promise-spawn" "^7.0.0"
+    lru-cache "^10.0.1"
+    npm-pick-manifest "^9.0.0"
     proc-log "^3.0.0"
     promise-inflight "^1.0.1"
     promise-retry "^2.0.1"
     semver "^7.3.5"
-    which "^3.0.0"
+    which "^4.0.0"
 
 "@npmcli/installed-package-contents@^2.0.1":
   version "2.0.1"
@@ -2678,36 +2879,28 @@
     npm-bundled "^3.0.0"
     npm-normalize-package-bin "^3.0.0"
 
-"@npmcli/move-file@^2.0.0":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-2.0.1.tgz#26f6bdc379d87f75e55739bab89db525b06100e4"
-  integrity sha512-mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ==
-  dependencies:
-    mkdirp "^1.0.4"
-    rimraf "^3.0.2"
-
 "@npmcli/node-gyp@^3.0.0":
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/@npmcli/node-gyp/-/node-gyp-3.0.0.tgz#101b2d0490ef1aa20ed460e4c0813f0db560545a"
   integrity sha512-gp8pRXC2oOxu0DUE1/M3bYtb1b3/DbJ5aM113+XJBgfXdussRAsX0YOrOhdd8WvnAR6auDBvJomGAkLKA5ydxA==
 
-"@npmcli/promise-spawn@^6.0.0", "@npmcli/promise-spawn@^6.0.1":
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/@npmcli/promise-spawn/-/promise-spawn-6.0.2.tgz#c8bc4fa2bd0f01cb979d8798ba038f314cfa70f2"
-  integrity sha512-gGq0NJkIGSwdbUt4yhdF8ZrmkGKVz9vAdVzpOfnom+V8PLSmSOVhZwbNvZZS1EYcJN5hzzKBxmmVVAInM6HQLg==
+"@npmcli/promise-spawn@^7.0.0":
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/@npmcli/promise-spawn/-/promise-spawn-7.0.1.tgz#a836de2f42a2245d629cf6fbb8dd6c74c74c55af"
+  integrity sha512-P4KkF9jX3y+7yFUxgcUdDtLy+t4OlDGuEBLNs57AZsfSfg+uV6MLndqGpnl4831ggaEdXwR50XFoZP4VFtHolg==
   dependencies:
-    which "^3.0.0"
+    which "^4.0.0"
 
-"@npmcli/run-script@^6.0.0":
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-6.0.0.tgz#f89e322c729e26ae29db6cc8cc76559074aac208"
-  integrity sha512-ql+AbRur1TeOdl1FY+RAwGW9fcr4ZwiVKabdvm93mujGREVuVLbdkXRJDrkTXSdCjaxYydr1wlA2v67jxWG5BQ==
+"@npmcli/run-script@^7.0.0":
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-7.0.3.tgz#a803e05c4b58e2a7b3f801a9f2767f22822df457"
+  integrity sha512-ZMWGLHpzMq3rBGIwPyeaoaleaLMvrBrH8nugHxTi5ACkJZXTxXPtVuEH91ifgtss5hUwJQ2VDnzDBWPmz78rvg==
   dependencies:
     "@npmcli/node-gyp" "^3.0.0"
-    "@npmcli/promise-spawn" "^6.0.0"
-    node-gyp "^9.0.0"
+    "@npmcli/promise-spawn" "^7.0.0"
+    node-gyp "^10.0.0"
     read-package-json-fast "^3.0.0"
-    which "^3.0.0"
+    which "^4.0.0"
 
 "@nrwl/devkit@16.5.1":
   version "16.5.1"
@@ -2835,27 +3028,48 @@
   resolved "https://registry.yarnpkg.com/@repeaterjs/repeater/-/repeater-3.0.4.tgz#a04d63f4d1bf5540a41b01a921c9a7fddc3bd1ca"
   integrity sha512-AW8PKd6iX3vAZ0vA43nOUOnbq/X5ihgU+mSXXqunMkeQADGiqw/PY0JNeYtD5sr0PAy51YPgAPbDoeapv9r8WA==
 
-"@schematics/angular@16.1.4":
-  version "16.1.4"
-  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-16.1.4.tgz#e99a8b7e1b1b9db107727d0e26a05dc190eefeea"
-  integrity sha512-XfoeL+aBVIR/DzgVKGVhHW/TGQnqWvngyJVuCwXEVWzNfjxHYFkchXa78OItpAvTEr6/Y0Me9FQVAGVA4mMUyg==
+"@schematics/angular@17.0.10":
+  version "17.0.10"
+  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-17.0.10.tgz#cd3a918ac47032591138b6169fddc35706625b13"
+  integrity sha512-rRBlDMXfVPkW3CqVQxazFqkuJXd0BFnD1zjI9WtDiNt3o2pTHbLzuWJnXKuIt5rzv0x/bFwNqIt4CPW2DYGNMg==
   dependencies:
-    "@angular-devkit/core" "16.1.4"
-    "@angular-devkit/schematics" "16.1.4"
+    "@angular-devkit/core" "17.0.10"
+    "@angular-devkit/schematics" "17.0.10"
     jsonc-parser "3.2.0"
 
-"@sigstore/protobuf-specs@^0.1.0":
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/@sigstore/protobuf-specs/-/protobuf-specs-0.1.0.tgz#957cb64ea2f5ce527cc9cf02a096baeb0d2b99b4"
-  integrity sha512-a31EnjuIDSX8IXBUib3cYLDRlPMU36AWX4xS8ysLaNu4ZzUesDiPt83pgrW2X1YLMe5L2HbDyaKK5BrL4cNKaQ==
+"@sigstore/bundle@^2.1.0":
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/@sigstore/bundle/-/bundle-2.1.0.tgz#c6140ca97b68815edf7c4fb7bdbf58d656525c39"
+  integrity sha512-89uOo6yh/oxaU8AeOUnVrTdVMcGk9Q1hJa7Hkvalc6G3Z3CupWk4Xe9djSgJm9fMkH69s0P0cVHUoKSOemLdng==
+  dependencies:
+    "@sigstore/protobuf-specs" "^0.2.1"
 
-"@sigstore/tuf@^1.0.1":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@sigstore/tuf/-/tuf-1.0.2.tgz#acbb2c8399fb03aca0c90fa1dc1934bda4160623"
-  integrity sha512-vjwcYePJzM01Ha6oWWZ9gNcdIgnzyFxfqfWzph483DPJTH8Tb7f7bQRRll3CYVkyH56j0AgcPAcl6Vg95DPF+Q==
+"@sigstore/protobuf-specs@^0.2.1":
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/@sigstore/protobuf-specs/-/protobuf-specs-0.2.1.tgz#be9ef4f3c38052c43bd399d3f792c97ff9e2277b"
+  integrity sha512-XTWVxnWJu+c1oCshMLwnKvz8ZQJJDVOlciMfgpJBQbThVjKTCG8dwyhgLngBD2KN0ap9F/gOV8rFDEx8uh7R2A==
+
+"@sigstore/sign@^2.1.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@sigstore/sign/-/sign-2.2.0.tgz#4918207d8356877ab42d85d360d5729e9b3ec65a"
+  integrity sha512-AAbmnEHDQv6CSfrWA5wXslGtzLPtAtHZleKOgxdQYvx/s76Fk6T6ZVt7w2IGV9j1UrFeBocTTQxaXG2oRrDhYA==
+  dependencies:
+    "@sigstore/bundle" "^2.1.0"
+    "@sigstore/protobuf-specs" "^0.2.1"
+    make-fetch-happen "^13.0.0"
+
+"@sigstore/tuf@^2.1.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@sigstore/tuf/-/tuf-2.2.0.tgz#ef636239687e41af3f2ce10667ab88f5ca6165b3"
+  integrity sha512-KKATZ5orWfqd9ZG6MN8PtCIx4eevWSuGRKQvofnWXRpyMyUEpmrzg5M5BrCpjM+NfZ0RbNGOh5tCz/P2uoRqOA==
   dependencies:
-    "@sigstore/protobuf-specs" "^0.1.0"
-    tuf-js "^1.1.7"
+    "@sigstore/protobuf-specs" "^0.2.1"
+    tuf-js "^2.1.0"
+
+"@socket.io/component-emitter@~3.1.0":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz#96116f2a912e0c02817345b3c10751069920d553"
+  integrity sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==
 
 "@tootallnate/once@2":
   version "2.0.0"
@@ -2887,18 +3101,18 @@
   resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.3.tgz#472eaab5f15c1ffdd7f8628bd4c4f753995ec79e"
   integrity sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==
 
-"@tufjs/canonical-json@1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@tufjs/canonical-json/-/canonical-json-1.0.0.tgz#eade9fd1f537993bc1f0949f3aea276ecc4fab31"
-  integrity sha512-QTnf++uxunWvG2z3UFNzAoQPHxnSXOwtaI3iJ+AohhV+5vONuArPjJE7aPXPVXfXJsqrVbZBu9b81AJoSd09IQ==
+"@tufjs/canonical-json@2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@tufjs/canonical-json/-/canonical-json-2.0.0.tgz#a52f61a3d7374833fca945b2549bc30a2dd40d0a"
+  integrity sha512-yVtV8zsdo8qFHe+/3kw81dSLyF7D576A5cCFCi4X7B39tWT7SekaEFUnvnWJHz+9qO7qJTah1JbrDjWKqFtdWA==
 
-"@tufjs/models@1.0.4":
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/@tufjs/models/-/models-1.0.4.tgz#5a689630f6b9dbda338d4b208019336562f176ef"
-  integrity sha512-qaGV9ltJP0EO25YfFUPhxRVK0evXFIAGicsVXuRim4Ed9cjPxYhNnNJ49SFmbeLgtxpslIkX317IgpfcHPVj/A==
+"@tufjs/models@2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@tufjs/models/-/models-2.0.0.tgz#c7ab241cf11dd29deb213d6817dabb8c99ce0863"
+  integrity sha512-c8nj8BaOExmZKO2DXhDfegyhSGcG9E/mPN3U13L+/PsoWm1uaGiHHjxqSHQiasDBQwDA3aHuw9+9spYAP1qvvg==
   dependencies:
-    "@tufjs/canonical-json" "1.0.0"
-    minimatch "^9.0.0"
+    "@tufjs/canonical-json" "2.0.0"
+    minimatch "^9.0.3"
 
 "@types/body-parser@*":
   version "1.19.2"
@@ -2935,6 +3149,18 @@
   dependencies:
     "@types/node" "*"
 
+"@types/cookie@^0.4.1":
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/@types/cookie/-/cookie-0.4.1.tgz#bfd02c1f2224567676c1545199f87c3a861d878d"
+  integrity sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==
+
+"@types/cors@^2.8.12":
+  version "2.8.17"
+  resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.17.tgz#5d718a5e494a8166f569d986794e49c48b216b2b"
+  integrity sha512-8CGDvrBj1zgo2qE+oS3pOCyYNqCPryMWY2bGfwA0dcfopWGgxs+78df0Rs3rc9THP4JkOhLsAa+15VdpAqkcUA==
+  dependencies:
+    "@types/node" "*"
+
 "@types/eslint-scope@^3.7.3":
   version "3.7.4"
   resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.4.tgz#37fc1223f0786c39627068a12e94d6e6fc61de16"
@@ -3019,6 +3245,13 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.18.tgz#8dfb97f0da23c2293e554c5a50d61ef134d7697f"
   integrity sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA==
 
+"@types/node@>=10.0.0":
+  version "20.11.0"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.0.tgz#8e0b99e70c0c1ade1a86c4a282f7b7ef87c9552f"
+  integrity sha512-o9bjXmDNcF7GbM4CNQpmi+TutCgap/K3w1JyKgxAjqx41zp9qlIAVFi0IhCNsJcXolEqLWhbFbEeL0PvYm4pcQ==
+  dependencies:
+    undici-types "~5.26.4"
+
 "@types/node@^12.11.1":
   version "12.20.55"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.55.tgz#c329cbd434c42164f846b909bd6f85b5537f6240"
@@ -3076,13 +3309,20 @@
   resolved "https://registry.yarnpkg.com/@types/stacktrace-js/-/stacktrace-js-0.0.33.tgz#9b027370ca161b89798f308af77438802546cb39"
   integrity sha512-aqJ6QM9QThNL4dHBhwl1f9B0oDqiREkYLn9RldghUKsGeFWWGlCsqsRWxbh+hDvvmptMFqc4aIfFIGz9BBu8Qg==
 
-"@types/ws@^8.0.0", "@types/ws@^8.5.1":
+"@types/ws@^8.0.0":
   version "8.5.4"
   resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.4.tgz#bb10e36116d6e570dd943735f86c933c1587b8a5"
   integrity sha512-zdQDHKUgcX/zBc4GrwsE/7dVdAD8JR4EuiAXiiUhhfyIJXXb2+PrGshFyeXWQPMmmZ2XxgaqclgpIC7eTXc1mg==
   dependencies:
     "@types/node" "*"
 
+"@types/ws@^8.5.5":
+  version "8.5.10"
+  resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.10.tgz#4acfb517970853fa6574a3a6886791d04a396787"
+  integrity sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A==
+  dependencies:
+    "@types/node" "*"
+
 "@typescript-eslint/scope-manager@5.62.0":
   version "5.62.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz#d9457ccc6a0b8d6b37d0eb252a23022478c5460c"
@@ -3360,10 +3600,10 @@ abab@^2.0.6:
   resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291"
   integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==
 
-abbrev@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
-  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
+abbrev@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-2.0.0.tgz#cf59829b8b4f03f89dda2771cb7f3653828c89bf"
+  integrity sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==
 
 abort-controller@^3.0.0:
   version "3.0.0"
@@ -3408,21 +3648,19 @@ adjust-sourcemap-loader@^4.0.0:
     loader-utils "^2.0.0"
     regex-parser "^2.2.11"
 
-agent-base@6, agent-base@^6.0.2:
+agent-base@6:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
   integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
   dependencies:
     debug "4"
 
-agentkeepalive@^4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.2.1.tgz#a7975cbb9f83b367f06c90cc51ff28fe7d499717"
-  integrity sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==
+agent-base@^7.0.2, agent-base@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.0.tgz#536802b76bc0b34aa50195eb2442276d613e3434"
+  integrity sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==
   dependencies:
-    debug "^4.1.0"
-    depd "^1.1.2"
-    humanize-ms "^1.2.1"
+    debug "^4.3.4"
 
 aggregate-error@^3.0.0:
   version "3.1.0"
@@ -3476,7 +3714,7 @@ ansi-colors@4.1.3, ansi-colors@^4.1.1:
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.3.tgz#37611340eb2243e70cc604cad35d63270d48781b"
   integrity sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==
 
-ansi-escapes@^4.2.1, ansi-escapes@^4.3.0:
+ansi-escapes@^4.2.1, ansi-escapes@^4.3.0, ansi-escapes@^4.3.2:
   version "4.3.2"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"
   integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==
@@ -3532,19 +3770,6 @@ apollo-angular@^5.0.0:
   dependencies:
     tslib "^2.0.0"
 
-"aproba@^1.0.3 || ^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
-  integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==
-
-are-we-there-yet@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz#679df222b278c64f2cdba1175cdc00b0d96164bd"
-  integrity sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==
-  dependencies:
-    delegates "^1.0.0"
-    readable-stream "^3.6.0"
-
 arg@^4.1.0:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
@@ -3621,6 +3846,18 @@ astral-regex@^2.0.0:
   resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
   integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
 
+async-each-series@0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/async-each-series/-/async-each-series-0.1.1.tgz#7617c1917401fd8ca4a28aadce3dbae98afeb432"
+  integrity sha512-p4jj6Fws4Iy2m0iCmI2am2ZNZCgbdgE+P8F/8csmn2vx7ixXrO2zGcuNsD46X5uZSVecmkEy/M06X2vG8KD6dQ==
+
+async@^2.6.0:
+  version "2.6.4"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221"
+  integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==
+  dependencies:
+    lodash "^4.17.14"
+
 async@^3.2.3:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c"
@@ -3636,14 +3873,14 @@ auto-bind@~4.0.0:
   resolved "https://registry.yarnpkg.com/auto-bind/-/auto-bind-4.0.0.tgz#e3589fc6c2da8f7ca43ba9f84fa52a744fc997fb"
   integrity sha512-Hdw8qdNiqdJ8LqT0iK0sVzkFbzg6fhnQqqfWhBDxcHZvU75+B+ayzTy8x+k5Ix0Y92XOhOUlx74ps+bA6BeYMQ==
 
-autoprefixer@10.4.14:
-  version "10.4.14"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.14.tgz#e28d49902f8e759dd25b153264e862df2705f79d"
-  integrity sha512-FQzyfOsTlwVzjHxKEqRIAdJx9niO6VCBCoEwax/VLSoQF29ggECcPuBqUMZ+u8jCZOPSy8b8/8KnuFbp0SaFZQ==
+autoprefixer@10.4.16:
+  version "10.4.16"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.16.tgz#fad1411024d8670880bdece3970aa72e3572feb8"
+  integrity sha512-7vd3UC6xKp0HLfua5IjZlcXvGAGy7cBAXTg2lyQ/8WpNhd6SiZ8Be+xm3FyBSYJx5GKcpRCzBh7RH4/0dnY+uQ==
   dependencies:
-    browserslist "^4.21.5"
-    caniuse-lite "^1.0.30001464"
-    fraction.js "^4.2.0"
+    browserslist "^4.21.10"
+    caniuse-lite "^1.0.30001538"
+    fraction.js "^4.3.6"
     normalize-range "^0.1.2"
     picocolors "^1.0.0"
     postcss-value-parser "^4.2.0"
@@ -3653,6 +3890,13 @@ available-typed-arrays@^1.0.5:
   resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7"
   integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==
 
+axios@0.21.4:
+  version "0.21.4"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575"
+  integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==
+  dependencies:
+    follow-redirects "^1.14.0"
+
 axios@^1.0.0:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.1.tgz#76550d644bf0a2d469a01f9244db6753208397d7"
@@ -3669,12 +3913,12 @@ axobject-query@3.1.1:
   dependencies:
     deep-equal "^2.0.5"
 
-babel-loader@9.1.2:
-  version "9.1.2"
-  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-9.1.2.tgz#a16a080de52d08854ee14570469905a5fc00d39c"
-  integrity sha512-mN14niXW43tddohGl8HPu5yfQq70iUThvFL/4QzESA7GcZoC0eVOhvWdQ8+3UlSjaDE9MVtsW9mxDY07W7VpVA==
+babel-loader@9.1.3:
+  version "9.1.3"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-9.1.3.tgz#3d0e01b4e69760cc694ee306fe16d358aa1c6f9a"
+  integrity sha512-xG3ST4DglodGf8qSwv0MdeWLhrDsw/32QMdTO5T1ZIp9gQur0HkCyFs7Awskr10JKXFXwpAhiCuYX5oGXnRGbw==
   dependencies:
-    find-cache-dir "^3.3.2"
+    find-cache-dir "^4.0.0"
     schema-utils "^4.0.0"
 
 babel-plugin-istanbul@6.1.1:
@@ -3688,29 +3932,29 @@ babel-plugin-istanbul@6.1.1:
     istanbul-lib-instrument "^5.0.4"
     test-exclude "^6.0.0"
 
-babel-plugin-polyfill-corejs2@^0.4.3:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.4.tgz#9f9a0e1cd9d645cc246a5e094db5c3aa913ccd2b"
-  integrity sha512-9WeK9snM1BfxB38goUEv2FLnA6ja07UMfazFHzCXUb3NyDZAwfXvQiURQ6guTTMeHcOsdknULm1PDhs4uWtKyA==
+babel-plugin-polyfill-corejs2@^0.4.6:
+  version "0.4.7"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.7.tgz#679d1b94bf3360f7682e11f2cb2708828a24fe8c"
+  integrity sha512-LidDk/tEGDfuHW2DWh/Hgo4rmnw3cduK6ZkOI1NPFceSK3n/yAGeOsNT7FLnSGHkXj3RHGSEVkN3FsCTY6w2CQ==
   dependencies:
     "@babel/compat-data" "^7.22.6"
-    "@babel/helper-define-polyfill-provider" "^0.4.1"
-    "@nicolo-ribaudo/semver-v6" "^6.3.3"
+    "@babel/helper-define-polyfill-provider" "^0.4.4"
+    semver "^6.3.1"
 
-babel-plugin-polyfill-corejs3@^0.8.1:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.2.tgz#d406c5738d298cd9c66f64a94cf8d5904ce4cc5e"
-  integrity sha512-Cid+Jv1BrY9ReW9lIfNlNpsI53N+FN7gE+f73zLAUbr9C52W4gKLWSByx47pfDJsEysojKArqOtOKZSVIIUTuQ==
+babel-plugin-polyfill-corejs3@^0.8.5:
+  version "0.8.7"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.7.tgz#941855aa7fdaac06ed24c730a93450d2b2b76d04"
+  integrity sha512-KyDvZYxAzkC0Aj2dAPyDzi2Ym15e5JKZSK+maI7NAwSqofvuFglbSsxE7wUOvTg9oFVnHMzVzBKcqEb4PJgtOA==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.4.1"
-    core-js-compat "^3.31.0"
+    "@babel/helper-define-polyfill-provider" "^0.4.4"
+    core-js-compat "^3.33.1"
 
-babel-plugin-polyfill-regenerator@^0.5.0:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.1.tgz#ace7a5eced6dff7d5060c335c52064778216afd3"
-  integrity sha512-L8OyySuI6OSQ5hFy9O+7zFjyr4WhAfRjLIOkhQGYl+emwJkd/S4XXT1JpfrgR1jrQ1NcGiOh+yAdGlF8pnC3Jw==
+babel-plugin-polyfill-regenerator@^0.5.3:
+  version "0.5.4"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.4.tgz#c6fc8eab610d3a11eb475391e52584bacfc020f4"
+  integrity sha512-S/x2iOCvDaCASLYsOOgWOq4bCfKYVqvO/uxjkaYyZ3rVsVE3CeAI/c84NpyuBBymEgNvHgjEot3a9/Z/kXvqsg==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.4.1"
+    "@babel/helper-define-polyfill-provider" "^0.4.4"
 
 babel-plugin-syntax-trailing-function-commas@^7.0.0-beta.0:
   version "7.0.0-beta.0"
@@ -3760,6 +4004,11 @@ base64-js@^1.2.0, base64-js@^1.3.1:
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
   integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
 
+base64id@2.0.0, base64id@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/base64id/-/base64id-2.0.0.tgz#2770ac6bc47d312af97a8bf9a634342e0cd25cb6"
+  integrity sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==
+
 batch@0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
@@ -3848,6 +4097,63 @@ braces@^3.0.2, braces@~3.0.2:
   dependencies:
     fill-range "^7.0.1"
 
+browser-sync-client@^2.29.3:
+  version "2.29.3"
+  resolved "https://registry.yarnpkg.com/browser-sync-client/-/browser-sync-client-2.29.3.tgz#9300b97f42abc2c4f95ca29b5a9781b5c492f14a"
+  integrity sha512-4tK5JKCl7v/3aLbmCBMzpufiYLsB1+UI+7tUXCCp5qF0AllHy/jAqYu6k7hUF3hYtlClKpxExWaR+rH+ny07wQ==
+  dependencies:
+    etag "1.8.1"
+    fresh "0.5.2"
+    mitt "^1.1.3"
+
+browser-sync-ui@^2.29.3:
+  version "2.29.3"
+  resolved "https://registry.yarnpkg.com/browser-sync-ui/-/browser-sync-ui-2.29.3.tgz#35e2ce3b470dce6b7219307cac7278bf324a0f16"
+  integrity sha512-kBYOIQjU/D/3kYtUIJtj82e797Egk1FB2broqItkr3i4eF1qiHbFCG6srksu9gWhfmuM/TNG76jMfzAdxEPakg==
+  dependencies:
+    async-each-series "0.1.1"
+    chalk "4.1.2"
+    connect-history-api-fallback "^1"
+    immutable "^3"
+    server-destroy "1.0.1"
+    socket.io-client "^4.4.1"
+    stream-throttle "^0.1.3"
+
+browser-sync@2.29.3:
+  version "2.29.3"
+  resolved "https://registry.yarnpkg.com/browser-sync/-/browser-sync-2.29.3.tgz#c2a3ff00c659eb87a13cae9d7a427e1b4b580ee1"
+  integrity sha512-NiM38O6XU84+MN+gzspVmXV2fTOoe+jBqIBx3IBdhZrdeURr6ZgznJr/p+hQ+KzkKEiGH/GcC4SQFSL0jV49bg==
+  dependencies:
+    browser-sync-client "^2.29.3"
+    browser-sync-ui "^2.29.3"
+    bs-recipes "1.3.4"
+    chalk "4.1.2"
+    chokidar "^3.5.1"
+    connect "3.6.6"
+    connect-history-api-fallback "^1"
+    dev-ip "^1.0.1"
+    easy-extender "^2.3.4"
+    eazy-logger "^4.0.1"
+    etag "^1.8.1"
+    fresh "^0.5.2"
+    fs-extra "3.0.1"
+    http-proxy "^1.18.1"
+    immutable "^3"
+    localtunnel "^2.0.1"
+    micromatch "^4.0.2"
+    opn "5.3.0"
+    portscanner "2.2.0"
+    raw-body "^2.3.2"
+    resp-modifier "6.0.2"
+    rx "4.1.0"
+    send "0.16.2"
+    serve-index "1.9.1"
+    serve-static "1.13.2"
+    server-destroy "1.0.1"
+    socket.io "^4.4.1"
+    ua-parser-js "^1.0.33"
+    yargs "^17.3.1"
+
 browserslist@^4.14.5, browserslist@^4.21.3:
   version "4.21.4"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.4.tgz#e7496bbc67b9e39dd0f98565feccdcb0d4ff6987"
@@ -3858,6 +4164,16 @@ browserslist@^4.14.5, browserslist@^4.21.3:
     node-releases "^2.0.6"
     update-browserslist-db "^1.0.9"
 
+browserslist@^4.21.10, browserslist@^4.22.2:
+  version "4.22.2"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.22.2.tgz#704c4943072bd81ea18997f3bd2180e89c77874b"
+  integrity sha512-0UgcrvQmBDvZHFGdYUehrCNIazki7/lUP3kkoi/r3YB2amZbFM9J43ZRkJTXBUZK4gmx56+Sqk9+Vs9mwZx9+A==
+  dependencies:
+    caniuse-lite "^1.0.30001565"
+    electron-to-chromium "^1.4.601"
+    node-releases "^2.0.14"
+    update-browserslist-db "^1.0.13"
+
 browserslist@^4.21.5, browserslist@^4.21.9:
   version "4.21.9"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.9.tgz#e11bdd3c313d7e2a9e87e8b4b0c7872b13897635"
@@ -3868,6 +4184,11 @@ browserslist@^4.21.5, browserslist@^4.21.9:
     node-releases "^2.0.12"
     update-browserslist-db "^1.0.11"
 
+bs-recipes@1.3.4:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/bs-recipes/-/bs-recipes-1.3.4.tgz#0d2d4d48a718c8c044769fdc4f89592dc8b69585"
+  integrity sha512-BXvDkqhDNxXEjeGM8LFkSbR+jzmP/CYpCiVKYn+soB1dDldeU15EBNDkwVXndKuX35wnNUaPd0qSoQEAkmQtMw==
+
 bser@2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05"
@@ -3927,17 +4248,17 @@ bytesish@^0.4.1:
   resolved "https://registry.yarnpkg.com/bytesish/-/bytesish-0.4.4.tgz#f3b535a0f1153747427aee27256748cff92347e6"
   integrity sha512-i4uu6M4zuMUiyfZN4RU2+i9+peJh//pXhd9x1oSe1LBkZ3LEbCoygu8W0bXTukU1Jme2txKuotpCZRaC3FLxcQ==
 
-cacache@17.1.3:
-  version "17.1.3"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-17.1.3.tgz#c6ac23bec56516a7c0c52020fd48b4909d7c7044"
-  integrity sha512-jAdjGxmPxZh0IipMdR7fK/4sDSrHMLUV0+GvVUsjwyGNKHsh79kW/otg+GkbXwl6Uzvy9wsvHOX4nUoWldeZMg==
+cacache@^18.0.0:
+  version "18.0.2"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-18.0.2.tgz#fd527ea0f03a603be5c0da5805635f8eef00c60c"
+  integrity sha512-r3NU8h/P+4lVUHfeRw1dtgQYar3DZMm4/cm2bZgOvrFC/su7budSOeqh52VJIC4U4iG1WWwV6vRW0znqBvxNuw==
   dependencies:
     "@npmcli/fs" "^3.1.0"
     fs-minipass "^3.0.0"
     glob "^10.2.2"
-    lru-cache "^7.7.1"
-    minipass "^5.0.0"
-    minipass-collect "^1.0.2"
+    lru-cache "^10.0.1"
+    minipass "^7.0.3"
+    minipass-collect "^2.0.1"
     minipass-flush "^1.0.5"
     minipass-pipeline "^1.2.4"
     p-map "^4.0.0"
@@ -3945,49 +4266,6 @@ cacache@17.1.3:
     tar "^6.1.11"
     unique-filename "^3.0.0"
 
-cacache@^16.1.0:
-  version "16.1.3"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-16.1.3.tgz#a02b9f34ecfaf9a78c9f4bc16fceb94d5d67a38e"
-  integrity sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ==
-  dependencies:
-    "@npmcli/fs" "^2.1.0"
-    "@npmcli/move-file" "^2.0.0"
-    chownr "^2.0.0"
-    fs-minipass "^2.1.0"
-    glob "^8.0.1"
-    infer-owner "^1.0.4"
-    lru-cache "^7.7.1"
-    minipass "^3.1.6"
-    minipass-collect "^1.0.2"
-    minipass-flush "^1.0.5"
-    minipass-pipeline "^1.2.4"
-    mkdirp "^1.0.4"
-    p-map "^4.0.0"
-    promise-inflight "^1.0.1"
-    rimraf "^3.0.2"
-    ssri "^9.0.0"
-    tar "^6.1.11"
-    unique-filename "^2.0.0"
-
-cacache@^17.0.0:
-  version "17.0.4"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-17.0.4.tgz#5023ed892ba8843e3b7361c26d0ada37e146290c"
-  integrity sha512-Z/nL3gU+zTUjz5pCA5vVjYM8pmaw2kxM7JEiE0fv3w77Wj+sFbi70CrBruUWH0uNcEdvLDixFpgA2JM4F4DBjA==
-  dependencies:
-    "@npmcli/fs" "^3.1.0"
-    fs-minipass "^3.0.0"
-    glob "^8.0.1"
-    lru-cache "^7.7.1"
-    minipass "^4.0.0"
-    minipass-collect "^1.0.2"
-    minipass-flush "^1.0.5"
-    minipass-pipeline "^1.2.4"
-    p-map "^4.0.0"
-    promise-inflight "^1.0.1"
-    ssri "^10.0.0"
-    tar "^6.1.11"
-    unique-filename "^3.0.0"
-
 call-bind@^1.0.0, call-bind@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
@@ -4019,11 +4297,16 @@ caniuse-lite@^1.0.30001400:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001445.tgz#cf2d4eb93f2bcdf0310de9dd6d18be271bc0b447"
   integrity sha512-8sdQIdMztYmzfTMO6KfLny878Ln9c2M0fc7EH60IjlP4Dc4PiCy7K2Vl3ITmWgOyPgVQKa5x+UP/KqFsxj4mBg==
 
-caniuse-lite@^1.0.30001464, caniuse-lite@^1.0.30001503:
+caniuse-lite@^1.0.30001503:
   version "1.0.30001517"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001517.tgz#90fabae294215c3495807eb24fc809e11dc2f0a8"
   integrity sha512-Vdhm5S11DaFVLlyiKu4hiUTkpZu+y1KA/rZZqVQfOD5YdDT/eQKlkt7NaE0WGOFgX32diqt9MiP9CAiFeRklaA==
 
+caniuse-lite@^1.0.30001538, caniuse-lite@^1.0.30001565:
+  version "1.0.30001576"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001576.tgz#893be772cf8ee6056d6c1e2d07df365b9ec0a5c4"
+  integrity sha512-ff5BdakGe2P3SQsMsiqmt1Lc8221NR1VzHj5jXN5vBny9A6fpze94HiVV/n7XRosOlsShJcvMv5mdnpjOGCEgg==
+
 capital-case@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/capital-case/-/capital-case-1.0.4.tgz#9d130292353c9249f6b00fa5852bee38a717e669"
@@ -4038,6 +4321,14 @@ caseless@~0.12.0:
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
   integrity sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==
 
+chalk@4.1.2, chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1, chalk@~4.1.0:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
+  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
 chalk@^2.0.0, chalk@^2.3.0, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
@@ -4055,13 +4346,10 @@ chalk@^3.0.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1, chalk@~4.1.0:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
-  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
-  dependencies:
-    ansi-styles "^4.1.0"
-    supports-color "^7.1.0"
+chalk@^5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.3.0.tgz#67c20a7ebef70e7f3970a01f90fa210cb6860385"
+  integrity sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==
 
 change-case-all@1.0.14:
   version "1.0.14"
@@ -4118,7 +4406,7 @@ chardet@^0.7.0:
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
   integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
 
-chokidar@3.5.3, "chokidar@>=3.0.0 <4.0.0", chokidar@^3.0.0, chokidar@^3.5.2, chokidar@^3.5.3:
+chokidar@3.5.3, "chokidar@>=3.0.0 <4.0.0", chokidar@^3.0.0, chokidar@^3.5.1, chokidar@^3.5.2, chokidar@^3.5.3:
   version "3.5.3"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
   integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
@@ -4183,6 +4471,11 @@ cli-width@^3.0.0:
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6"
   integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==
 
+cli-width@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-4.1.0.tgz#42daac41d3c254ef38ad8ac037672130173691c5"
+  integrity sha512-ouuZd4/dm2Sw5Gmqy6bGyNNNe1qt9RpmxveLSO7KcgsTnU7RXfsw+/bukWGo1abgBiMAic068rclZsO4IWmmxQ==
+
 cliui@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1"
@@ -4248,11 +4541,6 @@ color-name@~1.1.4:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
-color-support@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
-  integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
-
 colorette@^2.0.10, colorette@^2.0.16:
   version "2.0.19"
   resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.19.tgz#cdf044f47ad41a0f4b56b3a0d5b4e6e1a2d5a798"
@@ -4285,7 +4573,7 @@ command-line-usage@^6.1.1:
     table-layout "^1.0.2"
     typical "^5.2.0"
 
-commander@^2.12.1, commander@^2.20.0:
+commander@^2.12.1, commander@^2.2.0, commander@^2.20.0:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
@@ -4300,16 +4588,16 @@ commander@^7.2.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
   integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
 
+common-path-prefix@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/common-path-prefix/-/common-path-prefix-3.0.0.tgz#7d007a7e07c58c4b4d5f433131a19141b29f11e0"
+  integrity sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w==
+
 common-tags@1.8.2:
   version "1.8.2"
   resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.2.tgz#94ebb3c076d26032745fd54face7f688ef5ac9c6"
   integrity sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==
 
-commondir@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
-  integrity sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==
-
 compressible@~2.0.16:
   version "2.0.18"
   resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba"
@@ -4335,15 +4623,25 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
 
+connect-history-api-fallback@^1:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc"
+  integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==
+
 connect-history-api-fallback@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz#647264845251a0daf25b97ce87834cace0f5f1c8"
   integrity sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==
 
-console-control-strings@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
-  integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==
+connect@3.6.6:
+  version "3.6.6"
+  resolved "https://registry.yarnpkg.com/connect/-/connect-3.6.6.tgz#09eff6c55af7236e137135a72574858b6786f524"
+  integrity sha512-OO7axMmPpu/2XuX1+2Yrg0ddju31B6xLZMWkJ5rYBu4YRmRVlOjvlY6kw2FJKiAzyxGwnrDUAG4s1Pf0sbBMCQ==
+  dependencies:
+    debug "2.6.9"
+    finalhandler "1.1.0"
+    parseurl "~1.3.2"
+    utils-merge "1.0.1"
 
 constant-case@^3.0.4:
   version "3.0.4"
@@ -4371,6 +4669,11 @@ convert-source-map@^1.5.1, convert-source-map@^1.7.0:
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f"
   integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==
 
+convert-source-map@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a"
+  integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==
+
 cookie-signature@1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
@@ -4381,6 +4684,11 @@ cookie@0.5.0:
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b"
   integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==
 
+cookie@~0.4.1:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432"
+  integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==
+
 copy-anything@^2.0.1:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/copy-anything/-/copy-anything-2.0.6.tgz#092454ea9584a7b7ad5573062b2a87f5900fc480"
@@ -4400,18 +4708,33 @@ copy-webpack-plugin@11.0.0:
     schema-utils "^4.0.0"
     serialize-javascript "^6.0.0"
 
-core-js-compat@^3.30.2, core-js-compat@^3.31.0:
+core-js-compat@^3.31.0:
   version "3.31.1"
   resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.31.1.tgz#5084ad1a46858df50ff89ace152441a63ba7aae0"
   integrity sha512-wIDWd2s5/5aJSdpOJHfSibxNODxoGoWOBHt8JSPB41NOE94M7kuTPZCYLOlTtuoXTsBPKobpJ6T+y0SSy5L9SA==
   dependencies:
     browserslist "^4.21.9"
 
+core-js-compat@^3.33.1:
+  version "3.35.0"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.35.0.tgz#c149a3d1ab51e743bc1da61e39cb51f461a41873"
+  integrity sha512-5blwFAddknKeNgsjBzilkdQ0+YK8L1PfqPYq40NOYMYFSS38qj+hpTcLLWwpIwA2A5bje/x5jmVn2tzUMg9IVw==
+  dependencies:
+    browserslist "^4.22.2"
+
 core-util-is@~1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
   integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
 
+cors@~2.8.5:
+  version "2.8.5"
+  resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz#eac11da51592dd86b9f06f6e7ac293b3df875d29"
+  integrity sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==
+  dependencies:
+    object-assign "^4"
+    vary "^1"
+
 cosmiconfig-typescript-loader@4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-4.3.0.tgz#c4259ce474c9df0f32274ed162c0447c951ef073"
@@ -4449,14 +4772,14 @@ cosmiconfig@^7.0.0:
     path-type "^4.0.0"
     yaml "^1.10.0"
 
-cosmiconfig@^8.1.3:
-  version "8.2.0"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-8.2.0.tgz#f7d17c56a590856cd1e7cee98734dca272b0d8fd"
-  integrity sha512-3rTMnFJA1tCOPwRxtgF4wd7Ab2qvDbL8jX+3smjIbS4HlZBagTlpERbdN7iAbWlrfxE3M8c27kTwTawQ7st+OQ==
+cosmiconfig@^8.2.0:
+  version "8.3.6"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-8.3.6.tgz#060a2b871d66dba6c8538ea1118ba1ac16f5fae3"
+  integrity sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==
   dependencies:
-    import-fresh "^3.2.1"
+    import-fresh "^3.3.0"
     js-yaml "^4.1.0"
-    parse-json "^5.0.0"
+    parse-json "^5.2.0"
     path-type "^4.0.0"
 
 create-require@^1.1.0:
@@ -4464,10 +4787,10 @@ create-require@^1.1.0:
   resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
   integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
 
-critters@0.0.19:
-  version "0.0.19"
-  resolved "https://registry.yarnpkg.com/critters/-/critters-0.0.19.tgz#15e3a3a0ed77ae4b69c3b2fe29c8e7e87fc77d1b"
-  integrity sha512-Fm4ZAXsG0VzWy1U30rP4qxbaWGSsqXDgSupJW1OUJGDAs0KWC+j37v7p5a2kZ9BPJvhRzWm3be+Hc9WvQOBUOw==
+critters@0.0.20:
+  version "0.0.20"
+  resolved "https://registry.yarnpkg.com/critters/-/critters-0.0.20.tgz#08ddb961550ab7b3a59370537e4f01df208f7646"
+  integrity sha512-CImNRorKOl5d8TWcnAz5n5izQ6HFsvz29k327/ELy6UFcmbiZNOsinaKvzv16WZR0P6etfSWYzE47C4/56B3Uw==
   dependencies:
     chalk "^4.1.0"
     css-select "^5.1.0"
@@ -4592,20 +4915,27 @@ debounce@^1.2.0:
   resolved "https://registry.yarnpkg.com/debounce/-/debounce-1.2.1.tgz#38881d8f4166a5c5848020c11827b834bcb3e0a5"
   integrity sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==
 
-debug@2.6.9:
+debug@2.6.9, debug@^2.2.0:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
   dependencies:
     ms "2.0.0"
 
-debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.3, debug@^4.3.4:
+debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.4, debug@~4.3.1, debug@~4.3.2:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
   dependencies:
     ms "2.1.2"
 
+debug@4.3.2:
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b"
+  integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==
+  dependencies:
+    ms "2.1.2"
+
 debug@^3.2.6:
   version "3.2.7"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
@@ -4679,17 +5009,12 @@ delayed-stream@~1.0.0:
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
   integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
 
-delegates@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
-  integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==
-
 depd@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
   integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
 
-depd@^1.1.2, depd@~1.1.2:
+depd@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
   integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==
@@ -4709,6 +5034,11 @@ destroy@1.2.0:
   resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015"
   integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==
 
+destroy@~1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
+  integrity sha512-3NdhDuEXnfun/z7x9GOElY49LoqVHoGScmOKwmxhsS8N5Y+Z8KyPPDnaSzqWgYt/ji4mqwfTS34Htrk0zPIXVg==
+
 detect-indent@^6.0.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-6.1.0.tgz#592485ebbbf6b3b1ab2be175c8393d04ca0d57e6"
@@ -4719,6 +5049,11 @@ detect-node@^2.0.4:
   resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1"
   integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==
 
+dev-ip@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/dev-ip/-/dev-ip-1.0.1.tgz#a76a3ed1855be7a012bb8ac16cb80f3c00dc28f0"
+  integrity sha512-LmVkry/oDShEgSZPNgqCIp2/TlqtExeGmymru3uCELnfyjY11IzpAproLYs+1X88fXO6DBoYP3ul2Xo2yz2j6A==
+
 diff@^4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
@@ -4839,6 +5174,20 @@ eastasianwidth@^0.2.0:
   resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"
   integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==
 
+easy-extender@^2.3.4:
+  version "2.3.4"
+  resolved "https://registry.yarnpkg.com/easy-extender/-/easy-extender-2.3.4.tgz#298789b64f9aaba62169c77a2b3b64b4c9589b8f"
+  integrity sha512-8cAwm6md1YTiPpOvDULYJL4ZS6WfM5/cTeVVh4JsvyYZAoqlRVUpHL9Gr5Fy7HA6xcSZicUia3DeAgO3Us8E+Q==
+  dependencies:
+    lodash "^4.17.10"
+
+eazy-logger@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/eazy-logger/-/eazy-logger-4.0.1.tgz#2e9fe487fb14ed6ac20d5f01d90dff377d403041"
+  integrity sha512-2GSFtnnC6U4IEKhEI7+PvdxrmjJ04mdsj3wHZTFiw0tUtG4HCWzTr13ZYTk8XOGnA1xQMaDljoBOYlk3D/MMSw==
+  dependencies:
+    chalk "4.1.2"
+
 ecdsa-sig-formatter@1.0.11:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz#ae0f0fa2d85045ef14a817daa3ce9acd0489e5bf"
@@ -4868,6 +5217,11 @@ electron-to-chromium@^1.4.431:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.464.tgz#2f94bad78dff34e527aacbfc5d0b1a33cf046507"
   integrity sha512-guZ84yoou4+ILNdj0XEbmGs6DEWj6zpVOWYpY09GU66yEb0DSYvP/biBPzHn0GuW/3RC/pnaYNUWlQE1fJYtgA==
 
+electron-to-chromium@^1.4.601:
+  version "1.4.628"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.628.tgz#97cefa4b2356d981875f19639885e4fc50ce6e82"
+  integrity sha512-2k7t5PHvLsufpP6Zwk0nof62yLOsCf032wZx7/q0mv8gwlXjhcxI3lz6f0jBr0GrnWKcm3burXzI3t5IrcdUxw==
+
 emoji-regex@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
@@ -4883,7 +5237,7 @@ emojis-list@^3.0.0:
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
   integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==
 
-encodeurl@~1.0.2:
+encodeurl@~1.0.1, encodeurl@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
   integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==
@@ -4902,7 +5256,39 @@ end-of-stream@^1.4.1:
   dependencies:
     once "^1.4.0"
 
-enhanced-resolve@^5.14.1:
+engine.io-client@~6.5.2:
+  version "6.5.3"
+  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-6.5.3.tgz#4cf6fa24845029b238f83c628916d9149c399bc5"
+  integrity sha512-9Z0qLB0NIisTRt1DZ/8U2k12RJn8yls/nXMZLn+/N8hANT3TcYjKFKcwbw5zFQiN4NTde3TSY9zb79e1ij6j9Q==
+  dependencies:
+    "@socket.io/component-emitter" "~3.1.0"
+    debug "~4.3.1"
+    engine.io-parser "~5.2.1"
+    ws "~8.11.0"
+    xmlhttprequest-ssl "~2.0.0"
+
+engine.io-parser@~5.2.1:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.2.1.tgz#9f213c77512ff1a6cc0c7a86108a7ffceb16fcfb"
+  integrity sha512-9JktcM3u18nU9N2Lz3bWeBgxVgOKpw7yhRaoxQA3FUDZzzw+9WlA6p4G4u0RixNkg14fH7EfEc/RhpurtiROTQ==
+
+engine.io@~6.5.2:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-6.5.4.tgz#6822debf324e781add2254e912f8568508850cdc"
+  integrity sha512-KdVSDKhVKyOi+r5uEabrDLZw2qXStVvCsEB/LN3mw4WFi6Gx50jTyuxYVCwAAC0U46FdnzP/ScKRBTXb/NiEOg==
+  dependencies:
+    "@types/cookie" "^0.4.1"
+    "@types/cors" "^2.8.12"
+    "@types/node" ">=10.0.0"
+    accepts "~1.3.4"
+    base64id "2.0.0"
+    cookie "~0.4.1"
+    cors "~2.8.5"
+    debug "~4.3.1"
+    engine.io-parser "~5.2.1"
+    ws "~8.11.0"
+
+enhanced-resolve@^5.15.0:
   version "5.15.0"
   resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz#1af946c7d93603eb88e9896cee4904dc012e9c35"
   integrity sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==
@@ -4983,38 +5369,66 @@ es-module-lexer@^1.2.1:
   resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.3.0.tgz#6be9c9e0b4543a60cd166ff6f8b4e9dae0b0c16f"
   integrity sha512-vZK7T0N2CBmBOixhmjdqx2gWVbFZ4DXZ/NyRMZVlJXPa7CyFS+/a4QQsDGDQy9ZfEzxFuNEsMLeQJnKP2p5/JA==
 
-esbuild-wasm@0.17.19:
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/esbuild-wasm/-/esbuild-wasm-0.17.19.tgz#c528495c5363c34a4671fa55404e2b0ba85566ba"
-  integrity sha512-X9UQEMJMZXwlGCfqcBmJ1jEa+KrLfd+gCBypO/TSzo5hZvbVwFqpxj1YCuX54ptTF75wxmrgorR4RL40AKtLVg==
+esbuild-wasm@0.19.5:
+  version "0.19.5"
+  resolved "https://registry.yarnpkg.com/esbuild-wasm/-/esbuild-wasm-0.19.5.tgz#28f4563d7e3bcbe9462813e376b2fb6024931fd9"
+  integrity sha512-7zmLLn2QCj93XfMmHtzrDJ1UBuOHB2CZz1ghoCEZiRajxjUvHsF40PnbzFIY/pmesqPRaEtEWii0uzsTbnAgrA==
 
-esbuild@0.17.19, esbuild@^0.17.5:
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.17.19.tgz#087a727e98299f0462a3d0bcdd9cd7ff100bd955"
-  integrity sha512-XQ0jAPFkK/u3LcVRcvVHQcTIqD6E2H1fvZMA5dQPSOWb3suUbWbfbRf94pjc0bNzRYLfIrDRQXr7X+LHIm5oHw==
+esbuild@0.19.5:
+  version "0.19.5"
+  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.19.5.tgz#53a0e19dfbf61ba6c827d51a80813cf071239a8c"
+  integrity sha512-bUxalY7b1g8vNhQKdB24QDmHeY4V4tw/s6Ak5z+jJX9laP5MoQseTOMemAr0gxssjNcH0MCViG8ONI2kksvfFQ==
+  optionalDependencies:
+    "@esbuild/android-arm" "0.19.5"
+    "@esbuild/android-arm64" "0.19.5"
+    "@esbuild/android-x64" "0.19.5"
+    "@esbuild/darwin-arm64" "0.19.5"
+    "@esbuild/darwin-x64" "0.19.5"
+    "@esbuild/freebsd-arm64" "0.19.5"
+    "@esbuild/freebsd-x64" "0.19.5"
+    "@esbuild/linux-arm" "0.19.5"
+    "@esbuild/linux-arm64" "0.19.5"
+    "@esbuild/linux-ia32" "0.19.5"
+    "@esbuild/linux-loong64" "0.19.5"
+    "@esbuild/linux-mips64el" "0.19.5"
+    "@esbuild/linux-ppc64" "0.19.5"
+    "@esbuild/linux-riscv64" "0.19.5"
+    "@esbuild/linux-s390x" "0.19.5"
+    "@esbuild/linux-x64" "0.19.5"
+    "@esbuild/netbsd-x64" "0.19.5"
+    "@esbuild/openbsd-x64" "0.19.5"
+    "@esbuild/sunos-x64" "0.19.5"
+    "@esbuild/win32-arm64" "0.19.5"
+    "@esbuild/win32-ia32" "0.19.5"
+    "@esbuild/win32-x64" "0.19.5"
+
+esbuild@^0.18.10:
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.18.20.tgz#4709f5a34801b43b799ab7d6d82f7284a9b7a7a6"
+  integrity sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==
   optionalDependencies:
-    "@esbuild/android-arm" "0.17.19"
-    "@esbuild/android-arm64" "0.17.19"
-    "@esbuild/android-x64" "0.17.19"
-    "@esbuild/darwin-arm64" "0.17.19"
-    "@esbuild/darwin-x64" "0.17.19"
-    "@esbuild/freebsd-arm64" "0.17.19"
-    "@esbuild/freebsd-x64" "0.17.19"
-    "@esbuild/linux-arm" "0.17.19"
-    "@esbuild/linux-arm64" "0.17.19"
-    "@esbuild/linux-ia32" "0.17.19"
-    "@esbuild/linux-loong64" "0.17.19"
-    "@esbuild/linux-mips64el" "0.17.19"
-    "@esbuild/linux-ppc64" "0.17.19"
-    "@esbuild/linux-riscv64" "0.17.19"
-    "@esbuild/linux-s390x" "0.17.19"
-    "@esbuild/linux-x64" "0.17.19"
-    "@esbuild/netbsd-x64" "0.17.19"
-    "@esbuild/openbsd-x64" "0.17.19"
-    "@esbuild/sunos-x64" "0.17.19"
-    "@esbuild/win32-arm64" "0.17.19"
-    "@esbuild/win32-ia32" "0.17.19"
-    "@esbuild/win32-x64" "0.17.19"
+    "@esbuild/android-arm" "0.18.20"
+    "@esbuild/android-arm64" "0.18.20"
+    "@esbuild/android-x64" "0.18.20"
+    "@esbuild/darwin-arm64" "0.18.20"
+    "@esbuild/darwin-x64" "0.18.20"
+    "@esbuild/freebsd-arm64" "0.18.20"
+    "@esbuild/freebsd-x64" "0.18.20"
+    "@esbuild/linux-arm" "0.18.20"
+    "@esbuild/linux-arm64" "0.18.20"
+    "@esbuild/linux-ia32" "0.18.20"
+    "@esbuild/linux-loong64" "0.18.20"
+    "@esbuild/linux-mips64el" "0.18.20"
+    "@esbuild/linux-ppc64" "0.18.20"
+    "@esbuild/linux-riscv64" "0.18.20"
+    "@esbuild/linux-s390x" "0.18.20"
+    "@esbuild/linux-x64" "0.18.20"
+    "@esbuild/netbsd-x64" "0.18.20"
+    "@esbuild/openbsd-x64" "0.18.20"
+    "@esbuild/sunos-x64" "0.18.20"
+    "@esbuild/win32-arm64" "0.18.20"
+    "@esbuild/win32-ia32" "0.18.20"
+    "@esbuild/win32-x64" "0.18.20"
 
 escalade@^3.1.1:
   version "3.1.1"
@@ -5031,6 +5445,11 @@ escape-string-regexp@^1.0.5:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
 
+escape-string-regexp@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz#4683126b500b61762f2dbebace1806e8be31b1c8"
+  integrity sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==
+
 eslint-scope@5.1.1, eslint-scope@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
@@ -5071,7 +5490,7 @@ esutils@^2.0.2:
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
   integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
 
-etag@~1.8.1:
+etag@1.8.1, etag@^1.8.1, etag@~1.8.1:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
   integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==
@@ -5111,6 +5530,11 @@ execa@^5.0.0:
     signal-exit "^3.0.3"
     strip-final-newline "^2.0.0"
 
+exponential-backoff@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/exponential-backoff/-/exponential-backoff-3.1.1.tgz#64ac7526fe341ab18a39016cd22c787d01e00bf6"
+  integrity sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==
+
 express@^4.17.3:
   version "4.18.2"
   resolved "https://registry.yarnpkg.com/express/-/express-4.18.2.tgz#3fabe08296e930c796c19e3c516979386ba9fd59"
@@ -5148,7 +5572,7 @@ express@^4.17.3:
     utils-merge "1.0.1"
     vary "~1.1.2"
 
-external-editor@^3.0.3:
+external-editor@^3.0.3, external-editor@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495"
   integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==
@@ -5172,10 +5596,10 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
-fast-glob@3.2.12, fast-glob@^3.2.11, fast-glob@^3.2.9:
-  version "3.2.12"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80"
-  integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==
+fast-glob@3.2.7:
+  version "3.2.7"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1"
+  integrity sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==
   dependencies:
     "@nodelib/fs.stat" "^2.0.2"
     "@nodelib/fs.walk" "^1.2.3"
@@ -5183,10 +5607,21 @@ fast-glob@3.2.12, fast-glob@^3.2.11, fast-glob@^3.2.9:
     merge2 "^1.3.0"
     micromatch "^4.0.4"
 
-fast-glob@3.2.7:
-  version "3.2.7"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1"
-  integrity sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==
+fast-glob@3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.1.tgz#784b4e897340f3dbbef17413b3f11acf03c874c4"
+  integrity sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==
+  dependencies:
+    "@nodelib/fs.stat" "^2.0.2"
+    "@nodelib/fs.walk" "^1.2.3"
+    glob-parent "^5.1.2"
+    merge2 "^1.3.0"
+    micromatch "^4.0.4"
+
+fast-glob@^3.2.11, fast-glob@^3.2.9:
+  version "3.2.12"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80"
+  integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==
   dependencies:
     "@nodelib/fs.stat" "^2.0.2"
     "@nodelib/fs.walk" "^1.2.3"
@@ -5245,6 +5680,14 @@ figures@3.2.0, figures@^3.0.0:
   dependencies:
     escape-string-regexp "^1.0.5"
 
+figures@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-5.0.0.tgz#126cd055052dea699f8a54e8c9450e6ecfc44d5f"
+  integrity sha512-ej8ksPF4x6e5wvK9yevct0UCXh8TTFlWGVLlgjZuoBH1HwjIfKE/IdL5mq89sFA7zELi1VhKpmtDnrs7zWyeyg==
+  dependencies:
+    escape-string-regexp "^5.0.0"
+    is-unicode-supported "^1.2.0"
+
 filelist@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.4.tgz#f78978a1e944775ff9e62e744424f215e58352b5"
@@ -5259,6 +5702,19 @@ fill-range@^7.0.1:
   dependencies:
     to-regex-range "^5.0.1"
 
+finalhandler@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.0.tgz#ce0b6855b45853e791b2fcc680046d88253dd7f5"
+  integrity sha512-ejnvM9ZXYzp6PUPUyQBMBf0Co5VX2gr5H2VQe2Ui2jWXNlxv+PYZo8wpAymJNJdLsG1R4p+M4aynF8KuoUEwRw==
+  dependencies:
+    debug "2.6.9"
+    encodeurl "~1.0.1"
+    escape-html "~1.0.3"
+    on-finished "~2.3.0"
+    parseurl "~1.3.2"
+    statuses "~1.3.1"
+    unpipe "~1.0.0"
+
 finalhandler@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.2.0.tgz#7d23fe5731b207b4640e4fcd00aec1f9207a7b32"
@@ -5272,14 +5728,13 @@ finalhandler@1.2.0:
     statuses "2.0.1"
     unpipe "~1.0.0"
 
-find-cache-dir@^3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b"
-  integrity sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==
+find-cache-dir@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-4.0.0.tgz#a30ee0448f81a3990708f6453633c733e2f6eec2"
+  integrity sha512-9ZonPT4ZAK4a+1pUPVPZJapbi7O5qbbJPdYw/NOQWZZbVLdDTYM3A4R9z/DpAM08IDaFGsvPgiGZ82WEwUDWjg==
   dependencies:
-    commondir "^1.0.1"
-    make-dir "^3.0.2"
-    pkg-dir "^4.1.0"
+    common-path-prefix "^3.0.0"
+    pkg-dir "^7.0.0"
 
 find-replace@^3.0.0:
   version "3.0.0"
@@ -5288,7 +5743,7 @@ find-replace@^3.0.0:
   dependencies:
     array-back "^3.0.1"
 
-find-up@^4.0.0, find-up@^4.1.0:
+find-up@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
   integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
@@ -5296,12 +5751,20 @@ find-up@^4.0.0, find-up@^4.1.0:
     locate-path "^5.0.0"
     path-exists "^4.0.0"
 
+find-up@^6.3.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-6.3.0.tgz#2abab3d3280b2dc7ac10199ef324c4e002c8c790"
+  integrity sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==
+  dependencies:
+    locate-path "^7.1.0"
+    path-exists "^5.0.0"
+
 flat@^5.0.2:
   version "5.0.2"
   resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241"
   integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==
 
-follow-redirects@^1.0.0, follow-redirects@^1.15.0:
+follow-redirects@^1.0.0, follow-redirects@^1.14.0, follow-redirects@^1.15.0:
   version "1.15.4"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.4.tgz#cdc7d308bf6493126b17ea2191ea0ccf3e535adf"
   integrity sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==
@@ -5357,12 +5820,12 @@ forwarded@0.2.0:
   resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811"
   integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==
 
-fraction.js@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.2.0.tgz#448e5109a313a3527f5a3ab2119ec4cf0e0e2950"
-  integrity sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==
+fraction.js@^4.3.6:
+  version "4.3.7"
+  resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.3.7.tgz#06ca0085157e42fda7f9e726e79fefc4068840f7"
+  integrity sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==
 
-fresh@0.5.2:
+fresh@0.5.2, fresh@^0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
   integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==
@@ -5372,6 +5835,15 @@ fs-constants@^1.0.0:
   resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
   integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
 
+fs-extra@3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-3.0.1.tgz#3794f378c58b342ea7dbbb23095109c4b3b62291"
+  integrity sha512-V3Z3WZWVUYd8hoCL5xfXJCaHWYzmtwW5XWYSlLgERi8PWd8bx1kUHUk8L1BT57e49oKnDDD180mjfrHc1yA9rg==
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^3.0.0"
+    universalify "^0.1.0"
+
 fs-extra@^11.1.0:
   version "11.1.1"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.1.1.tgz#da69f7c39f3b002378b0954bb6ae7efdc0876e2d"
@@ -5381,7 +5853,7 @@ fs-extra@^11.1.0:
     jsonfile "^6.0.1"
     universalify "^2.0.0"
 
-fs-minipass@^2.0.0, fs-minipass@^2.1.0:
+fs-minipass@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
   integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==
@@ -5415,25 +5887,16 @@ function-bind@^1.1.1:
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
+function-bind@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
+  integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
+
 functions-have-names@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
   integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
 
-gauge@^4.0.3:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.4.tgz#52ff0652f2bbf607a989793d53b751bef2328dce"
-  integrity sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==
-  dependencies:
-    aproba "^1.0.3 || ^2.0.0"
-    color-support "^1.1.3"
-    console-control-strings "^1.1.0"
-    has-unicode "^2.0.1"
-    signal-exit "^3.0.7"
-    string-width "^4.2.3"
-    strip-ansi "^6.0.1"
-    wide-align "^1.1.5"
-
 gensync@^1.0.0-beta.2:
   version "1.0.0-beta.2"
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
@@ -5515,6 +5978,17 @@ glob@^10.2.2:
     minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
     path-scurry "^1.10.1"
 
+glob@^10.3.10:
+  version "10.3.10"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.10.tgz#0351ebb809fd187fe421ab96af83d3a70715df4b"
+  integrity sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==
+  dependencies:
+    foreground-child "^3.1.0"
+    jackspeak "^2.3.5"
+    minimatch "^9.0.1"
+    minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
+    path-scurry "^1.10.1"
+
 glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@~7.2.0:
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
@@ -5527,17 +6001,6 @@ glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@~7.2.0:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^8.0.1:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e"
-  integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^5.0.1"
-    once "^1.3.0"
-
 globals@^11.1.0:
   version "11.12.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
@@ -5677,11 +6140,6 @@ has-tostringtag@^1.0.0:
   dependencies:
     has-symbols "^1.0.2"
 
-has-unicode@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
-  integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==
-
 has@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
@@ -5689,6 +6147,13 @@ has@^1.0.3:
   dependencies:
     function-bind "^1.1.1"
 
+hasown@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.0.tgz#f4c513d454a57b7c7e1650778de226b11700546c"
+  integrity sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==
+  dependencies:
+    function-bind "^1.1.2"
+
 hdr-histogram-js@^2.0.1:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/hdr-histogram-js/-/hdr-histogram-js-2.0.3.tgz#0b860534655722b6e3f3e7dca7b78867cf43dcb5"
@@ -5718,12 +6183,12 @@ hoist-non-react-statics@^3.3.2:
   dependencies:
     react-is "^16.7.0"
 
-hosted-git-info@^6.0.0:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-6.1.1.tgz#629442c7889a69c05de604d52996b74fe6f26d58"
-  integrity sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==
+hosted-git-info@^7.0.0:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-7.0.1.tgz#9985fcb2700467fecf7f33a4d4874e30680b5322"
+  integrity sha512-+K84LB1DYwMHoHSgaOY/Jfhw3ucPmSET5v98Ke/HdNSw4a0UktWzyW1mjhjpuxxTqOOsfWT/7iVshHmVZ4IpOA==
   dependencies:
-    lru-cache "^7.5.1"
+    lru-cache "^10.0.1"
 
 hpack.js@^2.1.6:
   version "2.1.6"
@@ -5750,7 +6215,7 @@ htmlparser2@^8.0.2:
     domutils "^3.0.1"
     entities "^4.4.0"
 
-http-cache-semantics@^4.1.0, http-cache-semantics@^4.1.1:
+http-cache-semantics@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a"
   integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==
@@ -5795,7 +6260,15 @@ http-proxy-agent@^5.0.0:
     agent-base "6"
     debug "4"
 
-http-proxy-middleware@^2.0.3:
+http-proxy-agent@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-7.0.0.tgz#e9096c5afd071a3fce56e6252bb321583c124673"
+  integrity sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ==
+  dependencies:
+    agent-base "^7.1.0"
+    debug "^4.3.4"
+
+http-proxy-middleware@2.0.6, http-proxy-middleware@^2.0.3:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz#e1a4dd6979572c7ab5a4e4b55095d1f32a74963f"
   integrity sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==
@@ -5815,7 +6288,15 @@ http-proxy@^1.18.1:
     follow-redirects "^1.0.0"
     requires-port "^1.0.0"
 
-https-proxy-agent@5.0.1, https-proxy-agent@^5.0.0:
+https-proxy-agent@7.0.2, https-proxy-agent@^7.0.1:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.2.tgz#e2645b846b90e96c6e6f347fb5b2e41f1590b09b"
+  integrity sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA==
+  dependencies:
+    agent-base "^7.0.2"
+    debug "4"
+
+https-proxy-agent@^5.0.0:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6"
   integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==
@@ -5828,13 +6309,6 @@ human-signals@^2.1.0:
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
   integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
 
-humanize-ms@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed"
-  integrity sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==
-  dependencies:
-    ms "^2.0.0"
-
 iconv-lite@0.4.24, iconv-lite@^0.4.24:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
@@ -5859,12 +6333,12 @@ ieee754@^1.1.13:
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
   integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
 
-ignore-walk@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-6.0.0.tgz#1dd41c6eb4f661a49750a510a10c2cd934583fd8"
-  integrity sha512-bTf9UWe/UP1yxG3QUrj/KOvEhTAUWPcv+WvbFZ28LcqznXabp7Xu6o9y1JEC18+oqODuS7VhTpekV5XvFwsxJg==
+ignore-walk@^6.0.4:
+  version "6.0.4"
+  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-6.0.4.tgz#89950be94b4f522225eb63a13c56badb639190e9"
+  integrity sha512-t7sv42WkwFkyKbivUCglsQW5YWMskWtbEf4MNKX5u/CCWHKSPzN4FtBQGsQZgCLbxOzpVlcbWVK5KB3auIOjSw==
   dependencies:
-    minimatch "^5.0.1"
+    minimatch "^9.0.0"
 
 ignore@5.2.4, ignore@^5.0.4, ignore@^5.2.0:
   version "5.2.4"
@@ -5876,6 +6350,11 @@ image-size@~0.5.0:
   resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"
   integrity sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==
 
+immutable@^3:
+  version "3.8.2"
+  resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.8.2.tgz#c2439951455bb39913daf281376f1530e104adf3"
+  integrity sha512-15gZoQ38eYjEjxkorfbcgBKBL6R7T459OuK+CpcWt7O3KF4uPCx2tD0uFETlUDIyo+1789crbMhTvQBSR5yBMg==
+
 immutable@^4.0.0:
   version "4.2.2"
   resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.2.2.tgz#2da9ff4384a4330c36d4d1bc88e90f9e0b0ccd16"
@@ -5886,7 +6365,7 @@ immutable@~3.7.6:
   resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.7.6.tgz#13b4d3cb12befa15482a26fe1b2ebae640071e4b"
   integrity sha512-AizQPcaofEtO11RZhPPHBOJRdo/20MKQF9mBLnVkBoyHi1/zXK8fzVdnEpSV9gxqtnh6Qomfp3F0xT5qP/vThw==
 
-import-fresh@^3.1.0, import-fresh@^3.2.1:
+import-fresh@^3.1.0, import-fresh@^3.2.1, import-fresh@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
   integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
@@ -5909,11 +6388,6 @@ indent-string@^4.0.0:
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
   integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
 
-infer-owner@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"
-  integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==
-
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
@@ -5937,27 +6411,27 @@ ini@4.1.1:
   resolved "https://registry.yarnpkg.com/ini/-/ini-4.1.1.tgz#d95b3d843b1e906e56d6747d5447904ff50ce7a1"
   integrity sha512-QQnnxNyfvmHFIsj7gkPcYymR8Jdw/o7mp5ZFihxn6h8Ci6fh3Dx4E1gPjpQEpIuPo9XVNY/ZUwh4BPMjGyL01g==
 
-inquirer@8.2.4:
-  version "8.2.4"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-8.2.4.tgz#ddbfe86ca2f67649a67daa6f1051c128f684f0b4"
-  integrity sha512-nn4F01dxU8VeKfq192IjLsxu0/OmMZ4Lg3xKAns148rCaXP6ntAoEkVYZThWjwON8AlzdZZi6oqnhNbxUG9hVg==
-  dependencies:
-    ansi-escapes "^4.2.1"
-    chalk "^4.1.1"
-    cli-cursor "^3.1.0"
-    cli-width "^3.0.0"
-    external-editor "^3.0.3"
-    figures "^3.0.0"
-    lodash "^4.17.21"
-    mute-stream "0.0.8"
-    ora "^5.4.1"
-    run-async "^2.4.0"
-    rxjs "^7.5.5"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-    through "^2.3.6"
-    wrap-ansi "^7.0.0"
-
+inquirer@9.2.11:
+  version "9.2.11"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-9.2.11.tgz#e9003755c233a414fceda1891c23bd622cad4a95"
+  integrity sha512-B2LafrnnhbRzCWfAdOXisUzL89Kg8cVJlYmhqoi3flSiV/TveO+nsXwgKr9h9PIo+J1hz7nBSk6gegRIMBBf7g==
+  dependencies:
+    "@ljharb/through" "^2.3.9"
+    ansi-escapes "^4.3.2"
+    chalk "^5.3.0"
+    cli-cursor "^3.1.0"
+    cli-width "^4.1.0"
+    external-editor "^3.1.0"
+    figures "^5.0.0"
+    lodash "^4.17.21"
+    mute-stream "1.0.0"
+    ora "^5.4.1"
+    run-async "^3.0.0"
+    rxjs "^7.8.1"
+    string-width "^4.2.3"
+    strip-ansi "^6.0.1"
+    wrap-ansi "^6.2.0"
+
 inquirer@^8.0.0:
   version "8.2.5"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-8.2.5.tgz#d8654a7542c35a9b9e069d27e2df4858784d54f8"
@@ -6067,12 +6541,12 @@ is-callable@^1.1.3:
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
   integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
 
-is-core-module@^2.11.0:
-  version "2.12.1"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.12.1.tgz#0c0b6885b6f80011c71541ce15c8d66cf5a4f9fd"
-  integrity sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==
+is-core-module@^2.13.0:
+  version "2.13.1"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.1.tgz#ad0d7532c6fea9da1ebdc82742d74525c6273384"
+  integrity sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==
   dependencies:
-    has "^1.0.3"
+    hasown "^2.0.0"
 
 is-core-module@^2.8.1, is-core-module@^2.9.0:
   version "2.11.0"
@@ -6132,6 +6606,13 @@ is-map@^2.0.1, is-map@^2.0.2:
   resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.2.tgz#00922db8c9bf73e81b7a335827bc2a43f2b91127"
   integrity sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==
 
+is-number-like@^1.0.3:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/is-number-like/-/is-number-like-1.0.8.tgz#2e129620b50891042e44e9bbbb30593e75cfbbe3"
+  integrity sha512-6rZi3ezCyFcn5L71ywzz2bS5b2Igl1En3eTlZlvKjpz1n3IZLAYMbKYAIQgFmEu0GENg92ziU/faEOA/aixjbA==
+  dependencies:
+    lodash.isfinite "^3.3.2"
+
 is-number-object@^1.0.4:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.7.tgz#59d50ada4c45251784e9904f5246c742f07a42fc"
@@ -6221,6 +6702,11 @@ is-unicode-supported@^0.1.0:
   resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7"
   integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==
 
+is-unicode-supported@^1.2.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-1.3.0.tgz#d824984b616c292a2e198207d4a609983842f714"
+  integrity sha512-43r2mRvz+8JRIKnWJ+3j8JtjRKZ6GmjzfaE/qiBJnikNnYv/6bagRJ1kUhNk8R5EX/GkobD+r+sfxCPJsiKBLQ==
+
 is-upper-case@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/is-upper-case/-/is-upper-case-2.0.2.tgz#f1105ced1fe4de906a5f39553e7d3803fd804649"
@@ -6251,6 +6737,11 @@ is-windows@^1.0.1:
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
   integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
 
+is-wsl@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
+  integrity sha512-gfygJYZ2gLTDlmbWMI0CE2MwnFzSN/2SZfkMlItC4K/JBlsWVDB0bO6XhqcY13YXE7iMcAJnzTCJjPiTeJJ0Mw==
+
 is-wsl@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
@@ -6273,6 +6764,11 @@ isexe@^2.0.0:
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
   integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
 
+isexe@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/isexe/-/isexe-3.1.1.tgz#4a407e2bd78ddfb14bea0c27c6f7072dde775f0d"
+  integrity sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==
+
 isobject@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
@@ -6316,6 +6812,15 @@ jackspeak@^2.0.3:
   optionalDependencies:
     "@pkgjs/parseargs" "^0.11.0"
 
+jackspeak@^2.3.5:
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.3.6.tgz#647ecc472238aee4b06ac0e461acc21a8c505ca8"
+  integrity sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==
+  dependencies:
+    "@isaacs/cliui" "^8.0.2"
+  optionalDependencies:
+    "@pkgjs/parseargs" "^0.11.0"
+
 jake@^10.8.5:
   version "10.8.7"
   resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.7.tgz#63a32821177940c33f356e0ba44ff9d34e1c7d8f"
@@ -6405,7 +6910,7 @@ json-to-pretty-yaml@^1.2.2:
     remedial "^1.0.7"
     remove-trailing-spaces "^1.0.6"
 
-json5@^2.1.2, json5@^2.2.2:
+json5@^2.1.2, json5@^2.2.2, json5@^2.2.3:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
   integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
@@ -6415,6 +6920,13 @@ jsonc-parser@3.2.0:
   resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.2.0.tgz#31ff3f4c2b9793f89c67212627c51c6394f88e76"
   integrity sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==
 
+jsonfile@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-3.0.1.tgz#a5ecc6f65f53f662c4415c7675a0331d0992ec66"
+  integrity sha512-oBko6ZHlubVB5mRFkur5vgYR1UyqX+S6Y/oCfLhqNdcc2fYFlDpIoNc7AfKS1KOGcnNAkvsr0grLck9ANM815w==
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
 jsonfile@^6.0.1:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
@@ -6483,11 +6995,6 @@ klona@^2.0.4:
   resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.5.tgz#d166574d90076395d9963aa7a928fabb8d76afbc"
   integrity sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==
 
-klona@^2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.6.tgz#85bffbf819c03b2f53270412420a4555ef882e22"
-  integrity sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==
-
 launch-editor@^2.6.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/launch-editor/-/launch-editor-2.6.0.tgz#4c0c1a6ac126c572bd9ff9a30da1d2cae66defd7"
@@ -6503,10 +7010,10 @@ less-loader@11.1.0:
   dependencies:
     klona "^2.0.4"
 
-less@4.1.3:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/less/-/less-4.1.3.tgz#175be9ddcbf9b250173e0a00b4d6920a5b770246"
-  integrity sha512-w16Xk/Ta9Hhyei0Gpz9m7VS8F28nieJaL/VyShID7cYvP6IL5oHeL6p4TXSDJqZE/lNv0oJ2pGVjJsRkfwm5FA==
+less@4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/less/-/less-4.2.0.tgz#cbefbfaa14a4cd388e2099b2b51f956e1465c450"
+  integrity sha512-P3b3HJDBtSzsXUl0im2L7gTO5Ubg8mEN6G8qoTS77iXxXX4Hvu4Qj540PZDvQ8V6DmX6iXo98k7Md0Cm1PrLaA==
   dependencies:
     copy-anything "^2.0.1"
     parse-node-version "^1.0.1"
@@ -6527,6 +7034,11 @@ license-webpack-plugin@4.0.2:
   dependencies:
     webpack-sources "^3.0.0"
 
+limiter@^1.0.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/limiter/-/limiter-1.1.5.tgz#8f92a25b3b16c6131293a0cc834b4a838a2aa7c2"
+  integrity sha512-FWWMIEOxz3GwUI4Ts/IvgVy6LPvoMPgjMdQ185nN6psJyBJ4yOpzqm695/h5umdLJg2vW3GR5iG11MAkR2AzJA==
+
 lines-and-columns@^1.1.6:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
@@ -6570,6 +7082,16 @@ loader-utils@^2.0.0:
     emojis-list "^3.0.0"
     json5 "^2.1.2"
 
+localtunnel@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/localtunnel/-/localtunnel-2.0.2.tgz#528d50087151c4790f89c2db374fe7b0a48501f0"
+  integrity sha512-n418Cn5ynvJd7m/N1d9WVJISLJF/ellZnfsLnx8WBWGzxv/ntNcFkJ1o6se5quUhCplfLGBNL5tYHiq5WF3Nug==
+  dependencies:
+    axios "0.21.4"
+    debug "4.3.2"
+    openurl "1.1.1"
+    yargs "17.1.1"
+
 locate-path@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
@@ -6577,6 +7099,13 @@ locate-path@^5.0.0:
   dependencies:
     p-locate "^4.1.0"
 
+locate-path@^7.1.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-7.2.0.tgz#69cb1779bd90b35ab1e771e1f2f89a202c2a8a8a"
+  integrity sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==
+  dependencies:
+    p-locate "^6.0.0"
+
 lodash.camelcase@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
@@ -6587,6 +7116,11 @@ lodash.debounce@^4.0.8:
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
   integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==
 
+lodash.isfinite@^3.3.2:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/lodash.isfinite/-/lodash.isfinite-3.3.2.tgz#fb89b65a9a80281833f0b7478b3a5104f898ebb3"
+  integrity sha512-7FGG40uhC8Mm633uKW1r58aElFlBlxCrg9JfSi3P6aYiWmfiWF0PgMd86ZUsxE5GwWPdHoS2+48bwTh2VPkIQA==
+
 lodash.kebabcase@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz#8489b1cb0d29ff88195cceca448ff6d6cc295c36"
@@ -6597,7 +7131,7 @@ lodash.snakecase@^4.1.1:
   resolved "https://registry.yarnpkg.com/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz#39d714a35357147837aefd64b5dcbb16becd8f8d"
   integrity sha512-QZ1d4xoBHYUeuouhEq3lk3Uq7ldgyFXGBhg04+oRLnIz8o9T65Eh+8YdroUwn846zchkA9yDsDl5CVVaV2nqYw==
 
-lodash@^4.17.20, lodash@^4.17.21, lodash@~4.17.0:
+lodash@^4.17.10, lodash@^4.17.14, lodash@^4.17.20, lodash@^4.17.21, lodash@~4.17.0:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -6641,6 +7175,11 @@ lower-case@^2.0.2:
   dependencies:
     tslib "^2.0.3"
 
+lru-cache@^10.0.1:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.1.0.tgz#2098d41c2dc56500e6c88584aa656c84de7d0484"
+  integrity sha512-/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag==
+
 lru-cache@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
@@ -6655,22 +7194,17 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
-lru-cache@^7.4.4, lru-cache@^7.5.1, lru-cache@^7.7.1:
-  version "7.14.1"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.14.1.tgz#8da8d2f5f59827edb388e63e459ac23d6d408fea"
-  integrity sha512-ysxwsnTKdAx96aTRdhDOCQfDgbHnt8SK0KY8SEjO0wHinhWOFTESbjVCMPbU1uGXg/ch4lifqx0wfjOawU2+WA==
-
 "lru-cache@^9.1.1 || ^10.0.0":
   version "10.0.0"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.0.0.tgz#b9e2a6a72a129d81ab317202d93c7691df727e61"
   integrity sha512-svTf/fzsKHffP42sujkO/Rjs37BCIsQVRCeNYIm9WN8rgT7ffoUnRtZCqU+6BqcSBdv8gwJeTz8knJpgACeQMw==
 
-magic-string@0.30.0:
-  version "0.30.0"
-  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.0.tgz#fd58a4748c5c4547338a424e90fa5dd17f4de529"
-  integrity sha512-LA+31JYDJLs82r2ScLrlz1GjSgu66ZV518eyWT+S8VhyQn/JL0u9MeBOvQMGYiPk1DBiSN9DDMOcXvigJZaViQ==
+magic-string@0.30.5:
+  version "0.30.5"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.5.tgz#1994d980bd1c8835dc6e78db7cbd4ae4f24746f9"
+  integrity sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==
   dependencies:
-    "@jridgewell/sourcemap-codec" "^1.4.13"
+    "@jridgewell/sourcemap-codec" "^1.4.15"
 
 make-dir@^2.1.0:
   version "2.1.0"
@@ -6680,81 +7214,26 @@ make-dir@^2.1.0:
     pify "^4.0.1"
     semver "^5.6.0"
 
-make-dir@^3.0.2:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
-  integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
-  dependencies:
-    semver "^6.0.0"
-
 make-error@^1.1.1:
   version "1.3.6"
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
   integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
 
-make-fetch-happen@^10.0.3:
-  version "10.2.1"
-  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz#f5e3835c5e9817b617f2770870d9492d28678164"
-  integrity sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==
-  dependencies:
-    agentkeepalive "^4.2.1"
-    cacache "^16.1.0"
-    http-cache-semantics "^4.1.0"
-    http-proxy-agent "^5.0.0"
-    https-proxy-agent "^5.0.0"
-    is-lambda "^1.0.1"
-    lru-cache "^7.7.1"
-    minipass "^3.1.6"
-    minipass-collect "^1.0.2"
-    minipass-fetch "^2.0.3"
-    minipass-flush "^1.0.5"
-    minipass-pipeline "^1.2.4"
-    negotiator "^0.6.3"
-    promise-retry "^2.0.1"
-    socks-proxy-agent "^7.0.0"
-    ssri "^9.0.0"
-
-make-fetch-happen@^11.0.0:
-  version "11.0.2"
-  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-11.0.2.tgz#a880370fb2452d528a5ca40b2d6308999773ab17"
-  integrity sha512-5n/Pq41w/uZghpdlXAY5kIM85RgJThtTH/NYBRAZ9VUOBWV90USaQjwGrw76fZP3Lj5hl/VZjpVvOaRBMoL/2w==
-  dependencies:
-    agentkeepalive "^4.2.1"
-    cacache "^17.0.0"
-    http-cache-semantics "^4.1.0"
-    http-proxy-agent "^5.0.0"
-    https-proxy-agent "^5.0.0"
-    is-lambda "^1.0.1"
-    lru-cache "^7.7.1"
-    minipass "^4.0.0"
-    minipass-collect "^1.0.2"
-    minipass-fetch "^3.0.0"
-    minipass-flush "^1.0.5"
-    minipass-pipeline "^1.2.4"
-    negotiator "^0.6.3"
-    promise-retry "^2.0.1"
-    socks-proxy-agent "^7.0.0"
-    ssri "^10.0.0"
-
-make-fetch-happen@^11.0.1, make-fetch-happen@^11.1.1:
-  version "11.1.1"
-  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz#85ceb98079584a9523d4bf71d32996e7e208549f"
-  integrity sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w==
+make-fetch-happen@^13.0.0:
+  version "13.0.0"
+  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-13.0.0.tgz#705d6f6cbd7faecb8eac2432f551e49475bfedf0"
+  integrity sha512-7ThobcL8brtGo9CavByQrQi+23aIfgYU++wg4B87AIS8Rb2ZBt/MEaDqzA00Xwv/jUjAjYkLHjVolYuTLKda2A==
   dependencies:
-    agentkeepalive "^4.2.1"
-    cacache "^17.0.0"
+    "@npmcli/agent" "^2.0.0"
+    cacache "^18.0.0"
     http-cache-semantics "^4.1.1"
-    http-proxy-agent "^5.0.0"
-    https-proxy-agent "^5.0.0"
     is-lambda "^1.0.1"
-    lru-cache "^7.7.1"
-    minipass "^5.0.0"
+    minipass "^7.0.2"
     minipass-fetch "^3.0.0"
     minipass-flush "^1.0.5"
     minipass-pipeline "^1.2.4"
     negotiator "^0.6.3"
     promise-retry "^2.0.1"
-    socks-proxy-agent "^7.0.0"
     ssri "^10.0.0"
 
 map-cache@^0.2.0:
@@ -6839,6 +7318,11 @@ mime-types@^2.1.12, mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.17,
   dependencies:
     mime-db "1.52.0"
 
+mime@1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
+  integrity sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==
+
 mime@1.6.0, mime@^1.4.1:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
@@ -6875,7 +7359,7 @@ minimatch@4.2.1:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2:
+minimatch@^3.0.2, minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
   integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
@@ -6889,7 +7373,7 @@ minimatch@^5.0.1:
   dependencies:
     brace-expansion "^2.0.1"
 
-minimatch@^9.0.0, minimatch@^9.0.1:
+minimatch@^9.0.0, minimatch@^9.0.1, minimatch@^9.0.3:
   version "9.0.3"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825"
   integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==
@@ -6906,23 +7390,12 @@ minimist@^1.2.6:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18"
   integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==
 
-minipass-collect@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617"
-  integrity sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==
-  dependencies:
-    minipass "^3.0.0"
-
-minipass-fetch@^2.0.3:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-2.1.2.tgz#95560b50c472d81a3bc76f20ede80eaed76d8add"
-  integrity sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA==
+minipass-collect@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-2.0.1.tgz#1621bc77e12258a12c60d34e2276ec5c20680863"
+  integrity sha512-D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw==
   dependencies:
-    minipass "^3.1.6"
-    minipass-sized "^1.0.3"
-    minizlib "^2.1.2"
-  optionalDependencies:
-    encoding "^0.1.13"
+    minipass "^7.0.3"
 
 minipass-fetch@^3.0.0:
   version "3.0.1"
@@ -6964,7 +7437,7 @@ minipass-sized@^1.0.3:
   dependencies:
     minipass "^3.0.0"
 
-minipass@^3.0.0, minipass@^3.1.1, minipass@^3.1.6:
+minipass@^3.0.0:
   version "3.3.6"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.6.tgz#7bba384db3a1520d18c9c0e5251c3444e95dd94a"
   integrity sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==
@@ -6978,16 +7451,16 @@ minipass@^4.0.0:
   dependencies:
     yallist "^4.0.0"
 
-minipass@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d"
-  integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==
-
 "minipass@^5.0.0 || ^6.0.2 || ^7.0.0":
   version "7.0.2"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.2.tgz#58a82b7d81c7010da5bd4b2c0c85ac4b4ec5131e"
   integrity sha512-eL79dXrE1q9dBbDCLg7xfn/vl7MS4F1gvJAgjJrQli/jbQWdUttuVawphqpffoIYfRdq78LHx6GP4bU/EQ2ATA==
 
+minipass@^7.0.2, minipass@^7.0.3:
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.4.tgz#dbce03740f50a4786ba994c1fb908844d27b038c"
+  integrity sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==
+
 minizlib@^2.1.1, minizlib@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
@@ -6996,6 +7469,11 @@ minizlib@^2.1.1, minizlib@^2.1.2:
     minipass "^3.0.0"
     yallist "^4.0.0"
 
+mitt@^1.1.3:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/mitt/-/mitt-1.2.0.tgz#cb24e6569c806e31bd4e3995787fe38a04fdf90d"
+  integrity sha512-r6lj77KlwqLhIUku9UWYes7KJtsczvolZkzp8hbaDPPaE24OmWl5s539Mytlj22siEQKosZ26qCBgda2PKwoJw==
+
 mkdirp@^0.5.3:
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
@@ -7003,7 +7481,7 @@ mkdirp@^0.5.3:
   dependencies:
     minimist "^1.2.6"
 
-mkdirp@^1.0.3, mkdirp@^1.0.4:
+mkdirp@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
@@ -7023,7 +7501,7 @@ ms@2.1.2:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-ms@2.1.3, ms@^2.0.0, ms@^2.1.1:
+ms@2.1.3, ms@^2.1.1:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
@@ -7046,6 +7524,11 @@ mute-stream@0.0.8:
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
   integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
 
+mute-stream@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-1.0.0.tgz#e31bd9fe62f0aed23520aa4324ea6671531e013e"
+  integrity sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA==
+
 nanoid@^3.3.4:
   version "3.3.4"
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab"
@@ -7056,6 +7539,11 @@ nanoid@^3.3.6:
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c"
   integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==
 
+nanoid@^3.3.7:
+  version "3.3.7"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8"
+  integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==
+
 needle@^3.1.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/needle/-/needle-3.2.0.tgz#07d240ebcabfd65c76c03afae7f6defe6469df44"
@@ -7149,21 +7637,21 @@ node-gyp-build@^4.2.2, node-gyp-build@^4.3.0:
   resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.6.0.tgz#0c52e4cbf54bbd28b709820ef7b6a3c2d6209055"
   integrity sha512-NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ==
 
-node-gyp@^9.0.0:
-  version "9.3.1"
-  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.3.1.tgz#1e19f5f290afcc9c46973d68700cbd21a96192e4"
-  integrity sha512-4Q16ZCqq3g8awk6UplT7AuxQ35XN4R/yf/+wSAwcBUAjg7l58RTactWaP8fIDTi0FzI7YcVLujwExakZlfWkXg==
+node-gyp@^10.0.0:
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-10.0.1.tgz#205514fc19e5830fa991e4a689f9e81af377a966"
+  integrity sha512-gg3/bHehQfZivQVfqIyy8wTdSymF9yTyP4CJifK73imyNMU8AIGQE2pUa7dNWfmMeG9cDVF2eehiRMv0LC1iAg==
   dependencies:
     env-paths "^2.2.0"
-    glob "^7.1.4"
+    exponential-backoff "^3.1.1"
+    glob "^10.3.10"
     graceful-fs "^4.2.6"
-    make-fetch-happen "^10.0.3"
-    nopt "^6.0.0"
-    npmlog "^6.0.0"
-    rimraf "^3.0.2"
+    make-fetch-happen "^13.0.0"
+    nopt "^7.0.0"
+    proc-log "^3.0.0"
     semver "^7.3.5"
     tar "^6.1.2"
-    which "^2.0.2"
+    which "^4.0.0"
 
 node-int64@^0.4.0:
   version "0.4.0"
@@ -7175,24 +7663,29 @@ node-releases@^2.0.12:
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.13.tgz#d5ed1627c23e3461e819b02e57b75e4899b1c81d"
   integrity sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==
 
+node-releases@^2.0.14:
+  version "2.0.14"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.14.tgz#2ffb053bceb8b2be8495ece1ab6ce600c4461b0b"
+  integrity sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==
+
 node-releases@^2.0.6:
   version "2.0.8"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.8.tgz#0f349cdc8fcfa39a92ac0be9bc48b7706292b9ae"
   integrity sha512-dFSmB8fFHEH/s81Xi+Y/15DQY6VHW81nXRj86EMSL3lmuTmK1e+aT4wrFCkTbm+gSwkw4KpX+rT/pMM2c1mF+A==
 
-nopt@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-6.0.0.tgz#245801d8ebf409c6df22ab9d95b65e1309cdb16d"
-  integrity sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==
+nopt@^7.0.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-7.2.0.tgz#067378c68116f602f552876194fd11f1292503d7"
+  integrity sha512-CVDtwCdhYIvnAzFoJ6NJ6dX3oga9/HyciQDnG1vQDjSLMeKLJ4A93ZqYKDrgYSr1FBY5/hMYC+2VCi24pgpkGA==
   dependencies:
-    abbrev "^1.0.0"
+    abbrev "^2.0.0"
 
-normalize-package-data@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-5.0.0.tgz#abcb8d7e724c40d88462b84982f7cbf6859b4588"
-  integrity sha512-h9iPVIfrVZ9wVYQnxFgtw1ugSvGEMOlyPWWtm8BMJhnwyEL/FLbYbTY3V3PpjI/BUK67n9PEWDu6eHzu1fB15Q==
+normalize-package-data@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-6.0.0.tgz#68a96b3c11edd462af7189c837b6b1064a484196"
+  integrity sha512-UL7ELRVxYBHBgYEtZCXjxuD5vPxnmvMGq0jp/dGPKKrN7tfsBh2IY7TlJ15WWwdjRWD3RJbnsygUurTK3xkPkg==
   dependencies:
-    hosted-git-info "^6.0.0"
+    hosted-git-info "^7.0.0"
     is-core-module "^2.8.1"
     semver "^7.3.5"
     validate-npm-package-license "^3.0.4"
@@ -7233,44 +7726,44 @@ npm-normalize-package-bin@^3.0.0:
   resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.0.tgz#6097436adb4ef09e2628b59a7882576fe53ce485"
   integrity sha512-g+DPQSkusnk7HYXr75NtzkIP4+N81i3RPsGFidF3DzHd9MT9wWngmqoeg/fnHFz5MNdtG4w03s+QnhewSLTT2Q==
 
-npm-package-arg@10.1.0, npm-package-arg@^10.0.0:
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-10.1.0.tgz#827d1260a683806685d17193073cc152d3c7e9b1"
-  integrity sha512-uFyyCEmgBfZTtrKk/5xDfHp6+MdrqGotX/VoOyEEl3mBwiEE5FlBaePanazJSVMPT7vKepcjYBY2ztg9A3yPIA==
+npm-package-arg@11.0.1, npm-package-arg@^11.0.0:
+  version "11.0.1"
+  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-11.0.1.tgz#f208b0022c29240a1c532a449bdde3f0a4708ebc"
+  integrity sha512-M7s1BD4NxdAvBKUPqqRW957Xwcl/4Zvo8Aj+ANrzvIPzGJZElrH7Z//rSaec2ORcND6FHHLnZeY8qgTpXDMFQQ==
   dependencies:
-    hosted-git-info "^6.0.0"
+    hosted-git-info "^7.0.0"
     proc-log "^3.0.0"
     semver "^7.3.5"
     validate-npm-package-name "^5.0.0"
 
-npm-packlist@^7.0.0:
-  version "7.0.4"
-  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-7.0.4.tgz#033bf74110eb74daf2910dc75144411999c5ff32"
-  integrity sha512-d6RGEuRrNS5/N84iglPivjaJPxhDbZmlbTwTDX2IbcRHG5bZCdtysYMhwiPvcF4GisXHGn7xsxv+GQ7T/02M5Q==
+npm-packlist@^8.0.0:
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-8.0.2.tgz#5b8d1d906d96d21c85ebbeed2cf54147477c8478"
+  integrity sha512-shYrPFIS/JLP4oQmAwDyk5HcyysKW8/JLTEA32S0Z5TzvpaeeX2yMFfoK1fjEBnCBvVyIB/Jj/GBFdm0wsgzbA==
   dependencies:
-    ignore-walk "^6.0.0"
+    ignore-walk "^6.0.4"
 
-npm-pick-manifest@8.0.1, npm-pick-manifest@^8.0.0:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-8.0.1.tgz#c6acd97d1ad4c5dbb80eac7b386b03ffeb289e5f"
-  integrity sha512-mRtvlBjTsJvfCCdmPtiu2bdlx8d/KXtF7yNXNWe7G0Z36qWA9Ny5zXsI2PfBZEv7SXgoxTmNaTzGSbbzDZChoA==
+npm-pick-manifest@9.0.0, npm-pick-manifest@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-9.0.0.tgz#f87a4c134504a2c7931f2bb8733126e3c3bb7e8f"
+  integrity sha512-VfvRSs/b6n9ol4Qb+bDwNGUXutpy76x6MARw/XssevE0TnctIKcmklJZM5Z7nqs5z5aW+0S63pgCNbpkUNNXBg==
   dependencies:
     npm-install-checks "^6.0.0"
     npm-normalize-package-bin "^3.0.0"
-    npm-package-arg "^10.0.0"
+    npm-package-arg "^11.0.0"
     semver "^7.3.5"
 
-npm-registry-fetch@^14.0.0:
-  version "14.0.3"
-  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-14.0.3.tgz#8545e321c2b36d2c6fe6e009e77e9f0e527f547b"
-  integrity sha512-YaeRbVNpnWvsGOjX2wk5s85XJ7l1qQBGAp724h8e2CZFFhMSuw9enom7K1mWVUtvXO1uUSFIAPofQK0pPN0ZcA==
+npm-registry-fetch@^16.0.0:
+  version "16.1.0"
+  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-16.1.0.tgz#10227b7b36c97bc1cf2902a24e4f710cfe62803c"
+  integrity sha512-PQCELXKt8Azvxnt5Y85GseQDJJlglTFM9L9U9gkv2y4e9s0k3GVDdOx3YoB6gm2Do0hlkzC39iCGXby+Wve1Bw==
   dependencies:
-    make-fetch-happen "^11.0.0"
-    minipass "^4.0.0"
+    make-fetch-happen "^13.0.0"
+    minipass "^7.0.2"
     minipass-fetch "^3.0.0"
     minipass-json-stream "^1.0.1"
     minizlib "^2.1.2"
-    npm-package-arg "^10.0.0"
+    npm-package-arg "^11.0.0"
     proc-log "^3.0.0"
 
 npm-run-path@^4.0.1:
@@ -7280,16 +7773,6 @@ npm-run-path@^4.0.1:
   dependencies:
     path-key "^3.0.0"
 
-npmlog@^6.0.0:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.2.tgz#c8166017a42f2dea92d6453168dd865186a70830"
-  integrity sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==
-  dependencies:
-    are-we-there-yet "^3.0.0"
-    console-control-strings "^1.1.0"
-    gauge "^4.0.3"
-    set-blocking "^2.0.0"
-
 nth-check@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.1.1.tgz#c9eab428effce36cd6b92c924bdb000ef1f1ed1d"
@@ -7353,7 +7836,7 @@ nx@16.5.1:
     "@nx/nx-win32-arm64-msvc" "16.5.1"
     "@nx/nx-win32-x64-msvc" "16.5.1"
 
-object-assign@^4.1.0, object-assign@^4.1.1:
+object-assign@^4, object-assign@^4.1.0, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
@@ -7398,6 +7881,13 @@ on-finished@2.4.1:
   dependencies:
     ee-first "1.1.1"
 
+on-finished@~2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
+  integrity sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==
+  dependencies:
+    ee-first "1.1.1"
+
 on-headers@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f"
@@ -7440,6 +7930,18 @@ opener@^1.5.2:
   resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598"
   integrity sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==
 
+openurl@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/openurl/-/openurl-1.1.1.tgz#3875b4b0ef7a52c156f0db41d4609dbb0f94b387"
+  integrity sha512-d/gTkTb1i1GKz5k3XE3XFV/PxQ1k45zDqGP2OA7YhgsaLoqm6qRvARAZOFer1fcXritWlGBRCu/UgeS4HAnXAA==
+
+opn@5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/opn/-/opn-5.3.0.tgz#64871565c863875f052cfdf53d3e3cb5adb53b1c"
+  integrity sha512-bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g==
+  dependencies:
+    is-wsl "^1.1.0"
+
 optimism@^0.16.2:
   version "0.16.2"
   resolved "https://registry.yarnpkg.com/optimism/-/optimism-0.16.2.tgz#519b0c78b3b30954baed0defe5143de7776bf081"
@@ -7482,6 +7984,13 @@ p-limit@^2.2.0:
   dependencies:
     p-try "^2.0.0"
 
+p-limit@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-4.0.0.tgz#914af6544ed32bfa54670b061cafcbd04984b644"
+  integrity sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==
+  dependencies:
+    yocto-queue "^1.0.0"
+
 p-locate@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
@@ -7489,6 +7998,13 @@ p-locate@^4.1.0:
   dependencies:
     p-limit "^2.2.0"
 
+p-locate@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-6.0.0.tgz#3da9a49d4934b901089dca3302fa65dc5a05c04f"
+  integrity sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==
+  dependencies:
+    p-limit "^4.0.0"
+
 p-map@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"
@@ -7509,27 +8025,27 @@ p-try@^2.0.0:
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
   integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
-pacote@15.2.0:
-  version "15.2.0"
-  resolved "https://registry.yarnpkg.com/pacote/-/pacote-15.2.0.tgz#0f0dfcc3e60c7b39121b2ac612bf8596e95344d3"
-  integrity sha512-rJVZeIwHTUta23sIZgEIM62WYwbmGbThdbnkt81ravBplQv+HjyroqnLRNH2+sLJHcGZmLRmhPwACqhfTcOmnA==
+pacote@17.0.4:
+  version "17.0.4"
+  resolved "https://registry.yarnpkg.com/pacote/-/pacote-17.0.4.tgz#4bac6c0745967bde96985ec12fbbfc8dea7140e8"
+  integrity sha512-eGdLHrV/g5b5MtD5cTPyss+JxOlaOloSMG3UwPMAvL8ywaLJ6beONPF40K4KKl/UI6q5hTKCJq5rCu8tkF+7Dg==
   dependencies:
-    "@npmcli/git" "^4.0.0"
+    "@npmcli/git" "^5.0.0"
     "@npmcli/installed-package-contents" "^2.0.1"
-    "@npmcli/promise-spawn" "^6.0.1"
-    "@npmcli/run-script" "^6.0.0"
-    cacache "^17.0.0"
+    "@npmcli/promise-spawn" "^7.0.0"
+    "@npmcli/run-script" "^7.0.0"
+    cacache "^18.0.0"
     fs-minipass "^3.0.0"
-    minipass "^5.0.0"
-    npm-package-arg "^10.0.0"
-    npm-packlist "^7.0.0"
-    npm-pick-manifest "^8.0.0"
-    npm-registry-fetch "^14.0.0"
+    minipass "^7.0.2"
+    npm-package-arg "^11.0.0"
+    npm-packlist "^8.0.0"
+    npm-pick-manifest "^9.0.0"
+    npm-registry-fetch "^16.0.0"
     proc-log "^3.0.0"
     promise-retry "^2.0.1"
-    read-package-json "^6.0.0"
+    read-package-json "^7.0.0"
     read-package-json-fast "^3.0.0"
-    sigstore "^1.3.0"
+    sigstore "^2.0.0"
     ssri "^10.0.0"
     tar "^6.1.11"
 
@@ -7562,7 +8078,7 @@ parse-filepath@^1.0.2:
     map-cache "^0.2.0"
     path-root "^0.1.1"
 
-parse-json@^5.0.0:
+parse-json@^5.0.0, parse-json@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
   integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==
@@ -7626,6 +8142,11 @@ path-exists@^4.0.0:
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
   integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
 
+path-exists@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-5.0.0.tgz#a6aad9489200b21fab31e49cf09277e5116fb9e7"
+  integrity sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==
+
 path-is-absolute@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
@@ -7676,7 +8197,12 @@ picocolors@^1.0.0:
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
   integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
 
-picomatch@2.3.1, picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1:
+picomatch@3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-3.0.1.tgz#817033161def55ec9638567a2f3bbc876b3e7516"
+  integrity sha512-I3EurrIQMlRc9IaAZnqRR044Phh2DXY+55o7uJ0V+hYZAcQYSuFWsc9q5PvyDHUSCe1Qxn/iBz+78s86zWnGag==
+
+picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
@@ -7686,10 +8212,10 @@ pify@^4.0.1:
   resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
   integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
 
-piscina@3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/piscina/-/piscina-3.2.0.tgz#f5a1dde0c05567775690cccefe59d9223924d154"
-  integrity sha512-yn/jMdHRw+q2ZJhFhyqsmANcbF6V2QwmD84c6xRau+QpQOmtrBCoRGdvTfeuFDYXB5W2m6MfLkjkvQa9lUSmIA==
+piscina@4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/piscina/-/piscina-4.1.0.tgz#809578ee3ab2ecf4cf71c2a062100b4b95a85b96"
+  integrity sha512-sjbLMi3sokkie+qmtZpkfMCUJTpbxJm/wvaPzU28vmYSsTSW8xk9JcFUsbqGJdtPpIQ9tuj+iDcTtgZjwnOSig==
   dependencies:
     eventemitter-asyncresource "^1.0.0"
     hdr-histogram-js "^2.0.1"
@@ -7697,21 +8223,28 @@ piscina@3.2.0:
   optionalDependencies:
     nice-napi "^1.0.2"
 
-pkg-dir@^4.1.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
-  integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==
+pkg-dir@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-7.0.0.tgz#8f0c08d6df4476756c5ff29b3282d0bab7517d11"
+  integrity sha512-Ie9z/WINcxxLp27BKOCHGde4ITq9UklYKDzVo1nhk5sqGEXU3FpkwP5GM2voTGJkGd9B3Otl+Q4uwSOeSUtOBA==
+  dependencies:
+    find-up "^6.3.0"
+
+portscanner@2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/portscanner/-/portscanner-2.2.0.tgz#6059189b3efa0965c9d96a56b958eb9508411cf1"
+  integrity sha512-IFroCz/59Lqa2uBvzK3bKDbDDIEaAY8XJ1jFxcLWTqosrsc32//P4VuSB2vZXoHiHqOmx8B5L5hnKOxL/7FlPw==
   dependencies:
-    find-up "^4.0.0"
+    async "^2.6.0"
+    is-number-like "^1.0.3"
 
-postcss-loader@7.3.2:
-  version "7.3.2"
-  resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-7.3.2.tgz#ac3344ad1f14bb65df135744b7efae4dbdad4301"
-  integrity sha512-c7qDlXErX6n0VT+LUsW+nwefVtTu3ORtVvK8EXuUIDcxo+b/euYqpuHlJAvePb0Af5e8uMjR/13e0lTuYifaig==
+postcss-loader@7.3.3:
+  version "7.3.3"
+  resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-7.3.3.tgz#6da03e71a918ef49df1bb4be4c80401df8e249dd"
+  integrity sha512-YgO/yhtevGO/vJePCQmTxiaEwER94LABZN0ZMT4A0vsak9TpO+RvKRs7EmJ8peIlB9xfXCsS7M8LjqncsUZ5HA==
   dependencies:
-    cosmiconfig "^8.1.3"
+    cosmiconfig "^8.2.0"
     jiti "^1.18.2"
-    klona "^2.0.6"
     semver "^7.3.8"
 
 postcss-modules-extract-imports@^3.0.0:
@@ -7755,10 +8288,10 @@ postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0:
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
   integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
 
-postcss@8.4.24:
-  version "8.4.24"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.24.tgz#f714dba9b2284be3cc07dbd2fc57ee4dc972d2df"
-  integrity sha512-M0RzbcI0sO/XJNucsGjvWU9ERWxb/ytp1w6dKtxTKgixdtQDq4rmx/g8W1hnaheq9jgwL/oyEdH5Bc4WwJKMqg==
+postcss@8.4.31:
+  version "8.4.31"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.31.tgz#92b451050a9f914da6755af352bdc0192508656d"
+  integrity sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==
   dependencies:
     nanoid "^3.3.6"
     picocolors "^1.0.0"
@@ -7782,6 +8315,15 @@ postcss@^8.4.21, postcss@^8.4.23:
     picocolors "^1.0.0"
     source-map-js "^1.0.2"
 
+postcss@^8.4.27:
+  version "8.4.33"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.33.tgz#1378e859c9f69bf6f638b990a0212f43e2aaa742"
+  integrity sha512-Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg==
+  dependencies:
+    nanoid "^3.3.7"
+    picocolors "^1.0.0"
+    source-map-js "^1.0.2"
+
 prettier@^1.19.1:
   version "1.19.1"
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb"
@@ -7898,7 +8440,7 @@ randombytes@^2.1.0:
   dependencies:
     safe-buffer "^5.1.0"
 
-range-parser@^1.2.1, range-parser@~1.2.1:
+range-parser@^1.2.1, range-parser@~1.2.0, range-parser@~1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
   integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
@@ -7913,6 +8455,16 @@ raw-body@2.5.1:
     iconv-lite "0.4.24"
     unpipe "1.0.0"
 
+raw-body@^2.3.2:
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.2.tgz#99febd83b90e08975087e8f1f9419a149366b68a"
+  integrity sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==
+  dependencies:
+    bytes "3.1.2"
+    http-errors "2.0.0"
+    iconv-lite "0.4.24"
+    unpipe "1.0.0"
+
 react-is@^16.13.1, react-is@^16.7.0:
   version "16.13.1"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
@@ -7926,14 +8478,14 @@ read-package-json-fast@^3.0.0:
     json-parse-even-better-errors "^3.0.0"
     npm-normalize-package-bin "^3.0.0"
 
-read-package-json@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-6.0.0.tgz#6a741841ad72a40e77a82b9c3c8c10e865bbc519"
-  integrity sha512-b/9jxWJ8EwogJPpv99ma+QwtqB7FSl3+V6UXS7Aaay8/5VwMY50oIFooY1UKXMWpfNCM6T/PoGqa5GD1g9xf9w==
+read-package-json@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-7.0.0.tgz#d605c9dcf6bc5856da24204aa4e9518ee9714be0"
+  integrity sha512-uL4Z10OKV4p6vbdvIXB+OzhInYtIozl/VxUBPgNkBuUi2DeRonnuspmaVAMcrkmfjKGNmRndyQAbE7/AmzGwFg==
   dependencies:
-    glob "^8.0.1"
+    glob "^10.2.2"
     json-parse-even-better-errors "^3.0.0"
-    normalize-package-data "^5.0.0"
+    normalize-package-data "^6.0.0"
     npm-normalize-package-bin "^3.0.0"
 
 readable-stream@^2.0.1:
@@ -7949,7 +8501,7 @@ readable-stream@^2.0.1:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-readable-stream@^3.0.6, readable-stream@^3.4.0, readable-stream@^3.6.0:
+readable-stream@^3.0.6, readable-stream@^3.4.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
   integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
@@ -8001,10 +8553,15 @@ regenerator-runtime@^0.13.11:
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9"
   integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==
 
-regenerator-transform@^0.15.1:
-  version "0.15.1"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.1.tgz#f6c4e99fc1b4591f780db2586328e4d9a9d8dc56"
-  integrity sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg==
+regenerator-runtime@^0.14.0:
+  version "0.14.1"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz#356ade10263f685dda125100cd862c1db895327f"
+  integrity sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==
+
+regenerator-transform@^0.15.2:
+  version "0.15.2"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.2.tgz#5bbae58b522098ebdf09bca2f83838929001c7a4"
+  integrity sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==
   dependencies:
     "@babel/runtime" "^7.8.4"
 
@@ -8123,12 +8680,12 @@ resolve-url-loader@5.0.0:
     postcss "^8.2.14"
     source-map "0.6.1"
 
-resolve@1.22.2:
-  version "1.22.2"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.2.tgz#0ed0943d4e301867955766c9f3e1ae6d01c6845f"
-  integrity sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==
+resolve@1.22.8:
+  version "1.22.8"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d"
+  integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==
   dependencies:
-    is-core-module "^2.11.0"
+    is-core-module "^2.13.0"
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
@@ -8141,6 +8698,14 @@ resolve@^1.14.2, resolve@^1.3.2:
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
+resp-modifier@6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/resp-modifier/-/resp-modifier-6.0.2.tgz#b124de5c4fbafcba541f48ffa73970f4aa456b4f"
+  integrity sha512-U1+0kWC/+4ncRFYqQWTx/3qkfE6a4B/h3XXgmXypfa0SPZ3t7cbbaFk297PjQS/yov24R18h6OZe6iZwj3NSLw==
+  dependencies:
+    debug "^2.2.0"
+    minimatch "^3.0.2"
+
 response-iterator@^0.2.6:
   version "0.2.6"
   resolved "https://registry.yarnpkg.com/response-iterator/-/response-iterator-0.2.6.tgz#249005fb14d2e4eeb478a3f735a28fd8b4c9f3da"
@@ -8181,10 +8746,10 @@ rimraf@^3.0.0, rimraf@^3.0.2:
   dependencies:
     glob "^7.1.3"
 
-rollup@^3.21.0:
-  version "3.26.3"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.26.3.tgz#bbc8818cadd0aebca348dbb3d68d296d220967b8"
-  integrity sha512-7Tin0C8l86TkpcMtXvQu6saWH93nhG3dGQ1/+l5V2TDMceTxO7kDiK6GzbfLWNNxqJXm591PcEZUozZm51ogwQ==
+rollup@^3.27.1:
+  version "3.29.4"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.29.4.tgz#4d70c0f9834146df8705bfb69a9a19c9e1109981"
+  integrity sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==
   optionalDependencies:
     fsevents "~2.3.2"
 
@@ -8193,6 +8758,11 @@ run-async@^2.4.0:
   resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
   integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==
 
+run-async@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/run-async/-/run-async-3.0.0.tgz#42a432f6d76c689522058984384df28be379daad"
+  integrity sha512-540WwVDOMxA6dN6We19EcT9sc3hkXPw5mzRNGM3FkdN/vtE9NFvj5lFAPNwUDmJjXidm3v7TC1cTE7t17Ulm1Q==
+
 run-parallel@^1.1.9:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"
@@ -8200,6 +8770,11 @@ run-parallel@^1.1.9:
   dependencies:
     queue-microtask "^1.2.2"
 
+rx@4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
+  integrity sha512-CiaiuN6gapkdl+cZUr67W6I8jquN4lkak3vtIsIWCl4XIPP8ffsoyN6/+PuGXnQy8Cu8W2y9Xxh31Rq4M6wUug==
+
 rxjs-etc@^10.6.2:
   version "10.6.2"
   resolved "https://registry.yarnpkg.com/rxjs-etc/-/rxjs-etc-10.6.2.tgz#c52e0867cb6702c53e12550c263c3ceab439b90d"
@@ -8261,18 +8836,17 @@ safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0,
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-sass-loader@13.3.1:
-  version "13.3.1"
-  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-13.3.1.tgz#32ee5791434b9b4dbd1adcce76fcb4cea49cc12c"
-  integrity sha512-cBTxmgyVA1nXPvIK4brjJMXOMJ2v2YrQEuHqLw3LylGb3gsR6jAvdjHMcy/+JGTmmIF9SauTrLLR7bsWDMWqgg==
+sass-loader@13.3.2:
+  version "13.3.2"
+  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-13.3.2.tgz#460022de27aec772480f03de17f5ba88fa7e18c6"
+  integrity sha512-CQbKl57kdEv+KDLquhC+gE3pXt74LEAzm+tzywcA0/aHZuub8wTErbjAoNI57rPUWRYRNC5WUnNl8eGJNbDdwg==
   dependencies:
-    klona "^2.0.6"
     neo-async "^2.6.2"
 
-sass@1.63.2:
-  version "1.63.2"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.63.2.tgz#75f7d9a8e67d1d5b98a989507f4d98b6067b1f75"
-  integrity sha512-u56TU0AIFqMtauKl/OJ1AeFsXqRHkgO7nCWmHaDwfxDo9GUMSqBA4NEh6GMuh1CYVM7zuROYtZrHzPc2ixK+ww==
+sass@1.69.5:
+  version "1.69.5"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.69.5.tgz#23e18d1c757a35f2e52cc81871060b9ad653dfde"
+  integrity sha512-qg2+UCJibLr2LCVOt3OlPhr/dqVHWOa9XtZf2OjbLs/T4VPSJ00udtgJxH3neXZm+QqX8B+3cU7RaLqp1iVfcQ==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
     immutable "^4.0.0"
@@ -8292,7 +8866,7 @@ schema-utils@^3.1.1:
     ajv "^6.12.5"
     ajv-keywords "^3.5.2"
 
-schema-utils@^3.1.2:
+schema-utils@^3.2.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.3.0.tgz#f50a88877c3c01652a15b622ae9e9795df7a60fe"
   integrity sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==
@@ -8335,22 +8909,41 @@ semver@7.5.3:
   dependencies:
     lru-cache "^6.0.0"
 
+semver@7.5.4, semver@^7.0.0, semver@^7.1.1, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8:
+  version "7.5.4"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
+  integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
+  dependencies:
+    lru-cache "^6.0.0"
+
 semver@^5.3.0, semver@^5.6.0:
   version "5.7.2"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
   integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
 
-semver@^6.0.0, semver@^6.3.0, semver@^6.3.1:
+semver@^6.3.0, semver@^6.3.1:
   version "6.3.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-semver@^7.0.0, semver@^7.1.1, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8:
-  version "7.5.4"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
-  integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
+send@0.16.2:
+  version "0.16.2"
+  resolved "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1"
+  integrity sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==
   dependencies:
-    lru-cache "^6.0.0"
+    debug "2.6.9"
+    depd "~1.1.2"
+    destroy "~1.0.4"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    etag "~1.8.1"
+    fresh "0.5.2"
+    http-errors "~1.6.2"
+    mime "1.4.1"
+    ms "2.0.0"
+    on-finished "~2.3.0"
+    range-parser "~1.2.0"
+    statuses "~1.4.0"
 
 send@0.18.0:
   version "0.18.0"
@@ -8387,7 +8980,7 @@ serialize-javascript@^6.0.0, serialize-javascript@^6.0.1:
   dependencies:
     randombytes "^2.1.0"
 
-serve-index@^1.9.1:
+serve-index@1.9.1, serve-index@^1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239"
   integrity sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==
@@ -8400,6 +8993,16 @@ serve-index@^1.9.1:
     mime-types "~2.1.17"
     parseurl "~1.3.2"
 
+serve-static@1.13.2:
+  version "1.13.2"
+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.2.tgz#095e8472fd5b46237db50ce486a43f4b86c6cec1"
+  integrity sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==
+  dependencies:
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    parseurl "~1.3.2"
+    send "0.16.2"
+
 serve-static@1.15.0:
   version "1.15.0"
   resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.15.0.tgz#faaef08cffe0a1a62f60cad0c4e513cff0ac9540"
@@ -8410,6 +9013,11 @@ serve-static@1.15.0:
     parseurl "~1.3.3"
     send "0.18.0"
 
+server-destroy@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/server-destroy/-/server-destroy-1.0.1.tgz#f13bf928e42b9c3e79383e61cc3998b5d14e6cdd"
+  integrity sha512-rb+9B5YBIEzYcD6x2VKidaa+cqYBJQKnU4oe4E3ANwRRN56yk/ua1YCJT1n21NTS8w6CcOclAKNP3PhdCXKYtQ==
+
 set-blocking@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
@@ -8463,7 +9071,7 @@ side-channel@^1.0.4:
     get-intrinsic "^1.0.2"
     object-inspect "^1.9.0"
 
-signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7:
+signal-exit@^3.0.2, signal-exit@^3.0.3:
   version "3.0.7"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
   integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
@@ -8478,14 +9086,15 @@ signedsource@^1.0.0:
   resolved "https://registry.yarnpkg.com/signedsource/-/signedsource-1.0.0.tgz#1ddace4981798f93bd833973803d80d52e93ad6a"
   integrity sha512-6+eerH9fEnNmi/hyM1DXcRK3pWdoMQtlkQ+ns0ntzunjKqp5i3sKCc80ym8Fib3iaYhdJUOPdhlJWj1tvge2Ww==
 
-sigstore@^1.3.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/sigstore/-/sigstore-1.7.0.tgz#9186e6c8ce1ab0cba5d97b414212d40f0a01564e"
-  integrity sha512-KP7QULhWdlu3hlp+jw2EvgWKlOGOY9McLj/jrchLjHNlNPK0KWIwF919cbmOp6QiKXLmPijR2qH/5KYWlbtG9Q==
+sigstore@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/sigstore/-/sigstore-2.1.0.tgz#c577b596642b3f360dc4135d476466e6edeb2364"
+  integrity sha512-kPIj+ZLkyI3QaM0qX8V/nSsweYND3W448pwkDgS6CQ74MfhEkIR8ToK5Iyx46KJYRjseVcD3Rp9zAmUAj6ZjPw==
   dependencies:
-    "@sigstore/protobuf-specs" "^0.1.0"
-    "@sigstore/tuf" "^1.0.1"
-    make-fetch-happen "^11.0.1"
+    "@sigstore/bundle" "^2.1.0"
+    "@sigstore/protobuf-specs" "^0.2.1"
+    "@sigstore/sign" "^2.1.0"
+    "@sigstore/tuf" "^2.1.0"
 
 sirv@^1.0.7:
   version "1.0.19"
@@ -8542,6 +9151,44 @@ snake-case@^3.0.4:
     dot-case "^3.0.4"
     tslib "^2.0.3"
 
+socket.io-adapter@~2.5.2:
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-2.5.2.tgz#5de9477c9182fdc171cd8c8364b9a8894ec75d12"
+  integrity sha512-87C3LO/NOMc+eMcpcxUBebGjkpMDkNBS9tf7KJqcDsmL936EChtVva71Dw2q4tQcuVC+hAUy4an2NO/sYXmwRA==
+  dependencies:
+    ws "~8.11.0"
+
+socket.io-client@^4.4.1:
+  version "4.7.3"
+  resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-4.7.3.tgz#b49e006fc1ccaea65229a4b435c083b10439ecc4"
+  integrity sha512-nU+ywttCyBitXIl9Xe0RSEfek4LneYkJxCeNnKCuhwoH4jGXO1ipIUw/VA/+Vvv2G1MTym11fzFC0SxkrcfXDw==
+  dependencies:
+    "@socket.io/component-emitter" "~3.1.0"
+    debug "~4.3.2"
+    engine.io-client "~6.5.2"
+    socket.io-parser "~4.2.4"
+
+socket.io-parser@~4.2.4:
+  version "4.2.4"
+  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.2.4.tgz#c806966cf7270601e47469ddeec30fbdfda44c83"
+  integrity sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew==
+  dependencies:
+    "@socket.io/component-emitter" "~3.1.0"
+    debug "~4.3.1"
+
+socket.io@^4.4.1:
+  version "4.7.3"
+  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-4.7.3.tgz#a0f1a4511eb23fe182ae3a018875a31501be3ffc"
+  integrity sha512-SE+UIQXBQE+GPG2oszWMlsEmWtHVqw/h1VrYJGK5/MC7CH5p58N448HwIrtREcvR4jfdOJAY4ieQfxMr55qbbw==
+  dependencies:
+    accepts "~1.3.4"
+    base64id "~2.0.0"
+    cors "~2.8.5"
+    debug "~4.3.2"
+    engine.io "~6.5.2"
+    socket.io-adapter "~2.5.2"
+    socket.io-parser "~4.2.4"
+
 sockjs@^0.3.24:
   version "0.3.24"
   resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.24.tgz#c9bc8995f33a111bea0395ec30aa3206bdb5ccce"
@@ -8551,16 +9198,16 @@ sockjs@^0.3.24:
     uuid "^8.3.2"
     websocket-driver "^0.7.4"
 
-socks-proxy-agent@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz#dc069ecf34436621acb41e3efa66ca1b5fed15b6"
-  integrity sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==
+socks-proxy-agent@^8.0.1:
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-8.0.2.tgz#5acbd7be7baf18c46a3f293a840109a430a640ad"
+  integrity sha512-8zuqoLv1aP/66PHF5TqwJ7Czm3Yv32urJQHrVyhD7mmA6d61Zv8cIXQYPTWwmg6qlupnPvs/QKDmfa4P/qct2g==
   dependencies:
-    agent-base "^6.0.2"
-    debug "^4.3.3"
-    socks "^2.6.2"
+    agent-base "^7.0.2"
+    debug "^4.3.4"
+    socks "^2.7.1"
 
-socks@^2.6.2:
+socks@^2.7.1:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/socks/-/socks-2.7.1.tgz#d8e651247178fde79c0663043e07240196857d55"
   integrity sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==
@@ -8673,13 +9320,6 @@ ssri@^10.0.0:
   dependencies:
     minipass "^4.0.0"
 
-ssri@^9.0.0:
-  version "9.0.1"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-9.0.1.tgz#544d4c357a8d7b71a19700074b6883fcb4eae057"
-  integrity sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==
-  dependencies:
-    minipass "^3.1.1"
-
 stable@^0.1.8:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf"
@@ -8708,6 +9348,16 @@ statuses@2.0.1:
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
   integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
 
+statuses@~1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
+  integrity sha512-wuTCPGlJONk/a1kqZ4fQM2+908lC7fa7nPYpTC1EhnvqLX/IICbeP1OZGDtA374trpSq68YubKUMo8oRhN46yg==
+
+statuses@~1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
+  integrity sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==
+
 stop-iteration-iterator@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz#6a60be0b4ee757d1ed5254858ec66b10c49285e4"
@@ -8715,6 +9365,14 @@ stop-iteration-iterator@^1.0.0:
   dependencies:
     internal-slot "^1.0.4"
 
+stream-throttle@^0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/stream-throttle/-/stream-throttle-0.1.3.tgz#add57c8d7cc73a81630d31cd55d3961cfafba9c3"
+  integrity sha512-889+B9vN9dq7/vLbGyuHeZ6/ctf5sNuGWsDy89uNxkFTAgzy0eK7+w5fL3KLNRTkLle7EgZGvHUphZW0Q26MnQ==
+  dependencies:
+    commander "^2.2.0"
+    limiter "^1.0.5"
+
 streamsearch@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-1.1.0.tgz#404dd1e2247ca94af554e841a8ef0eaa238da764"
@@ -8725,7 +9383,7 @@ string-env-interpolation@1.0.1, string-env-interpolation@^1.0.1:
   resolved "https://registry.yarnpkg.com/string-env-interpolation/-/string-env-interpolation-1.0.1.tgz#ad4397ae4ac53fe6c91d1402ad6f6a52862c7152"
   integrity sha512-78lwMoCcn0nNu8LszbP1UA7g55OeE4v7rCeWnM5B453rnNr4aq+5it3FEYtZrSEiMvHZOZ9Jlqb0OD0M2VInqg==
 
-"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -8925,10 +9583,10 @@ terser-webpack-plugin@^5.3.7:
     serialize-javascript "^6.0.1"
     terser "^5.16.8"
 
-terser@5.17.7:
-  version "5.17.7"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.17.7.tgz#2a8b134826fe179b711969fd9d9a0c2479b2a8c3"
-  integrity sha512-/bi0Zm2C6VAexlGgLlVxA0P2lru/sdLyfCVaRMfKVo9nWxbmz7f/sD8VPybPeSUJaJcwmCJis9pBIhcVcG1QcQ==
+terser@5.24.0:
+  version "5.24.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.24.0.tgz#4ae50302977bca4831ccc7b4fef63a3c04228364"
+  integrity sha512-ZpGR4Hy3+wBEzVEnHvstMvqpD/nABNelQn/z2r0fjVWGQsN3bpOLzQlqDxmb4CDZnXq5lpjnQ+mHQLAOpfM5iw==
   dependencies:
     "@jridgewell/source-map" "^0.3.3"
     acorn "^8.8.2"
@@ -9072,10 +9730,10 @@ tsconfig-paths@^4.1.2:
     minimist "^1.2.6"
     strip-bom "^3.0.0"
 
-tslib@2.5.3:
-  version "2.5.3"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.3.tgz#24944ba2d990940e6e982c4bea147aba80209913"
-  integrity sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==
+tslib@2.6.2:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
+  integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
 
 tslib@^1.13.0, tslib@^1.8.1:
   version "1.14.1"
@@ -9120,14 +9778,14 @@ tsutils@^3.21.0:
   dependencies:
     tslib "^1.8.1"
 
-tuf-js@^1.1.7:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/tuf-js/-/tuf-js-1.1.7.tgz#21b7ae92a9373015be77dfe0cb282a80ec3bbe43"
-  integrity sha512-i3P9Kgw3ytjELUfpuKVDNBJvk4u5bXL6gskv572mcevPbSKCV3zt3djhmlEQ65yERjIbOSncy7U4cQJaB1CBCg==
+tuf-js@^2.1.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/tuf-js/-/tuf-js-2.2.0.tgz#4daaa8620ba7545501d04dfa933c98abbcc959b9"
+  integrity sha512-ZSDngmP1z6zw+FIkIBjvOp/II/mIub/O7Pp12j1WNsiCpg5R5wAc//i555bBQsE44O94btLt0xM/Zr2LQjwdCg==
   dependencies:
-    "@tufjs/models" "1.0.4"
+    "@tufjs/models" "2.0.0"
     debug "^4.3.4"
-    make-fetch-happen "^11.1.1"
+    make-fetch-happen "^13.0.0"
 
 type-fest@^0.21.3:
   version "0.21.3"
@@ -9172,11 +9830,28 @@ ua-parser-js@^0.7.30:
   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.33.tgz#1d04acb4ccef9293df6f70f2c3d22f3030d8b532"
   integrity sha512-s8ax/CeZdK9R/56Sui0WM6y9OFREJarMRHqLB2EwkovemBxNQ+Bqu8GAsUnVcXKgphb++ghr/B2BZx4mahujPw==
 
+ua-parser-js@^1.0.33:
+  version "1.0.37"
+  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-1.0.37.tgz#b5dc7b163a5c1f0c510b08446aed4da92c46373f"
+  integrity sha512-bhTyI94tZofjo+Dn8SN6Zv8nBDvyXTymAdM3LDI/0IboIUwTu1rEhW7v2TfiVsoYWgkQ4kOVqnI8APUFbIQIFQ==
+
 unc-path-regex@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
   integrity sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==
 
+undici-types@~5.26.4:
+  version "5.26.5"
+  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
+  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
+
+undici@5.27.2:
+  version "5.27.2"
+  resolved "https://registry.yarnpkg.com/undici/-/undici-5.27.2.tgz#a270c563aea5b46cc0df2550523638c95c5d4411"
+  integrity sha512-iS857PdOEy/y3wlM3yRp+6SNQQ6xU0mmZcwRSriqk+et/cwWAtwmIGf6WkoDN2EK/AMdCO/dfXzIwi+rFMrjjQ==
+  dependencies:
+    "@fastify/busboy" "^2.0.0"
+
 undici@^5.12.0:
   version "5.26.3"
   resolved "https://registry.yarnpkg.com/undici/-/undici-5.26.3.tgz#ab3527b3d5bb25b12f898dfd22165d472dd71b79"
@@ -9207,13 +9882,6 @@ unicode-property-aliases-ecmascript@^2.0.0:
   resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz#43d41e3be698bd493ef911077c9b131f827e8ccd"
   integrity sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==
 
-unique-filename@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-2.0.1.tgz#e785f8675a9a7589e0ac77e0b5c34d2eaeac6da2"
-  integrity sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A==
-  dependencies:
-    unique-slug "^3.0.0"
-
 unique-filename@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-3.0.0.tgz#48ba7a5a16849f5080d26c760c86cf5cf05770ea"
@@ -9221,13 +9889,6 @@ unique-filename@^3.0.0:
   dependencies:
     unique-slug "^4.0.0"
 
-unique-slug@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-3.0.0.tgz#6d347cf57c8a7a7a6044aabd0e2d74e4d76dc7c9"
-  integrity sha512-8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w==
-  dependencies:
-    imurmurhash "^0.1.4"
-
 unique-slug@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-4.0.0.tgz#6bae6bb16be91351badd24cdce741f892a6532e3"
@@ -9235,6 +9896,11 @@ unique-slug@^4.0.0:
   dependencies:
     imurmurhash "^0.1.4"
 
+universalify@^0.1.0:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
+  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
+
 universalify@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
@@ -9260,6 +9926,14 @@ update-browserslist-db@^1.0.11:
     escalade "^3.1.1"
     picocolors "^1.0.0"
 
+update-browserslist-db@^1.0.13:
+  version "1.0.13"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz#3c5e4f5c083661bd38ef64b6328c26ed6c8248c4"
+  integrity sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==
+  dependencies:
+    escalade "^3.1.1"
+    picocolors "^1.0.0"
+
 update-browserslist-db@^1.0.9:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz#0f54b876545726f17d00cd9a2561e6dade943ff3"
@@ -9346,19 +10020,19 @@ value-or-promise@1.0.12, value-or-promise@^1.0.11:
   resolved "https://registry.yarnpkg.com/value-or-promise/-/value-or-promise-1.0.12.tgz#0e5abfeec70148c78460a849f6b003ea7986f15c"
   integrity sha512-Z6Uz+TYwEqE7ZN50gwn+1LCVo9ZVrpxRPOhOLnncYkY1ZzOYtrX8Fwf/rFktZ8R5mJms6EZf5TqNOMeZmnPq9Q==
 
-vary@~1.1.2:
+vary@^1, vary@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
   integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==
 
-vite@4.3.9:
-  version "4.3.9"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-4.3.9.tgz#db896200c0b1aa13b37cdc35c9e99ee2fdd5f96d"
-  integrity sha512-qsTNZjO9NoJNW7KnOrgYwczm0WctJ8m/yqYAMAK9Lxt4SoySUfS5S8ia9K7JHpa3KEeMfyF8LoJ3c5NeBJy6pg==
+vite@4.5.1:
+  version "4.5.1"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-4.5.1.tgz#3370986e1ed5dbabbf35a6c2e1fb1e18555b968a"
+  integrity sha512-AXXFaAJ8yebyqzoNB9fu2pHoo/nWX+xZlaRwoeYUxEqBO+Zj4msE5G+BhGBll9lYEKv9Hfks52PAF2X7qDYXQA==
   dependencies:
-    esbuild "^0.17.5"
-    postcss "^8.4.23"
-    rollup "^3.21.0"
+    esbuild "^0.18.10"
+    postcss "^8.4.27"
+    rollup "^3.27.1"
   optionalDependencies:
     fsevents "~2.3.2"
 
@@ -9447,10 +10121,10 @@ webpack-dev-middleware@^5.3.1:
     range-parser "^1.2.1"
     schema-utils "^4.0.0"
 
-webpack-dev-server@4.15.0:
-  version "4.15.0"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.15.0.tgz#87ba9006eca53c551607ea0d663f4ae88be7af21"
-  integrity sha512-HmNB5QeSl1KpulTBQ8UT4FPrByYyaLxpJoQ0+s7EvUrMc16m0ZS1sgb1XGqzmgCPk0c9y+aaXxn11tbLzuM7NQ==
+webpack-dev-server@4.15.1:
+  version "4.15.1"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.15.1.tgz#8944b29c12760b3a45bdaa70799b17cb91b03df7"
+  integrity sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA==
   dependencies:
     "@types/bonjour" "^3.5.9"
     "@types/connect-history-api-fallback" "^1.3.5"
@@ -9458,7 +10132,7 @@ webpack-dev-server@4.15.0:
     "@types/serve-index" "^1.9.1"
     "@types/serve-static" "^1.13.10"
     "@types/sockjs" "^0.3.33"
-    "@types/ws" "^8.5.1"
+    "@types/ws" "^8.5.5"
     ansi-html-community "^0.0.8"
     bonjour-service "^1.0.11"
     chokidar "^3.5.3"
@@ -9483,12 +10157,13 @@ webpack-dev-server@4.15.0:
     webpack-dev-middleware "^5.3.1"
     ws "^8.13.0"
 
-webpack-merge@5.9.0:
-  version "5.9.0"
-  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.9.0.tgz#dc160a1c4cf512ceca515cc231669e9ddb133826"
-  integrity sha512-6NbRQw4+Sy50vYNTw7EyOn41OZItPiXB8GNv3INSoe3PSFaHJEz3SHTrYVaRm2LilNGnFUzh0FAwqPEmU/CwDg==
+webpack-merge@5.10.0:
+  version "5.10.0"
+  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.10.0.tgz#a3ad5d773241e9c682803abf628d4cd62b8a4177"
+  integrity sha512-+4zXKdx7UnO+1jaN4l2lHVD+mFvnlZQP/6ljaJVb4SZiwIKeUnrT5l0gkT8z+n4hKpC+jpOv6O9R+gLtag7pSA==
   dependencies:
     clone-deep "^4.0.1"
+    flat "^5.0.2"
     wildcard "^2.0.0"
 
 webpack-sources@^3.0.0, webpack-sources@^3.2.3:
@@ -9503,10 +10178,10 @@ webpack-subresource-integrity@5.1.0:
   dependencies:
     typed-assert "^1.0.8"
 
-webpack@5.86.0:
-  version "5.86.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.86.0.tgz#b0eb81794b62aee0b7e7eb8c5073495217d9fc6d"
-  integrity sha512-3BOvworZ8SO/D4GVP+GoRC3fVeg5MO4vzmq8TJJEkdmopxyazGDxN8ClqN12uzrZW9Tv8EED8v5VSb6Sqyi0pg==
+webpack@5.89.0:
+  version "5.89.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.89.0.tgz#56b8bf9a34356e93a6625770006490bf3a7f32dc"
+  integrity sha512-qyfIC10pOr70V+jkmud8tMfajraGCZMBWJtrmuBymQKCrLTRejBI8STDp1MCyZu/QTdZSeacCQYpYNQVOzX5kw==
   dependencies:
     "@types/eslint-scope" "^3.7.3"
     "@types/estree" "^1.0.0"
@@ -9517,7 +10192,7 @@ webpack@5.86.0:
     acorn-import-assertions "^1.9.0"
     browserslist "^4.14.5"
     chrome-trace-event "^1.0.2"
-    enhanced-resolve "^5.14.1"
+    enhanced-resolve "^5.15.0"
     es-module-lexer "^1.2.1"
     eslint-scope "5.1.1"
     events "^3.2.0"
@@ -9527,7 +10202,7 @@ webpack@5.86.0:
     loader-runner "^4.2.0"
     mime-types "^2.1.27"
     neo-async "^2.6.2"
-    schema-utils "^3.1.2"
+    schema-utils "^3.2.0"
     tapable "^2.1.1"
     terser-webpack-plugin "^5.3.7"
     watchpack "^2.4.0"
@@ -9597,26 +10272,19 @@ which-typed-array@^1.1.11, which-typed-array@^1.1.9:
     gopd "^1.0.1"
     has-tostringtag "^1.0.0"
 
-which@^2.0.1, which@^2.0.2:
+which@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
   integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
   dependencies:
     isexe "^2.0.0"
 
-which@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/which/-/which-3.0.0.tgz#a9efd016db59728758a390d23f1687b6e8f59f8e"
-  integrity sha512-nla//68K9NU6yRiwDY/Q8aU6siKlSs64aEC7+IV56QoAuyQT2ovsJcgGYGyqMOmI/CGN1BOR6mM5EN0FBO+zyQ==
-  dependencies:
-    isexe "^2.0.0"
-
-wide-align@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3"
-  integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==
+which@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/which/-/which-4.0.0.tgz#cd60b5e74503a3fbcfbf6cd6b4138a8bae644c1a"
+  integrity sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==
   dependencies:
-    string-width "^1.0.2 || 2 || 3 || 4"
+    isexe "^3.1.1"
 
 wildcard@^2.0.0:
   version "2.0.0"
@@ -9678,6 +10346,16 @@ ws@^8.13.0:
   resolved "https://registry.yarnpkg.com/ws/-/ws-8.13.0.tgz#9a9fb92f93cf41512a0735c8f4dd09b8a1211cd0"
   integrity sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==
 
+ws@~8.11.0:
+  version "8.11.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.11.0.tgz#6a0d36b8edfd9f96d8b25683db2f8d7de6e8e143"
+  integrity sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==
+
+xmlhttprequest-ssl@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.0.0.tgz#91360c86b914e67f44dce769180027c0da618c67"
+  integrity sha512-QKxVRxiRACQcVuQEYFsI1hhkrMlrXHPegbbd1yn9UHOmRxY+si12nQYzri3vbzt8VdTTRviqcKxcyllFas5z2A==
+
 y18n@^4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf"
@@ -9721,7 +10399,25 @@ yargs-parser@^18.1.2:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs@17.7.2, yargs@^17.6.2:
+yargs-parser@^20.2.2:
+  version "20.2.9"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
+  integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
+
+yargs@17.1.1:
+  version "17.1.1"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.1.1.tgz#c2a8091564bdb196f7c0a67c1d12e5b85b8067ba"
+  integrity sha512-c2k48R0PwKIqKhPMWjeiF6y2xY/gPMUlro0sgxqXpbOIohWiLNXWslsootttv7E1e73QPAMQSg5FeySbVcpsPQ==
+  dependencies:
+    cliui "^7.0.2"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
+    require-directory "^2.1.1"
+    string-width "^4.2.0"
+    y18n "^5.0.5"
+    yargs-parser "^20.2.2"
+
+yargs@17.7.2, yargs@^17.3.1, yargs@^17.6.2:
   version "17.7.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
   integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
@@ -9774,6 +10470,11 @@ yocto-queue@^0.1.0:
   resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
   integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
 
+yocto-queue@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-1.0.0.tgz#7f816433fb2cbc511ec8bf7d263c3b58a1a3c251"
+  integrity sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==
+
 zen-observable-ts@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-1.2.5.tgz#6c6d9ea3d3a842812c6e9519209365a122ba8b58"

From 00d7bd7890bf5c495d1e75650c357e856a20bae1 Mon Sep 17 00:00:00 2001
From: Joshua McMichael <jmcmichael@users.noreply.github.com>
Date: Thu, 11 Jan 2024 12:24:37 -0600
Subject: [PATCH 043/125] post db:migrate schema.rb updates

---
 server/db/schema.rb | 218 +++++++++++++++++---------------------------
 1 file changed, 85 insertions(+), 133 deletions(-)

diff --git a/server/db/schema.rb b/server/db/schema.rb
index fdeef1290..45a47c7a1 100644
--- a/server/db/schema.rb
+++ b/server/db/schema.rb
@@ -464,8 +464,6 @@
     t.datetime "updated_at", precision: 6, null: false
     t.string "feature_instance_type", null: false
     t.bigint "feature_instance_id", null: false
-    t.boolean "flagged", default: false, null: false
-    t.text "full_name"
     t.index ["feature_instance_type", "feature_instance_id"], name: "index_features_on_feature_instance"
   end
 
@@ -714,7 +712,7 @@
     t.integer "source_type", null: false
     t.integer "asco_abstract_id"
     t.text "asco_presenter"
-    t.text "status", default: "fully_curated", null: false
+    t.boolean "fully_curated", default: false, null: false
     t.index ["asco_abstract_id"], name: "index_sources_on_asco_abstract_id"
     t.index ["asco_presenter"], name: "index_sources_on_asco_presenter"
     t.index ["citation_id"], name: "index_sources_on_citation_id"
@@ -1028,6 +1026,47 @@
        JOIN evidence_items ei ON (((mp.id = ei.molecular_profile_id) AND (ei.deleted = false))))
     GROUP BY mp.id;
   SQL
+  create_view "molecular_profile_browse_table_rows", materialized: true, sql_definition: <<-SQL
+      SELECT outer_mps.id,
+      outer_mps.name,
+      count(DISTINCT evidence_items.id) AS evidence_item_count,
+      array_agg(DISTINCT molecular_profile_aliases.name ORDER BY molecular_profile_aliases.name) AS alias_names,
+      json_agg(DISTINCT jsonb_build_object('name', genes.name, 'id', genes.id)) FILTER (WHERE (genes.name IS NOT NULL)) AS genes,
+      json_agg(DISTINCT jsonb_build_object('name', variants.name, 'id', variants.id)) FILTER (WHERE (variants.name IS NOT NULL)) AS variants,
+      json_agg(DISTINCT jsonb_build_object('name', diseases.name, 'id', diseases.id, 'total', disease_count.total)) FILTER (WHERE (diseases.name IS NOT NULL)) AS diseases,
+      json_agg(DISTINCT jsonb_build_object('name', therapies.name, 'id', therapies.id, 'total', therapy_count.total)) FILTER (WHERE (therapies.name IS NOT NULL)) AS therapies,
+      count(DISTINCT assertions.id) AS assertion_count,
+      count(DISTINCT variants.id) AS variant_count,
+      outer_mps.evidence_score
+     FROM ((((((((((((molecular_profiles outer_mps
+       LEFT JOIN evidence_items ON ((evidence_items.molecular_profile_id = outer_mps.id)))
+       JOIN molecular_profiles_variants ON ((outer_mps.id = molecular_profiles_variants.molecular_profile_id)))
+       JOIN variants ON ((molecular_profiles_variants.variant_id = variants.id)))
+       JOIN genes ON ((genes.id = variants.gene_id)))
+       LEFT JOIN diseases ON ((diseases.id = evidence_items.disease_id)))
+       LEFT JOIN evidence_items_therapies ON ((evidence_items_therapies.evidence_item_id = evidence_items.id)))
+       LEFT JOIN therapies ON ((therapies.id = evidence_items_therapies.therapy_id)))
+       LEFT JOIN assertions ON ((assertions.molecular_profile_id = outer_mps.id)))
+       LEFT JOIN molecular_profile_aliases_molecular_profiles ON ((molecular_profile_aliases_molecular_profiles.molecular_profile_id = outer_mps.id)))
+       LEFT JOIN molecular_profile_aliases ON ((molecular_profile_aliases.id = molecular_profile_aliases_molecular_profiles.molecular_profile_alias_id)))
+       LEFT JOIN LATERAL ( SELECT therapies_1.id AS therapy_id,
+              count(DISTINCT evidence_items_1.id) AS total
+             FROM ((evidence_items evidence_items_1
+               JOIN evidence_items_therapies evidence_items_therapies_1 ON ((evidence_items_therapies_1.evidence_item_id = evidence_items_1.id)))
+               JOIN therapies therapies_1 ON ((therapies_1.id = evidence_items_therapies_1.therapy_id)))
+            WHERE (evidence_items_1.molecular_profile_id = outer_mps.id)
+            GROUP BY therapies_1.id) therapy_count ON ((therapies.id = therapy_count.therapy_id)))
+       LEFT JOIN LATERAL ( SELECT diseases_1.id AS disease_id,
+              count(DISTINCT evidence_items_1.id) AS total
+             FROM (evidence_items evidence_items_1
+               JOIN diseases diseases_1 ON ((diseases_1.id = evidence_items_1.disease_id)))
+            WHERE (evidence_items_1.molecular_profile_id = outer_mps.id)
+            GROUP BY diseases_1.id) disease_count ON ((diseases.id = disease_count.disease_id)))
+    WHERE (outer_mps.deprecated = false)
+    GROUP BY outer_mps.id, outer_mps.name, outer_mps.evidence_score;
+  SQL
+  add_index "molecular_profile_browse_table_rows", ["id"], name: "index_molecular_profile_browse_table_rows_on_id", unique: true
+
   create_view "variant_group_browse_table_rows", materialized: true, sql_definition: <<-SQL
       SELECT variant_groups.id,
       variant_groups.name,
@@ -1116,98 +1155,16 @@
   SQL
   add_index "source_browse_table_rows", ["id"], name: "index_source_browse_table_rows_on_id", unique: true
 
-  create_view "evidence_items_by_types", sql_definition: <<-SQL
-      SELECT mp.id AS molecular_profile_id,
-      sum(
-          CASE
-              WHEN (ei.evidence_type = 0) THEN 1
-              ELSE 0
-          END) AS diagnostic_count,
-      sum(
-          CASE
-              WHEN (ei.evidence_type = 1) THEN 1
-              ELSE 0
-          END) AS prognostic_count,
-      sum(
-          CASE
-              WHEN (ei.evidence_type = 2) THEN 1
-              ELSE 0
-          END) AS predictive_count,
-      sum(
-          CASE
-              WHEN (ei.evidence_type = 3) THEN 1
-              ELSE 0
-          END) AS predisposing_count,
-      sum(
-          CASE
-              WHEN (ei.evidence_type = 4) THEN 1
-              ELSE 0
-          END) AS functional_count,
-      sum(
-          CASE
-              WHEN (ei.evidence_type = 5) THEN 1
-              ELSE 0
-          END) AS oncogenic_count
-     FROM (molecular_profiles mp
-       JOIN evidence_items ei ON (((mp.id = ei.molecular_profile_id) AND (ei.deleted = false) AND ((ei.status)::text <> 'rejected'::text))))
-    GROUP BY mp.id;
-  SQL
-  create_view "feature_browse_table_rows", materialized: true, sql_definition: <<-SQL
-      SELECT outer_features.id,
-      outer_features.name,
-      outer_features.flagged,
-      array_agg(DISTINCT feature_aliases.name ORDER BY feature_aliases.name) AS alias_names,
-      json_agg(DISTINCT jsonb_build_object('name', diseases.name, 'id', diseases.id, 'total', disease_count.total)) FILTER (WHERE (diseases.name IS NOT NULL)) AS diseases,
-      json_agg(DISTINCT jsonb_build_object('name', therapies.name, 'id', therapies.id, 'total', therapy_count.total)) FILTER (WHERE (therapies.name IS NOT NULL)) AS therapies,
-      count(DISTINCT variants.id) AS variant_count,
-      count(DISTINCT evidence_items.id) AS evidence_item_count,
-      count(DISTINCT assertions.id) AS assertion_count,
-      count(DISTINCT molecular_profiles.id) AS molecular_profile_count
-     FROM ((((((((((((features outer_features
-       LEFT JOIN feature_aliases_features ON ((feature_aliases_features.feature_id = outer_features.id)))
-       LEFT JOIN feature_aliases ON ((feature_aliases.id = feature_aliases_features.feature_alias_id)))
-       JOIN variants ON ((variants.feature_id = outer_features.id)))
-       JOIN molecular_profiles_variants ON ((molecular_profiles_variants.variant_id = variants.id)))
-       JOIN molecular_profiles ON ((molecular_profiles.id = molecular_profiles_variants.molecular_profile_id)))
-       JOIN evidence_items ON ((evidence_items.molecular_profile_id = molecular_profiles.id)))
-       LEFT JOIN diseases ON ((diseases.id = evidence_items.disease_id)))
-       LEFT JOIN evidence_items_therapies ON ((evidence_items_therapies.evidence_item_id = evidence_items.id)))
-       LEFT JOIN therapies ON ((therapies.id = evidence_items_therapies.therapy_id)))
-       LEFT JOIN assertions ON ((assertions.molecular_profile_id = molecular_profiles.id)))
-       LEFT JOIN LATERAL ( SELECT therapies_1.id AS therapy_id,
-              count(DISTINCT evidence_items_1.id) AS total
-             FROM (((((evidence_items evidence_items_1
-               JOIN molecular_profiles molecular_profiles_1 ON ((molecular_profiles_1.id = evidence_items_1.molecular_profile_id)))
-               JOIN molecular_profiles_variants molecular_profiles_variants_1 ON ((molecular_profiles_variants_1.molecular_profile_id = molecular_profiles_1.id)))
-               JOIN variants variants_1 ON ((variants_1.id = molecular_profiles_variants_1.variant_id)))
-               JOIN evidence_items_therapies evidence_items_therapies_1 ON ((evidence_items_therapies_1.evidence_item_id = evidence_items_1.id)))
-               JOIN therapies therapies_1 ON ((therapies_1.id = evidence_items_therapies_1.therapy_id)))
-            WHERE (variants_1.feature_id = outer_features.id)
-            GROUP BY therapies_1.id) therapy_count ON ((therapies.id = therapy_count.therapy_id)))
-       LEFT JOIN LATERAL ( SELECT diseases_1.id AS disease_id,
-              count(DISTINCT evidence_items_1.id) AS total
-             FROM ((((evidence_items evidence_items_1
-               JOIN molecular_profiles molecular_profiles_1 ON ((molecular_profiles_1.id = evidence_items_1.molecular_profile_id)))
-               JOIN molecular_profiles_variants molecular_profiles_variants_1 ON ((molecular_profiles_variants_1.molecular_profile_id = molecular_profiles_1.id)))
-               JOIN variants variants_1 ON ((variants_1.id = molecular_profiles_variants_1.variant_id)))
-               JOIN diseases diseases_1 ON ((diseases_1.id = evidence_items_1.disease_id)))
-            WHERE (variants_1.feature_id = outer_features.id)
-            GROUP BY diseases_1.id) disease_count ON ((diseases.id = disease_count.disease_id)))
-    WHERE (((evidence_items.status)::text <> 'rejected'::text) AND (molecular_profiles.deprecated = false) AND (variants.deprecated = false))
-    GROUP BY outer_features.id, outer_features.name;
-  SQL
-  add_index "feature_browse_table_rows", ["id"], name: "index_feature_browse_table_rows_on_id", unique: true
-
   create_view "disease_browse_table_rows", materialized: true, sql_definition: <<-SQL
       SELECT diseases.id,
       diseases.name,
       diseases.display_name,
       diseases.doid,
-      json_agg(DISTINCT jsonb_build_object('name', features.name, 'id', features.id)) FILTER (WHERE (features.name IS NOT NULL)) AS features,
+      array_agg(DISTINCT genes.name) AS gene_names,
       count(DISTINCT evidence_items.id) AS evidence_item_count,
       count(DISTINCT variants.id) AS variant_count,
       count(DISTINCT assertions.id) AS assertion_count,
-      count(DISTINCT features.id) AS feature_count
+      count(DISTINCT genes.id) AS gene_count
      FROM (((((((diseases
        JOIN evidence_items ON ((diseases.id = evidence_items.disease_id)))
        LEFT JOIN assertions_evidence_items ON ((assertions_evidence_items.evidence_item_id = evidence_items.id)))
@@ -1215,58 +1172,17 @@
        JOIN molecular_profiles ON ((molecular_profiles.id = evidence_items.molecular_profile_id)))
        JOIN molecular_profiles_variants ON ((molecular_profiles_variants.molecular_profile_id = molecular_profiles.id)))
        JOIN variants ON ((variants.id = molecular_profiles_variants.variant_id)))
-       JOIN features ON ((features.id = variants.feature_id)))
+       JOIN genes ON ((genes.id = variants.gene_id)))
     WHERE (((evidence_items.status)::text <> 'rejected'::text) AND (diseases.deprecated = false))
     GROUP BY diseases.id, diseases.name, diseases.doid;
   SQL
   add_index "disease_browse_table_rows", ["id"], name: "index_disease_browse_table_rows_on_id", unique: true
 
-  create_view "molecular_profile_browse_table_rows", materialized: true, sql_definition: <<-SQL
-      SELECT outer_mps.id,
-      outer_mps.name,
-      count(DISTINCT evidence_items.id) AS evidence_item_count,
-      array_agg(DISTINCT molecular_profile_aliases.name ORDER BY molecular_profile_aliases.name) AS alias_names,
-      json_agg(DISTINCT jsonb_build_object('name', features.name, 'id', features.id)) FILTER (WHERE (features.name IS NOT NULL)) AS features,
-      json_agg(DISTINCT jsonb_build_object('name', variants.name, 'id', variants.id)) FILTER (WHERE (variants.name IS NOT NULL)) AS variants,
-      json_agg(DISTINCT jsonb_build_object('name', diseases.name, 'id', diseases.id, 'total', disease_count.total)) FILTER (WHERE (diseases.name IS NOT NULL)) AS diseases,
-      json_agg(DISTINCT jsonb_build_object('name', therapies.name, 'id', therapies.id, 'total', therapy_count.total)) FILTER (WHERE (therapies.name IS NOT NULL)) AS therapies,
-      count(DISTINCT assertions.id) AS assertion_count,
-      count(DISTINCT variants.id) AS variant_count,
-      outer_mps.evidence_score
-     FROM ((((((((((((molecular_profiles outer_mps
-       LEFT JOIN evidence_items ON ((evidence_items.molecular_profile_id = outer_mps.id)))
-       JOIN molecular_profiles_variants ON ((outer_mps.id = molecular_profiles_variants.molecular_profile_id)))
-       JOIN variants ON ((molecular_profiles_variants.variant_id = variants.id)))
-       JOIN features ON ((features.id = variants.feature_id)))
-       LEFT JOIN diseases ON ((diseases.id = evidence_items.disease_id)))
-       LEFT JOIN evidence_items_therapies ON ((evidence_items_therapies.evidence_item_id = evidence_items.id)))
-       LEFT JOIN therapies ON ((therapies.id = evidence_items_therapies.therapy_id)))
-       LEFT JOIN assertions ON ((assertions.molecular_profile_id = outer_mps.id)))
-       LEFT JOIN molecular_profile_aliases_molecular_profiles ON ((molecular_profile_aliases_molecular_profiles.molecular_profile_id = outer_mps.id)))
-       LEFT JOIN molecular_profile_aliases ON ((molecular_profile_aliases.id = molecular_profile_aliases_molecular_profiles.molecular_profile_alias_id)))
-       LEFT JOIN LATERAL ( SELECT therapies_1.id AS therapy_id,
-              count(DISTINCT evidence_items_1.id) AS total
-             FROM ((evidence_items evidence_items_1
-               JOIN evidence_items_therapies evidence_items_therapies_1 ON ((evidence_items_therapies_1.evidence_item_id = evidence_items_1.id)))
-               JOIN therapies therapies_1 ON ((therapies_1.id = evidence_items_therapies_1.therapy_id)))
-            WHERE (evidence_items_1.molecular_profile_id = outer_mps.id)
-            GROUP BY therapies_1.id) therapy_count ON ((therapies.id = therapy_count.therapy_id)))
-       LEFT JOIN LATERAL ( SELECT diseases_1.id AS disease_id,
-              count(DISTINCT evidence_items_1.id) AS total
-             FROM (evidence_items evidence_items_1
-               JOIN diseases diseases_1 ON ((diseases_1.id = evidence_items_1.disease_id)))
-            WHERE (evidence_items_1.molecular_profile_id = outer_mps.id)
-            GROUP BY diseases_1.id) disease_count ON ((diseases.id = disease_count.disease_id)))
-    WHERE (outer_mps.deprecated = false)
-    GROUP BY outer_mps.id, outer_mps.name, outer_mps.evidence_score;
-  SQL
-  add_index "molecular_profile_browse_table_rows", ["id"], name: "index_molecular_profile_browse_table_rows_on_id", unique: true
-
   create_view "variant_browse_table_rows", materialized: true, sql_definition: <<-SQL
       SELECT outer_variants.id,
       outer_variants.name,
-      features.id AS feature_id,
-      features.name AS feature_name,
+      genes.id AS gene_id,
+      genes.name AS gene_name,
       array_agg(DISTINCT variant_aliases.name ORDER BY variant_aliases.name) AS alias_names,
       array_agg(DISTINCT variant_types.id) AS variant_type_ids,
       json_agg(DISTINCT jsonb_build_object('name', variant_types.display_name, 'id', variant_types.id)) FILTER (WHERE (variant_types.* IS NOT NULL)) AS variant_types,
@@ -1281,7 +1197,7 @@
        JOIN molecular_profiles_variants ON ((molecular_profiles_variants.variant_id = outer_variants.id)))
        JOIN molecular_profiles ON ((molecular_profiles.id = molecular_profiles_variants.molecular_profile_id)))
        LEFT JOIN evidence_items ON ((evidence_items.molecular_profile_id = molecular_profiles.id)))
-       JOIN features ON ((features.id = outer_variants.feature_id)))
+       JOIN genes ON ((genes.id = outer_variants.gene_id)))
        LEFT JOIN diseases ON ((diseases.id = evidence_items.disease_id)))
        LEFT JOIN evidence_items_therapies ON ((evidence_items_therapies.evidence_item_id = evidence_items.id)))
        LEFT JOIN therapies ON ((therapies.id = evidence_items_therapies.therapy_id)))
@@ -1306,8 +1222,44 @@
             WHERE (molecular_profiles_variants_1.variant_id = outer_variants.id)
             GROUP BY diseases_1.id) disease_count ON ((diseases.id = disease_count.disease_id)))
     WHERE ((((evidence_items.status)::text <> 'rejected'::text) OR (evidence_items.status IS NULL)) AND (outer_variants.deprecated = false))
-    GROUP BY outer_variants.id, outer_variants.name, features.id, features.name;
+    GROUP BY outer_variants.id, outer_variants.name, genes.id, genes.name;
   SQL
   add_index "variant_browse_table_rows", ["id"], name: "index_variant_browse_table_rows_on_id", unique: true
 
+  create_view "evidence_items_by_types", sql_definition: <<-SQL
+      SELECT mp.id AS molecular_profile_id,
+      sum(
+          CASE
+              WHEN (ei.evidence_type = 0) THEN 1
+              ELSE 0
+          END) AS diagnostic_count,
+      sum(
+          CASE
+              WHEN (ei.evidence_type = 1) THEN 1
+              ELSE 0
+          END) AS prognostic_count,
+      sum(
+          CASE
+              WHEN (ei.evidence_type = 2) THEN 1
+              ELSE 0
+          END) AS predictive_count,
+      sum(
+          CASE
+              WHEN (ei.evidence_type = 3) THEN 1
+              ELSE 0
+          END) AS predisposing_count,
+      sum(
+          CASE
+              WHEN (ei.evidence_type = 4) THEN 1
+              ELSE 0
+          END) AS functional_count,
+      sum(
+          CASE
+              WHEN (ei.evidence_type = 5) THEN 1
+              ELSE 0
+          END) AS oncogenic_count
+     FROM (molecular_profiles mp
+       JOIN evidence_items ei ON (((mp.id = ei.molecular_profile_id) AND (ei.deleted = false) AND ((ei.status)::text <> 'rejected'::text))))
+    GROUP BY mp.id;
+  SQL
 end

From 0600bfb80b41897bbbcf51b359252045071d9a21 Mon Sep 17 00:00:00 2001
From: Joshua McMichael <jmcmichael@users.noreply.github.com>
Date: Thu, 11 Jan 2024 12:35:27 -0600
Subject: [PATCH 044/125] updated ng-zorro-antd -> v17.1.0

---
 client/package.json |  2 +-
 client/yarn.lock    | 28 ++++++++++++++--------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/client/package.json b/client/package.json
index 373cbe5f9..cf195d31a 100644
--- a/client/package.json
+++ b/client/package.json
@@ -38,7 +38,7 @@
     "@ngx-formly/core": "^6.2.2",
     "@ngx-formly/ng-zorro-antd": "^6.2.2",
     "apollo-angular": "^5.0.0",
-    "ng-zorro-antd": "^16.1.0",
+    "ng-zorro-antd": "^17.1.0",
     "ngx-cookie-service": "^16.0.0",
     "rxjs": "^7.8.1",
     "rxjs-etc": "^10.6.2",
diff --git a/client/yarn.lock b/client/yarn.lock
index f4e285b64..ecc3b3cd7 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -183,10 +183,10 @@
   dependencies:
     tslib "^2.3.0"
 
-"@angular/cdk@^16.0.0":
-  version "16.1.5"
-  resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-16.1.5.tgz#f3e0bec73c43e0c055e9c230e4b94c59b3f16c48"
-  integrity sha512-8wjYhLwW9bWicBYSdDXuN71SBP7NbJmXs+XiWiRkaFUkVDeU9z8Qkitogl+qqsSXvsOmi+12MowrbJ3tPizaLw==
+"@angular/cdk@^17.0.0":
+  version "17.0.5"
+  resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-17.0.5.tgz#baeffb798be3284d1f6110ba5892fef497ed04a7"
+  integrity sha512-O3QQGPlRz0csQ+XWWzivvtsgVY+jbyZPSKa+N5cXRA5onC3vzajKzAwXQabwIAYR/OoLeI/WNEIDW7nLpFoGXQ==
   dependencies:
     tslib "^2.3.0"
   optionalDependencies:
@@ -286,10 +286,10 @@
   dependencies:
     "@ctrl/tinycolor" "^3.4.0"
 
-"@ant-design/icons-angular@^16.0.0":
-  version "16.0.0"
-  resolved "https://registry.yarnpkg.com/@ant-design/icons-angular/-/icons-angular-16.0.0.tgz#32a80e66cfc85e1bcfed232498251aeb8e524e4a"
-  integrity sha512-KWBmWZl2so49R/MdAT7aG+xaBlMKl9SArR3Du/iPA0Am9GI1i9R89KgnnLWz+gkzHTye15S1IBXpgts4GPPU/w==
+"@ant-design/icons-angular@^17.0.0":
+  version "17.0.0"
+  resolved "https://registry.yarnpkg.com/@ant-design/icons-angular/-/icons-angular-17.0.0.tgz#5e072f4be7fa0bcef1498be735de8b54ada23620"
+  integrity sha512-MNEh3UbkSl6gkdb5MQRNHEuWI1DnU1dME9zSymnWCipEXN7MB0mcYHSfyYTqKL1j45ftp6l1UnsLvhokRYyhXA==
   dependencies:
     "@ant-design/colors" "^7.0.0"
     tslib "^2.0.0"
@@ -7563,13 +7563,13 @@ neo-async@^2.6.2:
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
   integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
 
-ng-zorro-antd@^16.1.0:
-  version "16.1.0"
-  resolved "https://registry.yarnpkg.com/ng-zorro-antd/-/ng-zorro-antd-16.1.0.tgz#46b49ed5ba4fef898959c1c84f04553cdfc1d128"
-  integrity sha512-+KjXoA0+v/liTtVIHswmOAzB9UaGADrO1tL9AOZsTLq5sZM8+DmhtixGRoSMD8HkkhpMFhsgEIxoHlkxtn1SXg==
+ng-zorro-antd@^17.1.0:
+  version "17.1.0"
+  resolved "https://registry.yarnpkg.com/ng-zorro-antd/-/ng-zorro-antd-17.1.0.tgz#0af10f4994489b6be3d9dc90f463a714f4ccd6f0"
+  integrity sha512-1lpknv5QXTeXk9k01GLbmxuXLyfRCGF91hVl3NF6Fedef7OJIstOmLy2VxvXoAQxrRyuYsDkEke2GJRC33mxhw==
   dependencies:
-    "@angular/cdk" "^16.0.0"
-    "@ant-design/icons-angular" "^16.0.0"
+    "@angular/cdk" "^17.0.0"
+    "@ant-design/icons-angular" "^17.0.0"
     date-fns "^2.16.1"
     tslib "^2.3.0"
 

From 25f17196b7171966c3d3b3bab808a27d1d9e5234 Mon Sep 17 00:00:00 2001
From: Joshua McMichael <jmcmichael@users.noreply.github.com>
Date: Thu, 11 Jan 2024 13:49:14 -0600
Subject: [PATCH 045/125] ngrx-component updated v16 -> v17

---
 client/package.json                           |  2 +-
 .../activity-card/activity-card.module.ts     | 20 ++++++++---------
 .../activity-feed/activity-feed.module.ts     |  8 +++----
 .../collapsible-card.module.ts                | 22 +++++++++----------
 client/yarn.lock                              |  8 +++----
 5 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/client/package.json b/client/package.json
index cf195d31a..d4f37744b 100644
--- a/client/package.json
+++ b/client/package.json
@@ -34,7 +34,7 @@
     "@angular/router": "^17.0.9",
     "@apollo/client": "^3.7.17",
     "@ngneat/until-destroy": "^9.1.2",
-    "@ngrx/component": "^16.1.0",
+    "@ngrx/component": "^17.0.1",
     "@ngx-formly/core": "^6.2.2",
     "@ngx-formly/ng-zorro-antd": "^6.2.2",
     "apollo-angular": "^5.0.0",
diff --git a/client/src/app/components/activities/activity-card/activity-card.module.ts b/client/src/app/components/activities/activity-card/activity-card.module.ts
index d4d5e1daa..99f4d93c8 100644
--- a/client/src/app/components/activities/activity-card/activity-card.module.ts
+++ b/client/src/app/components/activities/activity-card/activity-card.module.ts
@@ -1,20 +1,20 @@
-import { CommonModule } from "@angular/common";
-import { NgModule } from "@angular/core";
-import { PushModule } from "@ngrx/component";
-import { NzCardModule } from "ng-zorro-antd/card";
-import { CvcActivityCardComponent } from "./activity-card.component";
-import { CvcCommentBodyModule } from "@app/components/comments/comment-body/comment-body.module";
-import { NzDividerModule } from "ng-zorro-antd/divider";
+import { CommonModule } from '@angular/common'
+import { NgModule } from '@angular/core'
+import { PushPipe } from '@ngrx/component'
+import { NzCardModule } from 'ng-zorro-antd/card'
+import { CvcActivityCardComponent } from './activity-card.component'
+import { CvcCommentBodyModule } from '@app/components/comments/comment-body/comment-body.module'
+import { NzDividerModule } from 'ng-zorro-antd/divider'
 
 @NgModule({
   declarations: [CvcActivityCardComponent],
   imports: [
     CommonModule,
-    PushModule,
+    PushPipe,
     NzCardModule,
     NzDividerModule,
-    CvcCommentBodyModule
+    CvcCommentBodyModule,
   ],
   exports: [CvcActivityCardComponent],
 })
-export class CvcActivityCardModule {}
\ No newline at end of file
+export class CvcActivityCardModule {}
diff --git a/client/src/app/components/activities/activity-feed/activity-feed.module.ts b/client/src/app/components/activities/activity-feed/activity-feed.module.ts
index 990dd8e92..59eed1272 100644
--- a/client/src/app/components/activities/activity-feed/activity-feed.module.ts
+++ b/client/src/app/components/activities/activity-feed/activity-feed.module.ts
@@ -1,7 +1,7 @@
 import { NgModule } from '@angular/core'
 import { CommonModule } from '@angular/common'
 import { CvcActivityFeedComponent } from './activity-feed.component'
-import { LetModule, PushModule } from '@ngrx/component'
+import { LetDirective, PushPipe } from '@ngrx/component'
 import { NzCardModule } from 'ng-zorro-antd/card'
 import { NzIconModule } from 'ng-zorro-antd/icon'
 import { NzFormModule } from 'ng-zorro-antd/form'
@@ -38,8 +38,8 @@ import { CvcCollapsibleCardModule } from '../collapsible-card/collapsible-card.m
   imports: [
     CommonModule,
     FormsModule,
-    LetModule,
-    PushModule,
+    LetDirective,
+    PushPipe,
     NzButtonModule,
     NzCardModule,
     NzIconModule,
@@ -69,7 +69,7 @@ import { CvcCollapsibleCardModule } from '../collapsible-card/collapsible-card.m
     CvcMolecularProfileTagModule,
     CvcRevisionTagModule,
     CvcActivityCardModule,
-    CvcCollapsibleCardModule
+    CvcCollapsibleCardModule,
   ],
   exports: [CvcActivityFeedComponent],
 })
diff --git a/client/src/app/components/activities/collapsible-card/collapsible-card.module.ts b/client/src/app/components/activities/collapsible-card/collapsible-card.module.ts
index 8014871c6..173b1e060 100644
--- a/client/src/app/components/activities/collapsible-card/collapsible-card.module.ts
+++ b/client/src/app/components/activities/collapsible-card/collapsible-card.module.ts
@@ -1,21 +1,21 @@
-import { CommonModule } from "@angular/common";
-import { NgModule } from "@angular/core";
-import { LetModule, PushModule } from "@ngrx/component";
-import { NzCardModule } from "ng-zorro-antd/card";
-import { CvcCollapsibleCardComponent } from "./collapsible-card.component";
-import { NzButtonModule } from "ng-zorro-antd/button";
-import { NzIconModule } from "ng-zorro-antd/icon";
+import { CommonModule } from '@angular/common'
+import { NgModule } from '@angular/core'
+import { LetDirective, PushPipe } from '@ngrx/component'
+import { NzCardModule } from 'ng-zorro-antd/card'
+import { CvcCollapsibleCardComponent } from './collapsible-card.component'
+import { NzButtonModule } from 'ng-zorro-antd/button'
+import { NzIconModule } from 'ng-zorro-antd/icon'
 
 @NgModule({
   declarations: [CvcCollapsibleCardComponent],
   imports: [
     CommonModule,
-    PushModule,
-    LetModule,
+    PushPipe,
+    LetDirective,
     NzCardModule,
     NzButtonModule,
-    NzIconModule
+    NzIconModule,
   ],
   exports: [CvcCollapsibleCardComponent],
 })
-export class CvcCollapsibleCardModule {}
\ No newline at end of file
+export class CvcCollapsibleCardModule {}
diff --git a/client/yarn.lock b/client/yarn.lock
index ecc3b3cd7..f8dcbdaa0 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -2792,10 +2792,10 @@
   dependencies:
     tslib "^2.3.0"
 
-"@ngrx/component@^16.1.0":
-  version "16.1.0"
-  resolved "https://registry.yarnpkg.com/@ngrx/component/-/component-16.1.0.tgz#9158b775b1b1ac0333a8e8688df5983ff460fb26"
-  integrity sha512-QqU3gR2eHMfF3yR5H1+gtb+aNfQEzoBmbCec8Kv7liKbZODjeYpiPpU5ZEUCUQGU7DGh8/zFG7rECJ3WgyL1YQ==
+"@ngrx/component@^17.0.1":
+  version "17.0.1"
+  resolved "https://registry.yarnpkg.com/@ngrx/component/-/component-17.0.1.tgz#ad9044b1bc07f9cff75af0a8bd7ee807cd773e64"
+  integrity sha512-B38NyH18gxTjrTJOu1fc+AMwOpAaRly6hgWx7zZZtbIwo0sd/bYTZGgMrJkw/CjmvjpAVBE14fB9qI+pSUsl4A==
   dependencies:
     tslib "^2.0.0"
 

From 636d57f92f7f3dbc7fea9e9ba5f4b6d5c2c21abc Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Fri, 12 Jan 2024 11:07:12 -0600
Subject: [PATCH 046/125] scheduled tasks refresh features view, not genes

---
 server/Gemfile.lock                           | 9 ++++-----
 server/app/jobs/refresh_materialized_views.rb | 8 ++++----
 server/config/scheduled_tasks.yml             | 8 ++++----
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/server/Gemfile.lock b/server/Gemfile.lock
index 6bd733ec6..48c07f8d8 100644
--- 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)
@@ -251,11 +252,8 @@ GEM
       net-protocol
     net-ssh (7.2.0)
     nio4r (2.5.9)
-    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)
@@ -483,6 +481,7 @@ GEM
 PLATFORMS
   arm64-darwin-21
   arm64-darwin-22
+  arm64-darwin-23
   x86_64-darwin-22
   x86_64-linux
 
diff --git a/server/app/jobs/refresh_materialized_views.rb b/server/app/jobs/refresh_materialized_views.rb
index bbe888dec..a34ea339a 100644
--- a/server/app/jobs/refresh_materialized_views.rb
+++ b/server/app/jobs/refresh_materialized_views.rb
@@ -5,17 +5,17 @@ def perform(kwargs)
     to_refresh = if views == 'all'
                    [
                      MaterializedViews::DiseaseBrowseTableRow,
-                     MaterializedViews::GeneBrowseTableRow,
+                     MaterializedViews::FeatureBrowseTableRow
                      MaterializedViews::SourceBrowseTableRow,
                      MaterializedViews::VariantBrowseTableRow,
                      MaterializedViews::VariantGroupBrowseTableRow,
                      MaterializedViews::MolecularProfileBrowseTableRow
                    ]
-                 elsif views == 'gene_only'
+                 elsif views == 'features_only'
                    [
-                     MaterializedViews::GeneBrowseTableRow
+                     MaterializedViews::FeatureBrowseTableRow
                    ]
-                 elsif views == 'except_genes'
+                 elsif views == 'except_features'
                    [
                      MaterializedViews::DiseaseBrowseTableRow,
                      MaterializedViews::SourceBrowseTableRow,
diff --git a/server/config/scheduled_tasks.yml b/server/config/scheduled_tasks.yml
index 38cb68237..45810a9a0 100644
--- a/server/config/scheduled_tasks.yml
+++ b/server/config/scheduled_tasks.yml
@@ -16,13 +16,13 @@ FlagDuplicateAlleleRegistryIds:
   queue: default
   class: FlagDuplicateAlleleRegistryIds
 
-RefreshGeneView:
+RefreshFeatureView:
   cron: '0 */2 * * *'
-  description: Refresh the gene browse table view (every two hours)
+  description: Refresh the feature browse table view (every two hours)
   queue: default
   class: RefreshMaterializedViews
   args:
-    views: genes_only
+    views: features_only
 
 RefreshBrowseViews:
   cron: '*/10 * * * *'
@@ -30,7 +30,7 @@ RefreshBrowseViews:
   queue: default
   class: RefreshMaterializedViews
   args:
-    views: except_genes
+    views: except_features
 
 GenerateMonthlyTsvs:
   cron: '20 0 1 * *'

From 5ddacd284ec800409c7c8824aaf02e854b0c4c0f Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Fri, 12 Jan 2024 11:46:01 -0600
Subject: [PATCH 047/125] index features for quicksearch

---
 client/src/app/generated/civic.apollo.ts             |  2 +-
 client/src/app/generated/server.model.graphql        |  2 +-
 client/src/app/generated/server.schema.json          |  2 +-
 server/app/graphql/resolvers/quicksearch.rb          |  8 ++++----
 .../graphql/types/quicksearch/searchable_entities.rb |  2 +-
 server/app/models/feature.rb                         | 12 ++++++++++++
 server/app/models/features/gene.rb                   | 10 ----------
 7 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/client/src/app/generated/civic.apollo.ts b/client/src/app/generated/civic.apollo.ts
index 30edba0e9..2405615cd 100644
--- a/client/src/app/generated/civic.apollo.ts
+++ b/client/src/app/generated/civic.apollo.ts
@@ -4463,7 +4463,7 @@ export type SearchResult = {
 export enum SearchableEntities {
   Assertion = 'ASSERTION',
   EvidenceItem = 'EVIDENCE_ITEM',
-  Gene = 'GENE',
+  Feature = 'FEATURE',
   MolecularProfile = 'MOLECULAR_PROFILE',
   Revision = 'REVISION',
   Variant = 'VARIANT',
diff --git a/client/src/app/generated/server.model.graphql b/client/src/app/generated/server.model.graphql
index 9a4fbd3bc..9cf9a446c 100644
--- a/client/src/app/generated/server.model.graphql
+++ b/client/src/app/generated/server.model.graphql
@@ -7341,7 +7341,7 @@ type SearchResult {
 enum SearchableEntities {
   ASSERTION
   EVIDENCE_ITEM
-  GENE
+  FEATURE
   MOLECULAR_PROFILE
   REVISION
   VARIANT
diff --git a/client/src/app/generated/server.schema.json b/client/src/app/generated/server.schema.json
index b476a1c90..a95a37f8a 100644
--- a/client/src/app/generated/server.schema.json
+++ b/client/src/app/generated/server.schema.json
@@ -33886,7 +33886,7 @@
           "interfaces": null,
           "enumValues": [
             {
-              "name": "GENE",
+              "name": "FEATURE",
               "description": null,
               "isDeprecated": false,
               "deprecationReason": null
diff --git a/server/app/graphql/resolvers/quicksearch.rb b/server/app/graphql/resolvers/quicksearch.rb
index f8a0973e4..065e0a98c 100644
--- a/server/app/graphql/resolvers/quicksearch.rb
+++ b/server/app/graphql/resolvers/quicksearch.rb
@@ -10,12 +10,12 @@ class Resolvers::Quicksearch < GraphQL::Schema::Resolver
   def resolve(query:, types: nil, highlight_matches: false)
     query_targets = if types.blank?
                       [
-                       Gene, 
+                       Feature,
                        Variant,
                        EvidenceItem,
                        Assertion,
-                       VariantGroup, 
-                       Revision, 
+                       VariantGroup,
+                       Revision,
                        MolecularProfile
                       ]
                     else
@@ -33,7 +33,7 @@ def resolve(query:, types: nil, highlight_matches: false)
                   models: query_targets,
                   highlight: tag,
                   limit: 10,
-                  fields: ['id^10', 'name', 'aliases', 'gene']
+                  fields: ['id^10', 'name', 'aliases', 'gene', 'feature_type']
                 ).with_highlights(multiple: true)
 
     results.map do |res, highlights|
diff --git a/server/app/graphql/types/quicksearch/searchable_entities.rb b/server/app/graphql/types/quicksearch/searchable_entities.rb
index 924096d47..1d3c6b7a4 100644
--- a/server/app/graphql/types/quicksearch/searchable_entities.rb
+++ b/server/app/graphql/types/quicksearch/searchable_entities.rb
@@ -1,6 +1,6 @@
 module Types::Quicksearch
   class SearchableEntities < Types::BaseEnum
-    value 'GENE', value: Features::Gene
+    value 'FEATURE', value: Feature
     value 'VARIANT', value: Variant
     value 'EVIDENCE_ITEM', value: EvidenceItem
     value 'ASSERTION', value: Assertion
diff --git a/server/app/models/feature.rb b/server/app/models/feature.rb
index 7955c63c0..282f5138d 100644
--- a/server/app/models/feature.rb
+++ b/server/app/models/feature.rb
@@ -11,6 +11,18 @@ class Feature < ApplicationRecord
 
   has_many :variants
 
+  searchkick highlight: [:name, :aliases, :feature_type], callbacks: :async
+  scope :search_import, -> { includes(:feature_aliases) }
+
+  def search_data
+    {
+      name: name,
+      aliases: feature_aliases.map(&:name),
+      feature_type: feature_instance_type.demodulize
+    }
+  end
+
+
   def link
     Rails.application.routes.url_helpers.url_for("/features/#{self.id}")
   end
diff --git a/server/app/models/features/gene.rb b/server/app/models/features/gene.rb
index e218732d5..6d360d579 100644
--- a/server/app/models/features/gene.rb
+++ b/server/app/models/features/gene.rb
@@ -11,16 +11,6 @@ class Gene < ActiveRecord::Base
 
     has_many :comment_mentions, foreign_key: :comment_id, class_name: 'EntityMention'
 
-    searchkick highlight: [:symbol, :aliases], callbacks: :async
-    scope :search_import, -> { includes(:gene_aliases) }
-
-    def search_data
-      {
-        name: name,
-        aliases: gene_aliases.map(&:name)
-      }
-    end
-
     def display_name
       name
     end

From ee9b67444a1a61d7243ad4ae0d0e607319f06fd2 Mon Sep 17 00:00:00 2001
From: Joshua McMichael <jmcmichael@users.noreply.github.com>
Date: Tue, 16 Jan 2024 10:08:56 -0600
Subject: [PATCH 048/125] fixed sidebar menu for updated zorro dark styles

---
 client/src/app/layout/layout.component.html | 84 +++++++--------------
 client/src/app/layout/layout.component.less |  6 +-
 2 files changed, 33 insertions(+), 57 deletions(-)

diff --git a/client/src/app/layout/layout.component.html b/client/src/app/layout/layout.component.html
index 520a649d2..95e8b941a 100644
--- a/client/src/app/layout/layout.component.html
+++ b/client/src/app/layout/layout.component.html
@@ -37,12 +37,11 @@
             nz-tooltip
             nzTooltipPlacement="right"
             [nzTooltipTitle]="isCollapsed ? 'Assertions' : ''"
-            nzSelected
             nzMatchRouter>
             <i
               nz-icon
               nzType="civic-assertion"></i>
-            <span> <a routerLink="/assertions">Assertions</a> </span>
+            <a routerLink="/assertions">Assertions</a>
           </li>
 
           <li
@@ -50,12 +49,11 @@
             nz-tooltip
             nzTooltipPlacement="right"
             [nzTooltipTitle]="isCollapsed ? 'Evidence' : ''"
-            nzSelected
             nzMatchRouter>
             <i
               nz-icon
               nzType="civic-evidence"></i>
-            <span> <a routerLink="/evidence">Evidence</a> </span>
+            <a routerLink="/evidence">Evidence</a>
           </li>
 
           <li
@@ -63,14 +61,11 @@
             nz-tooltip
             nzTooltipPlacement="right"
             [nzTooltipTitle]="isCollapsed ? 'Molecular Profiles' : ''"
-            nzSelected
             nzMatchRouter>
             <i
               nz-icon
               nzType="civic-molecularprofile"></i>
-            <span>
-              <a routerLink="/molecular-profiles">Molecular Profiles</a>
-            </span>
+            <a routerLink="/molecular-profiles">Molecular Profiles</a>
           </li>
 
           <li
@@ -78,12 +73,11 @@
             nz-tooltip
             nzTooltipPlacement="right"
             [nzTooltipTitle]="isCollapsed ? 'Genes' : ''"
-            nzSelected
             nzMatchRouter>
             <i
               nz-icon
               nzType="civic-gene"></i>
-            <span> <a routerLink="/genes">Genes</a> </span>
+            <a routerLink="/genes">Genes</a>
           </li>
 
           <li
@@ -96,7 +90,7 @@
             <i
               nz-icon
               nzType="civic-variant"></i>
-            <span> <a routerLink="/variants">Variants</a> </span>
+            <a routerLink="/variants">Variants</a>
           </li>
 
           <li
@@ -109,7 +103,7 @@
             <i
               nz-icon
               nzType="civic-variantgroup"></i>
-            <span> <a routerLink="/variant-groups">Variant Groups</a> </span>
+            <a routerLink="/variant-groups">Variant Groups</a>
           </li>
         </ul>
       </li>
@@ -119,12 +113,11 @@
         nz-tooltip
         nzTooltipPlacement="right"
         [nzTooltipTitle]="isCollapsed ? 'Clinical Trials' : ''"
-        nzSelected
         nzMatchRouter>
         <i
           nz-icon
           nzType="civic-clinicaltrial"></i>
-        <span> <a routerLink="/clinical-trials">Clinical Trials</a> </span>
+        <a routerLink="/clinical-trials">Clinical Trials</a>
       </li>
 
       <li
@@ -132,12 +125,11 @@
         nz-tooltip
         nzTooltipPlacement="right"
         [nzTooltipTitle]="isCollapsed ? 'Diseases' : ''"
-        nzSelected
         nzMatchRouter>
         <i
           nz-icon
           nzType="civic-disease"></i>
-        <span> <a routerLink="/diseases">Diseases</a> </span>
+        <a routerLink="/diseases">Diseases</a>
       </li>
 
       <li
@@ -145,12 +137,11 @@
         nz-tooltip
         nzTooltipPlacement="right"
         [nzTooltipTitle]="isCollapsed ? 'Therapies' : ''"
-        nzSelected
         nzMatchRouter>
         <i
           nz-icon
           nzType="civic-therapy"></i>
-        <span> <a routerLink="/therapies">Therapies</a> </span>
+        <a routerLink="/therapies">Therapies</a>
       </li>
 
       <li
@@ -158,12 +149,11 @@
         nz-tooltip
         nzTooltipPlacement="right"
         [nzTooltipTitle]="isCollapsed ? 'Phenotypes' : ''"
-        nzSelected
         nzMatchRouter>
         <i
           nz-icon
           nzType="civic-phenotype"></i>
-        <span> <a routerLink="/phenotypes">Phenotypes</a> </span>
+        <a routerLink="/phenotypes">Phenotypes</a>
       </li>
 
       <li
@@ -176,7 +166,7 @@
         <i
           nz-icon
           nzType="civic-source"></i>
-        <span> <a routerLink="/sources">Sources</a> </span>
+        <a routerLink="/sources">Sources</a>
       </li>
 
       <li
@@ -184,12 +174,11 @@
         nz-tooltip
         nzTooltipPlacement="right"
         [nzTooltipTitle]="isCollapsed ? 'Variant Types' : ''"
-        nzSelected
         nzMatchRouter>
         <i
           nz-icon
           nzType="civic-varianttype"></i>
-        <span> <a routerLink="/variant-types">Variant Types</a> </span>
+        <a routerLink="/variant-types">Variant Types</a>
       </li>
 
       <li
@@ -201,28 +190,22 @@
             nz-tooltip
             nzTooltipPlacement="right"
             [nzTooltipTitle]="isCollapsed ? 'Activity' : ''"
-            nzSelected
             nzMatchRouter>
             <i
               nz-icon
               nzType="civic-event"></i>
-            <span>
-              <a routerLink="/curation/activity"> Activity </a>
-            </span>
+            <a routerLink="/curation/activity"> Activity </a>
           </li>
           <li
             nz-menu-item
             nz-tooltip
             nzTooltipPlacement="right"
             [nzTooltipTitle]="isCollapsed ? 'Pending Queues' : ''"
-            nzSelected
             nzMatchRouter>
             <i
               nz-icon
               nzType="civic-queue"></i>
-            <span>
-              <a routerLink="/curation/queues">Queues</a>
-            </span>
+            <a routerLink="/curation/queues">Queues</a>
           </li>
         </ul>
       </li>
@@ -235,18 +218,15 @@
             nz-tooltip
             nzTooltipPlacement="right"
             [nzTooltipTitle]="isCollapsed ? 'Users' : ''"
-            nzSelected
             nzMatchRouter>
             <i
               nz-icon
               nzType="civic-curator"></i>
-            <span>
-              <a
-                routerLink="/users"
-                id="main-users"
-                >Contributors</a
-              >
-            </span>
+            <a
+              routerLink="/users"
+              id="main-users"
+              >Contributors</a
+            >
           </li>
 
           <li
@@ -254,18 +234,15 @@
             nz-tooltip
             nzTooltipPlacement="right"
             [nzTooltipTitle]="isCollapsed ? 'Organizations' : ''"
-            nzSelected
             nzMatchRouter>
             <i
               nz-icon
               nzType="civic-organization"></i>
-            <span>
-              <a
-                routerLink="/organizations"
-                id="main-organization"
-                >Organizations</a
-              >
-            </span>
+            <a
+              routerLink="/organizations"
+              id="main-organization"
+              >Organizations</a
+            >
           </li>
         </ul>
       </li>
@@ -278,18 +255,15 @@
             nz-tooltip
             nzTooltipPlacement="right"
             [nzTooltipTitle]="isCollapsed ? 'Data Releases' : ''"
-            nzSelected
             nzMatchRouter>
             <i
               nz-icon
               nzType="download"></i>
-            <span>
-              <a
-                routerLink="/releases"
-                id="releases">
-                Data Releases
-              </a>
-            </span>
+            <a
+              routerLink="/releases"
+              id="releases">
+              Data Releases
+            </a>
           </li>
         </ul>
       </li>
diff --git a/client/src/app/layout/layout.component.less b/client/src/app/layout/layout.component.less
index 9a310c527..371898009 100644
--- a/client/src/app/layout/layout.component.less
+++ b/client/src/app/layout/layout.component.less
@@ -41,8 +41,10 @@ nz-sider {
 
 .sidebar-menu {
   margin-top: -20px; // removes gap caused by home link's empty menu-group title
-  ::ng-deep .ant-menu-item-group-title {
-    padding-bottom: 0;
+  ::ng-deep .ant-menu-title-content {
+    .anticon {
+      margin-right: 4px;
+    }
   }
   &.is-collapsed {
     // adjusts menu for collapsed state

From c505220eb28a97e371ed704f99a5fd0ed59591e1 Mon Sep 17 00:00:00 2001
From: Joshua McMichael <jmcmichael@users.noreply.github.com>
Date: Tue, 16 Jan 2024 11:52:46 -0600
Subject: [PATCH 049/125] downgraded zorro, to v17.0.0, latest has missing
 tbody style bug (see #8352)

---
 client/package.json |  4 ++--
 client/yarn.lock    | 39 ++++++++++++++++++++++++---------------
 2 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/client/package.json b/client/package.json
index d4f37744b..bd2f1e5eb 100644
--- a/client/package.json
+++ b/client/package.json
@@ -38,7 +38,7 @@
     "@ngx-formly/core": "^6.2.2",
     "@ngx-formly/ng-zorro-antd": "^6.2.2",
     "apollo-angular": "^5.0.0",
-    "ng-zorro-antd": "^17.1.0",
+    "ng-zorro-antd": "17.0.0",
     "ngx-cookie-service": "^16.0.0",
     "rxjs": "^7.8.1",
     "rxjs-etc": "^10.6.2",
@@ -79,4 +79,4 @@
       "error-stack-parser": "2.0.6"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/client/yarn.lock b/client/yarn.lock
index f8dcbdaa0..5ee2bec39 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -280,11 +280,11 @@
     tslib "^2.3.0"
 
 "@ant-design/colors@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@ant-design/colors/-/colors-7.0.0.tgz#eb7eecead124c3533aea05d61254f0a17f2b61b3"
-  integrity sha512-iVm/9PfGCbC0dSMBrz7oiEXZaaGH7ceU40OJEfKmyuzR9R5CRimJYPlRiFtMQGQcbNMea/ePcoIebi4ASGYXtg==
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/@ant-design/colors/-/colors-7.0.2.tgz#c5c753a467ce8d86ba7ca4736d2c01f599bb5492"
+  integrity sha512-7KJkhTiPiLHSu+LmMJnehfJ6242OCxSlR3xHVBecYxnMW8MS/878NXct1GqYARyL59fyeFdKRxXTfvR9SnDgJg==
   dependencies:
-    "@ctrl/tinycolor" "^3.4.0"
+    "@ctrl/tinycolor" "^3.6.1"
 
 "@ant-design/icons-angular@^17.0.0":
   version "17.0.0"
@@ -1837,6 +1837,13 @@
   dependencies:
     regenerator-runtime "^0.13.11"
 
+"@babel/runtime@^7.21.0":
+  version "7.23.8"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.8.tgz#8ee6fe1ac47add7122902f257b8ddf55c898f650"
+  integrity sha512-Y7KbAP984rn1VGMbGqKmBLio9V7y5Je9GvU4rQPCPinCyNfUcToxIXl06d59URp/F3LwinvODxab5N/G6qggkw==
+  dependencies:
+    regenerator-runtime "^0.14.0"
+
 "@babel/template@^7.18.10", "@babel/template@^7.20.7":
   version "7.20.7"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz#a15090c2839a83b02aa996c0b4994005841fd5a8"
@@ -1939,10 +1946,10 @@
   dependencies:
     "@jridgewell/trace-mapping" "0.3.9"
 
-"@ctrl/tinycolor@^3.4.0":
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/@ctrl/tinycolor/-/tinycolor-3.6.0.tgz#53fa5fe9c34faee89469e48f91d51a3766108bc8"
-  integrity sha512-/Z3l6pXthq0JvMYdUFyX9j0MaCltlIn6mfh9jLyQwg5aPKxkyNa0PTHtU1AlFXLNk55ZuAeJRcpvq+tmLfKmaQ==
+"@ctrl/tinycolor@^3.6.1":
+  version "3.6.1"
+  resolved "https://registry.yarnpkg.com/@ctrl/tinycolor/-/tinycolor-3.6.1.tgz#b6c75a56a1947cc916ea058772d666a2c8932f31"
+  integrity sha512-SITSV6aIXsuVNV3f3O0f2n/cgyEDWoSqtZMYiAmcsYHydcKrOz3gUxB/iXd/Qf08+IZX4KpgNbvUdMBmWz+kcA==
 
 "@discoveryjs/json-ext@0.5.7":
   version "0.5.7"
@@ -4906,9 +4913,11 @@ dataloader@2.1.0:
   integrity sha512-qTcEYLen3r7ojZNgVUaRggOI+KM7jrKxXeSHhogh/TWxYMeONEMqY+hmkobiYQozsGIyg9OYVzO4ZIfoB4I0pQ==
 
 date-fns@^2.16.1:
-  version "2.29.3"
-  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.29.3.tgz#27402d2fc67eb442b511b70bbdf98e6411cd68a8"
-  integrity sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA==
+  version "2.30.0"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.30.0.tgz#f367e644839ff57894ec6ac480de40cae4b0f4d0"
+  integrity sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==
+  dependencies:
+    "@babel/runtime" "^7.21.0"
 
 debounce@^1.2.0:
   version "1.2.1"
@@ -7563,10 +7572,10 @@ neo-async@^2.6.2:
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
   integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
 
-ng-zorro-antd@^17.1.0:
-  version "17.1.0"
-  resolved "https://registry.yarnpkg.com/ng-zorro-antd/-/ng-zorro-antd-17.1.0.tgz#0af10f4994489b6be3d9dc90f463a714f4ccd6f0"
-  integrity sha512-1lpknv5QXTeXk9k01GLbmxuXLyfRCGF91hVl3NF6Fedef7OJIstOmLy2VxvXoAQxrRyuYsDkEke2GJRC33mxhw==
+ng-zorro-antd@17.0.0:
+  version "17.0.0"
+  resolved "https://registry.yarnpkg.com/ng-zorro-antd/-/ng-zorro-antd-17.0.0.tgz#af14c43733ecb65d3bdf8a8fa3762e178f6dba06"
+  integrity sha512-FzJm59X2LE4rEXGwcoY/pXXXxE8/ayVItNeifXmtRgbVMZ0Rf+EGVssQWkCzs7W1w19HHc6Ocp8L6mMQzqCcuQ==
   dependencies:
     "@angular/cdk" "^17.0.0"
     "@ant-design/icons-angular" "^17.0.0"

From d831977364f6b699a853c84d050325fa7791ec6e Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Tue, 16 Jan 2024 15:04:27 -0600
Subject: [PATCH 050/125] display feature/variant tags and allow searching over
 both in the browse table view

---
 .../molecular-profile-table.component.html    | 33 ++-----
 .../molecular-profile-table.component.ts      |  9 +-
 .../molecular-profile-table.query.gql         | 11 +--
 .../tag-overflow/tag-overflow.component.html  | 10 ++-
 .../tag-overflow/tag-overflow.component.ts    | 33 +++++--
 .../tag-overflow/tag-overflow.module.ts       |  2 +
 .../src/app/generated/civic.apollo-helpers.ts |  6 +-
 client/src/app/generated/civic.apollo.ts      | 17 ++--
 client/src/app/generated/server.model.graphql |  2 +-
 client/src/app/generated/server.schema.json   | 36 +++-----
 .../resolvers/browse_molecular_profiles.rb    |  6 +-
 .../browse_molecular_profile_type.rb          | 23 ++++-
 server/app/graphql/types/linkable_tag.rb      |  1 +
 ...profile_browse_table_rows_to_version_12.rb |  5 ++
 server/db/schema.rb                           | 90 ++++++++++---------
 ...olecular_profile_browse_table_rows_v12.sql | 40 +++++++++
 16 files changed, 196 insertions(+), 128 deletions(-)
 create mode 100644 server/db/migrate/20240112212453_update_molecular_profile_browse_table_rows_to_version_12.rb
 create mode 100644 server/db/views/molecular_profile_browse_table_rows_v12.sql

diff --git a/client/src/app/components/molecular-profiles/molecular-profile-table/molecular-profile-table.component.html b/client/src/app/components/molecular-profiles/molecular-profile-table/molecular-profile-table.component.html
index 9a40965df..fc1ec2f83 100644
--- a/client/src/app/components/molecular-profiles/molecular-profile-table/molecular-profile-table.component.html
+++ b/client/src/app/components/molecular-profiles/molecular-profile-table/molecular-profile-table.component.html
@@ -51,15 +51,8 @@
           nzLeft>
           Name
         </th>
-        <th nzWidth="100px">
-          Aliases
-        </th>
-        <th nzWidth="150px">
-          Features
-        </th>
-        <th nzWidth="200px">
-          Variants
-        </th>
+        <th nzWidth="110px">Aliases</th>
+        <th nzWidth="350px">Variants</th>
         <th nzWidth="250px">Diseases</th>
         <th nzWidth="180px">Therapies</th>
         <th
@@ -129,21 +122,14 @@
               filterChange$.next()
             "></cvc-clearable-input-filter>
         </th>
-        <th nzWidth="100px">
+        <th nzWidth="110px">
           <cvc-clearable-input-filter
             [(inputModel)]="aliasInput"
             (inputModelChange)="
               filterChange$.next()
             "></cvc-clearable-input-filter>
         </th>
-        <th nzWidth="150px">
-          <cvc-clearable-input-filter
-            [(inputModel)]="featureNameInput"
-            (inputModelChange)="
-              filterChange$.next()
-            "></cvc-clearable-input-filter>
-        </th>
-        <th nzWidth="200px">
+        <th nzWidth="350px">
           <cvc-clearable-input-filter
             [(inputModel)]="variantNameInput"
             (inputModelChange)="
@@ -198,16 +184,9 @@
           </td>
           <td>
             <cvc-tag-overflow
-              tagType="feature"
-              [tags]="mp.features"
-              [maxDisplayCount]="1"
-              [matchingText]="featureNameInput"></cvc-tag-overflow>
-          </td>
-          <td>
-            <cvc-tag-overflow
-              tagType="variant"
+              tagType="variant-feature"
               [tags]="mp.variants"
-              [maxDisplayCount]="1"
+              [maxDisplayCount]="2"
               [matchingText]="variantNameInput"></cvc-tag-overflow>
           </td>
           <td>
diff --git a/client/src/app/components/molecular-profiles/molecular-profile-table/molecular-profile-table.component.ts b/client/src/app/components/molecular-profiles/molecular-profile-table/molecular-profile-table.component.ts
index d4bf208da..da9b5725c 100644
--- a/client/src/app/components/molecular-profiles/molecular-profile-table/molecular-profile-table.component.ts
+++ b/client/src/app/components/molecular-profiles/molecular-profile-table/molecular-profile-table.component.ts
@@ -32,7 +32,6 @@ import {
   filter,
   map,
   skip,
-  take,
   takeWhile,
   withLatestFrom,
 } from 'rxjs/operators'
@@ -40,7 +39,6 @@ import { pluck } from 'rxjs-etc/operators'
 
 export interface MolecularProfileTableUserFilters {
   variantNameInput?: Maybe<string>
-  featureNameInput?: Maybe<string>
   diseaseNameInput?: Maybe<string>
   therapyNameInput?: Maybe<string>
 }
@@ -92,7 +90,6 @@ export class CvcMolecularProfilesTableComponent implements OnInit {
   // filters
   mpNameInput: Maybe<string>
   variantNameInput: Maybe<string>
-  featureNameInput: Maybe<string>
   diseaseNameInput: Maybe<string>
   therapyNameInput: Maybe<string>
   aliasInput: Maybe<string>
@@ -209,7 +206,6 @@ export class CvcMolecularProfilesTableComponent implements OnInit {
         therapyName: this.therapyNameInput,
         variantName: this.variantNameInput ? this.variantNameInput : undefined,
         molecularProfileAlias: this.aliasInput ? this.aliasInput : undefined,
-        featureName: this.featureNameInput,
       })
       .then(() => this.scrollIndex$.next(0))
 
@@ -217,7 +213,10 @@ export class CvcMolecularProfilesTableComponent implements OnInit {
   }
 
   // virtual scroll helpers
-  trackByIndex(_: number, data: Maybe<BrowseMolecularProfilesFieldsFragment>): Maybe<number> {
+  trackByIndex(
+    _: number,
+    data: Maybe<BrowseMolecularProfilesFieldsFragment>
+  ): Maybe<number> {
     return data?.id
   }
 }
diff --git a/client/src/app/components/molecular-profiles/molecular-profile-table/molecular-profile-table.query.gql b/client/src/app/components/molecular-profiles/molecular-profile-table/molecular-profile-table.query.gql
index 0da12d961..4c7934e1c 100644
--- a/client/src/app/components/molecular-profiles/molecular-profile-table/molecular-profile-table.query.gql
+++ b/client/src/app/components/molecular-profiles/molecular-profile-table/molecular-profile-table.query.gql
@@ -54,15 +54,16 @@ fragment BrowseMolecularProfilesFields on BrowseMolecularProfile {
   aliases {
     name
   }
-  features {
-    id
-    name
-    link
-  }
   variants {
     id
     name
     link
+    matchText
+    feature {
+      id
+      link
+      name
+    }
   }
   therapies {
     id
diff --git a/client/src/app/components/shared/tag-overflow/tag-overflow.component.html b/client/src/app/components/shared/tag-overflow/tag-overflow.component.html
index 578146cdc..b3c91a41b 100644
--- a/client/src/app/components/shared/tag-overflow/tag-overflow.component.html
+++ b/client/src/app/components/shared/tag-overflow/tag-overflow.component.html
@@ -3,7 +3,7 @@
     *ngFor="let tag of displayedTags"
     [ngClass]="{
       'matched-tag':
-        matchingText && tag.name.toLowerCase().includes(matchingText)
+        matchingText && tag.matchText!.toLowerCase().includes(matchingText)
     }">
     <ng-container
       [ngTemplateOutlet]="tagTemplate"
@@ -31,7 +31,8 @@
           *ngFor="let tag of hiddenTags"
           [ngClass]="{
             'matched-tag':
-              matchingText && tag.name.toLowerCase().includes(matchingText)
+              matchingText &&
+              tag.matchText!.toLowerCase().includes(matchingText)
           }">
           <ng-container [ngSwitch]="tagType">
             <ng-container
@@ -74,5 +75,10 @@
     <ng-container *ngSwitchCase="'variant-type'">
       <cvc-variant-type-tag [variantType]="tag"></cvc-variant-type-tag>
     </ng-container>
+    <ng-container *ngSwitchCase="'variant-feature'">
+      <cvc-feature-variant-tag
+        [truncateLongName]="true"
+        [variant]="tag"></cvc-feature-variant-tag>
+    </ng-container>
   </ng-container>
 </ng-template>
diff --git a/client/src/app/components/shared/tag-overflow/tag-overflow.component.ts b/client/src/app/components/shared/tag-overflow/tag-overflow.component.ts
index 56a125bfb..b2d55fc5e 100644
--- a/client/src/app/components/shared/tag-overflow/tag-overflow.component.ts
+++ b/client/src/app/components/shared/tag-overflow/tag-overflow.component.ts
@@ -4,16 +4,39 @@ import {
   Component,
   Input,
   OnChanges,
+  OnInit,
   SimpleChanges,
 } from '@angular/core'
 import { Maybe } from '@app/generated/civic.apollo'
 
-export type SupportedPileupTags = 'therapy' | 'disease' | 'gene' | 'feature' | 'organization' | 'variant' | 'variant-type'
+export type SupportedPileupTags =
+  | 'therapy'
+  | 'disease'
+  | 'gene'
+  | 'feature'
+  | 'organization'
+  | 'variant'
+  | 'variant-type'
+  | 'variant-feature'
 
 export type TagInfo = {
   id: number
   name: string
   link: string
+  matchText?: string
+}
+
+function populateMatchText(input: Maybe<TagInfo[]>): Maybe<TagInfo[]> {
+  return input?.map((t) => {
+    if (!t.matchText) {
+      return {
+        ...t,
+        matchText: t.name,
+      }
+    } else {
+      return t
+    }
+  })
 }
 
 @Component({
@@ -23,7 +46,7 @@ export type TagInfo = {
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class CvcTagOverflowComponent implements OnChanges {
-  @Input() tags: Maybe<TagInfo[]>
+  @Input({ transform: populateMatchText }) tags: Maybe<TagInfo[]>
   @Input() maxDisplayCount: number = 2
   @Input() matchingText?: string
   @Input() tagType: Maybe<SupportedPileupTags>
@@ -33,15 +56,15 @@ export class CvcTagOverflowComponent implements OnChanges {
   hiddenTags?: TagInfo[]
   hiddenCount?: number
   matchedHiddenCount: number = 0
+
   constructor(private cdr: ChangeDetectorRef) {}
+
   ngOnChanges(_: SimpleChanges): void {
     // if (this.thisOne) console.log(changes);
-
     // displayedTags: this.displayedTags,
     // hiddenTags: this.hiddenTags,
     // hiddenCount: this.hiddenCount,
     // matchingText: this.matchingText
-
     this.calculateDisplayedTags()
   }
 
@@ -55,7 +78,7 @@ export class CvcTagOverflowComponent implements OnChanges {
       if (this.hiddenTags) {
         let text = this.matchingText.toLowerCase()
         this.hiddenTags.forEach((t) => {
-          if (t.name.toLowerCase().includes(text)) {
+          if (t.matchText!.toLowerCase().includes(text)) {
             this.matchedHiddenCount += 1
           }
         })
diff --git a/client/src/app/components/shared/tag-overflow/tag-overflow.module.ts b/client/src/app/components/shared/tag-overflow/tag-overflow.module.ts
index b584cb302..beeee7286 100644
--- a/client/src/app/components/shared/tag-overflow/tag-overflow.module.ts
+++ b/client/src/app/components/shared/tag-overflow/tag-overflow.module.ts
@@ -10,6 +10,7 @@ import { CvcVariantTagModule } from '@app/components/variants/variant-tag/varian
 import { CvcTherapyTagModule } from '@app/components/therapies/cvc-therapy-tag/cvc-therapy-tag.module'
 import { CvcVariantTypeTagModule } from '@app/components/variant-types/variant-type-tag/variant-type-tag.module'
 import { CvcFeatureTagModule } from '@app/components/features/feature-tag/feature-tag.module'
+import { CvcFeatureVariantTagModule } from '../feature-variant-tag/feature-variant-tag.module'
 
 @NgModule({
   declarations: [CvcTagOverflowComponent],
@@ -24,6 +25,7 @@ import { CvcFeatureTagModule } from '@app/components/features/feature-tag/featur
     CvcFeatureTagModule,
     CvcVariantTagModule,
     CvcVariantTypeTagModule,
+    CvcFeatureVariantTagModule,
   ],
   exports: [CvcTagOverflowComponent],
 })
diff --git a/client/src/app/generated/civic.apollo-helpers.ts b/client/src/app/generated/civic.apollo-helpers.ts
index 350f2c210..8234cdb1e 100644
--- a/client/src/app/generated/civic.apollo-helpers.ts
+++ b/client/src/app/generated/civic.apollo-helpers.ts
@@ -219,13 +219,12 @@ export type BrowseFeatureEdgeFieldPolicy = {
 	cursor?: FieldPolicy<any> | FieldReadFunction<any>,
 	node?: FieldPolicy<any> | FieldReadFunction<any>
 };
-export type BrowseMolecularProfileKeySpecifier = ('aliases' | 'assertionCount' | 'diseases' | 'evidenceItemCount' | 'features' | 'id' | 'link' | 'molecularProfileScore' | 'name' | 'therapies' | 'variantCount' | 'variants' | BrowseMolecularProfileKeySpecifier)[];
+export type BrowseMolecularProfileKeySpecifier = ('aliases' | 'assertionCount' | 'diseases' | 'evidenceItemCount' | 'id' | 'link' | 'molecularProfileScore' | 'name' | 'therapies' | 'variantCount' | 'variants' | BrowseMolecularProfileKeySpecifier)[];
 export type BrowseMolecularProfileFieldPolicy = {
 	aliases?: FieldPolicy<any> | FieldReadFunction<any>,
 	assertionCount?: FieldPolicy<any> | FieldReadFunction<any>,
 	diseases?: FieldPolicy<any> | FieldReadFunction<any>,
 	evidenceItemCount?: FieldPolicy<any> | FieldReadFunction<any>,
-	features?: FieldPolicy<any> | FieldReadFunction<any>,
 	id?: FieldPolicy<any> | FieldReadFunction<any>,
 	link?: FieldPolicy<any> | FieldReadFunction<any>,
 	molecularProfileScore?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -1001,12 +1000,13 @@ export type LinkableTherapyFieldPolicy = {
 	link?: FieldPolicy<any> | FieldReadFunction<any>,
 	name?: FieldPolicy<any> | FieldReadFunction<any>
 };
-export type LinkableVariantKeySpecifier = ('deprecated' | 'feature' | 'id' | 'link' | 'name' | LinkableVariantKeySpecifier)[];
+export type LinkableVariantKeySpecifier = ('deprecated' | 'feature' | 'id' | 'link' | 'matchText' | 'name' | LinkableVariantKeySpecifier)[];
 export type LinkableVariantFieldPolicy = {
 	deprecated?: FieldPolicy<any> | FieldReadFunction<any>,
 	feature?: FieldPolicy<any> | FieldReadFunction<any>,
 	id?: FieldPolicy<any> | FieldReadFunction<any>,
 	link?: FieldPolicy<any> | FieldReadFunction<any>,
+	matchText?: FieldPolicy<any> | FieldReadFunction<any>,
 	name?: FieldPolicy<any> | FieldReadFunction<any>
 };
 export type LinkableVariantTypeKeySpecifier = ('id' | 'link' | 'name' | LinkableVariantTypeKeySpecifier)[];
diff --git a/client/src/app/generated/civic.apollo.ts b/client/src/app/generated/civic.apollo.ts
index 2405615cd..63095f4b6 100644
--- a/client/src/app/generated/civic.apollo.ts
+++ b/client/src/app/generated/civic.apollo.ts
@@ -592,7 +592,6 @@ export type BrowseMolecularProfile = {
   assertionCount: Scalars['Int'];
   diseases: Array<LinkableDisease>;
   evidenceItemCount: Scalars['Int'];
-  features: Array<LinkableFeature>;
   id: Scalars['Int'];
   link: Scalars['String'];
   molecularProfileScore: Scalars['Float'];
@@ -2404,6 +2403,7 @@ export type LinkableVariant = {
   feature?: Maybe<LinkableFeature>;
   id: Scalars['Int'];
   link: Scalars['String'];
+  matchText?: Maybe<Scalars['String']>;
   name: Scalars['String'];
 };
 
@@ -6310,9 +6310,9 @@ export type BrowseMolecularProfilesQueryVariables = Exact<{
 }>;
 
 
-export type BrowseMolecularProfilesQuery = { __typename: 'Query', browseMolecularProfiles: { __typename: 'BrowseMolecularProfileConnection', lastUpdated: any, filteredCount: number, pageCount: number, pageInfo: { __typename: 'PageInfo', endCursor?: string | undefined, hasNextPage: boolean, startCursor?: string | undefined, hasPreviousPage: boolean }, edges: Array<{ __typename: 'BrowseMolecularProfileEdge', cursor: string, node?: { __typename: 'BrowseMolecularProfile', id: number, name: string, evidenceItemCount: number, molecularProfileScore: number, assertionCount: number, variantCount: number, link: string, aliases: Array<{ __typename: 'MolecularProfileAlias', name: string }>, features: Array<{ __typename: 'LinkableFeature', id: number, name: string, link: string }>, variants: Array<{ __typename: 'LinkableVariant', id: number, name: string, link: string }>, therapies: Array<{ __typename: 'LinkableTherapy', id: number, name: string, link: string }>, diseases: Array<{ __typename: 'LinkableDisease', id: number, name: string, link: string }> } | undefined }> } };
+export type BrowseMolecularProfilesQuery = { __typename: 'Query', browseMolecularProfiles: { __typename: 'BrowseMolecularProfileConnection', lastUpdated: any, filteredCount: number, pageCount: number, pageInfo: { __typename: 'PageInfo', endCursor?: string | undefined, hasNextPage: boolean, startCursor?: string | undefined, hasPreviousPage: boolean }, edges: Array<{ __typename: 'BrowseMolecularProfileEdge', cursor: string, node?: { __typename: 'BrowseMolecularProfile', id: number, name: string, evidenceItemCount: number, molecularProfileScore: number, assertionCount: number, variantCount: number, link: string, aliases: Array<{ __typename: 'MolecularProfileAlias', name: string }>, variants: Array<{ __typename: 'LinkableVariant', id: number, name: string, link: string, matchText?: string | undefined, feature?: { __typename: 'LinkableFeature', id: number, link: string, name: string } | undefined }>, therapies: Array<{ __typename: 'LinkableTherapy', id: number, name: string, link: string }>, diseases: Array<{ __typename: 'LinkableDisease', id: number, name: string, link: string }> } | undefined }> } };
 
-export type BrowseMolecularProfilesFieldsFragment = { __typename: 'BrowseMolecularProfile', id: number, name: string, evidenceItemCount: number, molecularProfileScore: number, assertionCount: number, variantCount: number, link: string, aliases: Array<{ __typename: 'MolecularProfileAlias', name: string }>, features: Array<{ __typename: 'LinkableFeature', id: number, name: string, link: string }>, variants: Array<{ __typename: 'LinkableVariant', id: number, name: string, link: string }>, therapies: Array<{ __typename: 'LinkableTherapy', id: number, name: string, link: string }>, diseases: Array<{ __typename: 'LinkableDisease', id: number, name: string, link: string }> };
+export type BrowseMolecularProfilesFieldsFragment = { __typename: 'BrowseMolecularProfile', id: number, name: string, evidenceItemCount: number, molecularProfileScore: number, assertionCount: number, variantCount: number, link: string, aliases: Array<{ __typename: 'MolecularProfileAlias', name: string }>, variants: Array<{ __typename: 'LinkableVariant', id: number, name: string, link: string, matchText?: string | undefined, feature?: { __typename: 'LinkableFeature', id: number, link: string, name: string } | undefined }>, therapies: Array<{ __typename: 'LinkableTherapy', id: number, name: string, link: string }>, diseases: Array<{ __typename: 'LinkableDisease', id: number, name: string, link: string }> };
 
 export type MolecularProfileMenuQueryVariables = Exact<{
   geneId?: InputMaybe<Scalars['Int']>;
@@ -8423,15 +8423,16 @@ export const BrowseMolecularProfilesFieldsFragmentDoc = gql`
   aliases {
     name
   }
-  features {
-    id
-    name
-    link
-  }
   variants {
     id
     name
     link
+    matchText
+    feature {
+      id
+      link
+      name
+    }
   }
   therapies {
     id
diff --git a/client/src/app/generated/server.model.graphql b/client/src/app/generated/server.model.graphql
index 9cf9a446c..35101893a 100644
--- a/client/src/app/generated/server.model.graphql
+++ b/client/src/app/generated/server.model.graphql
@@ -998,7 +998,6 @@ type BrowseMolecularProfile {
   assertionCount: Int!
   diseases: [LinkableDisease!]!
   evidenceItemCount: Int!
-  features: [LinkableFeature!]!
   id: Int!
   link: String!
   molecularProfileScore: Float!
@@ -3966,6 +3965,7 @@ type LinkableVariant {
   feature: LinkableFeature
   id: Int!
   link: String!
+  matchText: String
   name: String!
 }
 
diff --git a/client/src/app/generated/server.schema.json b/client/src/app/generated/server.schema.json
index a95a37f8a..bcb7b060e 100644
--- a/client/src/app/generated/server.schema.json
+++ b/client/src/app/generated/server.schema.json
@@ -4564,30 +4564,6 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
-            {
-              "name": "features",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "OBJECT",
-                      "name": "LinkableFeature",
-                      "ofType": null
-                    }
-                  }
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
             {
               "name": "id",
               "description": null,
@@ -19083,6 +19059,18 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "matchText",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "name",
               "description": null,
diff --git a/server/app/graphql/resolvers/browse_molecular_profiles.rb b/server/app/graphql/resolvers/browse_molecular_profiles.rb
index 2a1141b76..d9da15c2c 100644
--- a/server/app/graphql/resolvers/browse_molecular_profiles.rb
+++ b/server/app/graphql/resolvers/browse_molecular_profiles.rb
@@ -27,7 +27,11 @@ class Resolvers::BrowseMolecularProfiles < GraphQL::Schema::Resolver
     scope.where(id: ids)
   end
 
-  option(:variant_name, type: String)  { |scope, value| scope.where(json_name_query_for_column('variants'), "#{value}%") }
+  option(:variant_name, type: String)  do |scope, value| 
+    scope.where(json_name_query_for_column('variants'), "#{value}%")
+      .or(scope.where(json_name_query_for_column('features'), "#{value}"))
+  end
+
   option(:feature_name, type: String)  { |scope, value| scope.where(json_name_query_for_column('features'), "#{value}%") }
   option(:disease_name, type: String)  { |scope, value| scope.where(json_name_query_for_column('diseases'), "%#{value}%") }
   option(:therapy_name, type: String)     { |scope, value| scope.where(json_name_query_for_column('therapies'), "%#{value}%") }
diff --git a/server/app/graphql/types/browse_tables/browse_molecular_profile_type.rb b/server/app/graphql/types/browse_tables/browse_molecular_profile_type.rb
index f32ff6a7d..131d3d609 100644
--- a/server/app/graphql/types/browse_tables/browse_molecular_profile_type.rb
+++ b/server/app/graphql/types/browse_tables/browse_molecular_profile_type.rb
@@ -8,8 +8,7 @@ class BrowseMolecularProfileType < Types::BaseObject
     field :name, String, null: false
     field :diseases, [Types::LinkableDisease], null: false
     field :therapies, [Types::LinkableTherapy], null: false
-    field :features, [Types::LinkableFeature], null: false
-    field :variants,[Types::LinkableVariant], null: false
+    field :variants, [Types::LinkableVariant], null: false
     field :link, String, null: false
     field :evidence_item_count, Int, null: false
     field :assertion_count, Int, null: false
@@ -40,7 +39,16 @@ def features
     def variants
       Array(object.variants)
         .sort_by { |v| v['name'] }
-        .map { |v| { name: v['name'], id: v['id'], link: "/variants/#{v['id']}"} }
+        .map do |v|
+          feature = feature_for_id(v['feature_id'])
+          {
+            name: v['name'],
+            id: v['id'],
+            link: "/variants/#{v['id']}",
+            feature: feature,
+            match_text: "#{feature['name']} #{v['name']}"
+          }
+         end
     end
 
     def diseases
@@ -60,5 +68,14 @@ def aliases
         .compact
         .map { |d| { name: d } }
     end
+
+    private
+    def feature_for_id(id)
+      @features ||= Array(object.features)
+      feature = @features.find { |f| f['id'] == id }
+      feature[:link] = Rails.application.routes.url_helpers.url_for("/features/#{feature['id']}")
+
+      feature
+    end
   end
 end
diff --git a/server/app/graphql/types/linkable_tag.rb b/server/app/graphql/types/linkable_tag.rb
index 5e0e64a35..002e02901 100644
--- a/server/app/graphql/types/linkable_tag.rb
+++ b/server/app/graphql/types/linkable_tag.rb
@@ -16,6 +16,7 @@ class LinkableFeature < LinkableTag
 
   class LinkableVariant < LinkableTag
     field :deprecated, Boolean, null: true
+    field :match_text, String, null: true
     field :feature, LinkableFeature, null: true
   end
 end
diff --git a/server/db/migrate/20240112212453_update_molecular_profile_browse_table_rows_to_version_12.rb b/server/db/migrate/20240112212453_update_molecular_profile_browse_table_rows_to_version_12.rb
new file mode 100644
index 000000000..a836e4640
--- /dev/null
+++ b/server/db/migrate/20240112212453_update_molecular_profile_browse_table_rows_to_version_12.rb
@@ -0,0 +1,5 @@
+class UpdateMolecularProfileBrowseTableRowsToVersion12 < ActiveRecord::Migration[6.1]
+  def change
+    update_view :molecular_profile_browse_table_rows, version: 12, revert_to_version: 11, materialized: true
+  end
+end
diff --git a/server/db/schema.rb b/server/db/schema.rb
index 9cf6418e0..d77e1f26c 100644
--- a/server/db/schema.rb
+++ b/server/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2023_12_20_164444) do
+ActiveRecord::Schema.define(version: 2024_01_12_212453) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -615,6 +615,8 @@
     t.integer "parent_id"
     t.datetime "created_at", precision: 6
     t.datetime "updated_at", precision: 6
+    t.datetime "most_recent_activity_timestamp"
+    t.index ["most_recent_activity_timestamp"], name: "index_organizations_on_most_recent_activity_timestamp"
   end
 
   create_table "phenotypes", id: :serial, force: :cascade do |t|
@@ -812,11 +814,11 @@
     t.boolean "signup_complete"
     t.integer "country_id"
     t.integer "most_recent_organization_id"
-    t.datetime "most_recent_action_timestamp"
+    t.datetime "most_recent_activity_timestamp"
     t.index ["country_id"], name: "index_users_on_country_id"
     t.index ["deleted"], name: "index_users_on_deleted"
     t.index ["last_seen_at"], name: "index_users_on_last_seen_at"
-    t.index ["most_recent_action_timestamp"], name: "index_users_on_most_recent_action_timestamp"
+    t.index ["most_recent_activity_timestamp"], name: "index_users_on_most_recent_activity_timestamp"
     t.index ["role"], name: "index_users_on_role"
   end
 
@@ -1219,47 +1221,6 @@
   SQL
   add_index "disease_browse_table_rows", ["id"], name: "index_disease_browse_table_rows_on_id", unique: true
 
-  create_view "molecular_profile_browse_table_rows", materialized: true, sql_definition: <<-SQL
-      SELECT outer_mps.id,
-      outer_mps.name,
-      count(DISTINCT evidence_items.id) AS evidence_item_count,
-      array_agg(DISTINCT molecular_profile_aliases.name ORDER BY molecular_profile_aliases.name) AS alias_names,
-      json_agg(DISTINCT jsonb_build_object('name', features.name, 'id', features.id)) FILTER (WHERE (features.name IS NOT NULL)) AS features,
-      json_agg(DISTINCT jsonb_build_object('name', variants.name, 'id', variants.id)) FILTER (WHERE (variants.name IS NOT NULL)) AS variants,
-      json_agg(DISTINCT jsonb_build_object('name', diseases.name, 'id', diseases.id, 'total', disease_count.total)) FILTER (WHERE (diseases.name IS NOT NULL)) AS diseases,
-      json_agg(DISTINCT jsonb_build_object('name', therapies.name, 'id', therapies.id, 'total', therapy_count.total)) FILTER (WHERE (therapies.name IS NOT NULL)) AS therapies,
-      count(DISTINCT assertions.id) AS assertion_count,
-      count(DISTINCT variants.id) AS variant_count,
-      outer_mps.evidence_score
-     FROM ((((((((((((molecular_profiles outer_mps
-       LEFT JOIN evidence_items ON ((evidence_items.molecular_profile_id = outer_mps.id)))
-       JOIN molecular_profiles_variants ON ((outer_mps.id = molecular_profiles_variants.molecular_profile_id)))
-       JOIN variants ON ((molecular_profiles_variants.variant_id = variants.id)))
-       JOIN features ON ((features.id = variants.feature_id)))
-       LEFT JOIN diseases ON ((diseases.id = evidence_items.disease_id)))
-       LEFT JOIN evidence_items_therapies ON ((evidence_items_therapies.evidence_item_id = evidence_items.id)))
-       LEFT JOIN therapies ON ((therapies.id = evidence_items_therapies.therapy_id)))
-       LEFT JOIN assertions ON ((assertions.molecular_profile_id = outer_mps.id)))
-       LEFT JOIN molecular_profile_aliases_molecular_profiles ON ((molecular_profile_aliases_molecular_profiles.molecular_profile_id = outer_mps.id)))
-       LEFT JOIN molecular_profile_aliases ON ((molecular_profile_aliases.id = molecular_profile_aliases_molecular_profiles.molecular_profile_alias_id)))
-       LEFT JOIN LATERAL ( SELECT therapies_1.id AS therapy_id,
-              count(DISTINCT evidence_items_1.id) AS total
-             FROM ((evidence_items evidence_items_1
-               JOIN evidence_items_therapies evidence_items_therapies_1 ON ((evidence_items_therapies_1.evidence_item_id = evidence_items_1.id)))
-               JOIN therapies therapies_1 ON ((therapies_1.id = evidence_items_therapies_1.therapy_id)))
-            WHERE (evidence_items_1.molecular_profile_id = outer_mps.id)
-            GROUP BY therapies_1.id) therapy_count ON ((therapies.id = therapy_count.therapy_id)))
-       LEFT JOIN LATERAL ( SELECT diseases_1.id AS disease_id,
-              count(DISTINCT evidence_items_1.id) AS total
-             FROM (evidence_items evidence_items_1
-               JOIN diseases diseases_1 ON ((diseases_1.id = evidence_items_1.disease_id)))
-            WHERE (evidence_items_1.molecular_profile_id = outer_mps.id)
-            GROUP BY diseases_1.id) disease_count ON ((diseases.id = disease_count.disease_id)))
-    WHERE (outer_mps.deprecated = false)
-    GROUP BY outer_mps.id, outer_mps.name, outer_mps.evidence_score;
-  SQL
-  add_index "molecular_profile_browse_table_rows", ["id"], name: "index_molecular_profile_browse_table_rows_on_id", unique: true
-
   create_view "variant_browse_table_rows", materialized: true, sql_definition: <<-SQL
       SELECT outer_variants.id,
       outer_variants.name,
@@ -1308,4 +1269,45 @@
   SQL
   add_index "variant_browse_table_rows", ["id"], name: "index_variant_browse_table_rows_on_id", unique: true
 
+  create_view "molecular_profile_browse_table_rows", materialized: true, sql_definition: <<-SQL
+      SELECT outer_mps.id,
+      outer_mps.name,
+      count(DISTINCT evidence_items.id) AS evidence_item_count,
+      array_agg(DISTINCT molecular_profile_aliases.name ORDER BY molecular_profile_aliases.name) AS alias_names,
+      json_agg(DISTINCT jsonb_build_object('name', features.name, 'id', features.id)) FILTER (WHERE (features.name IS NOT NULL)) AS features,
+      json_agg(DISTINCT jsonb_build_object('name', variants.name, 'id', variants.id, 'feature_id', variants.feature_id)) FILTER (WHERE (variants.name IS NOT NULL)) AS variants,
+      json_agg(DISTINCT jsonb_build_object('name', diseases.name, 'id', diseases.id, 'total', disease_count.total)) FILTER (WHERE (diseases.name IS NOT NULL)) AS diseases,
+      json_agg(DISTINCT jsonb_build_object('name', therapies.name, 'id', therapies.id, 'total', therapy_count.total)) FILTER (WHERE (therapies.name IS NOT NULL)) AS therapies,
+      count(DISTINCT assertions.id) AS assertion_count,
+      count(DISTINCT variants.id) AS variant_count,
+      outer_mps.evidence_score
+     FROM ((((((((((((molecular_profiles outer_mps
+       LEFT JOIN evidence_items ON ((evidence_items.molecular_profile_id = outer_mps.id)))
+       JOIN molecular_profiles_variants ON ((outer_mps.id = molecular_profiles_variants.molecular_profile_id)))
+       JOIN variants ON ((molecular_profiles_variants.variant_id = variants.id)))
+       JOIN features ON ((features.id = variants.feature_id)))
+       LEFT JOIN diseases ON ((diseases.id = evidence_items.disease_id)))
+       LEFT JOIN evidence_items_therapies ON ((evidence_items_therapies.evidence_item_id = evidence_items.id)))
+       LEFT JOIN therapies ON ((therapies.id = evidence_items_therapies.therapy_id)))
+       LEFT JOIN assertions ON ((assertions.molecular_profile_id = outer_mps.id)))
+       LEFT JOIN molecular_profile_aliases_molecular_profiles ON ((molecular_profile_aliases_molecular_profiles.molecular_profile_id = outer_mps.id)))
+       LEFT JOIN molecular_profile_aliases ON ((molecular_profile_aliases.id = molecular_profile_aliases_molecular_profiles.molecular_profile_alias_id)))
+       LEFT JOIN LATERAL ( SELECT therapies_1.id AS therapy_id,
+              count(DISTINCT evidence_items_1.id) AS total
+             FROM ((evidence_items evidence_items_1
+               JOIN evidence_items_therapies evidence_items_therapies_1 ON ((evidence_items_therapies_1.evidence_item_id = evidence_items_1.id)))
+               JOIN therapies therapies_1 ON ((therapies_1.id = evidence_items_therapies_1.therapy_id)))
+            WHERE (evidence_items_1.molecular_profile_id = outer_mps.id)
+            GROUP BY therapies_1.id) therapy_count ON ((therapies.id = therapy_count.therapy_id)))
+       LEFT JOIN LATERAL ( SELECT diseases_1.id AS disease_id,
+              count(DISTINCT evidence_items_1.id) AS total
+             FROM (evidence_items evidence_items_1
+               JOIN diseases diseases_1 ON ((diseases_1.id = evidence_items_1.disease_id)))
+            WHERE (evidence_items_1.molecular_profile_id = outer_mps.id)
+            GROUP BY diseases_1.id) disease_count ON ((diseases.id = disease_count.disease_id)))
+    WHERE (outer_mps.deprecated = false)
+    GROUP BY outer_mps.id, outer_mps.name, outer_mps.evidence_score;
+  SQL
+  add_index "molecular_profile_browse_table_rows", ["id"], name: "index_molecular_profile_browse_table_rows_on_id", unique: true
+
 end
diff --git a/server/db/views/molecular_profile_browse_table_rows_v12.sql b/server/db/views/molecular_profile_browse_table_rows_v12.sql
new file mode 100644
index 000000000..de2be6175
--- /dev/null
+++ b/server/db/views/molecular_profile_browse_table_rows_v12.sql
@@ -0,0 +1,40 @@
+SELECT outer_mps.id,
+  outer_mps.name,
+  COUNT(DISTINCT(evidence_items.id)) as evidence_item_count,
+  array_agg(distinct(molecular_profile_aliases.name) order by molecular_profile_aliases.name) as alias_names,
+  json_agg(distinct jsonb_build_object('name', features.name, 'id', features.id))  FILTER (WHERE features.name IS NOT NULL) as features,
+  json_agg(distinct jsonb_build_object('name', variants.name, 'id', variants.id, 'feature_id', variants.feature_id))  FILTER (WHERE variants.name IS NOT NULL) as variants,
+  json_agg(distinct jsonb_build_object('name', diseases.name, 'id', diseases.id, 'total', disease_count.total))  FILTER (WHERE diseases.name IS NOT NULL) as diseases,
+  json_agg(distinct jsonb_build_object('name', therapies.name, 'id', therapies.id, 'total', therapy_count.total))  FILTER (WHERE therapies.name IS NOT NULL) as therapies,
+  COUNT(DISTINCT(assertions.id)) as assertion_count,
+  COUNT(DISTINCT(variants.id)) as variant_count,
+  outer_mps.evidence_score
+FROM molecular_profiles outer_mps
+LEFT OUTER JOIN evidence_items ON evidence_items.molecular_profile_id = outer_mps.id
+INNER JOIN molecular_profiles_variants ON outer_mps.id = molecular_profiles_variants.molecular_profile_id
+INNER JOIN variants ON molecular_profiles_variants.variant_id = variants.id
+INNER JOIN features ON features.id = variants.feature_id
+LEFT OUTER JOIN diseases ON diseases.id = evidence_items.disease_id
+LEFT OUTER JOIN evidence_items_therapies ON evidence_items_therapies.evidence_item_id = evidence_items.id
+LEFT OUTER JOIN therapies ON therapies.id = evidence_items_therapies.therapy_id
+LEFT OUTER JOIN assertions ON assertions.molecular_profile_id = outer_mps.id
+LEFT OUTER JOIN molecular_profile_aliases_molecular_profiles ON molecular_profile_aliases_molecular_profiles.molecular_profile_id = outer_mps.id
+LEFT OUTER JOIN molecular_profile_aliases ON molecular_profile_aliases.id = molecular_profile_aliases_molecular_profiles.molecular_profile_alias_id
+-- this count is used for sorting therapies by the number of eids they appear with
+LEFT JOIN LATERAL (SELECT therapies.id as therapy_id, COUNT(DISTINCT(evidence_items.id)) as total
+  FROM evidence_items
+  INNER JOIN evidence_items_therapies ON evidence_items_therapies.evidence_item_id = evidence_items.id
+  INNER JOIN therapies ON therapies.id = evidence_items_therapies.therapy_id
+  WHERE evidence_items.molecular_profile_id = outer_mps.id
+  GROUP BY therapies.id
+) therapy_count on therapies.id = therapy_count.therapy_id
+
+LEFT JOIN LATERAL (SELECT diseases.id as disease_id, COUNT(DISTINCT(evidence_items.id)) as total
+  FROM evidence_items
+  INNER JOIN diseases ON diseases.id = evidence_items.disease_id
+  WHERE evidence_items.molecular_profile_id = outer_mps.id
+  GROUP BY diseases.id
+) disease_count on diseases.id = disease_count.disease_id
+WHERE outer_mps.deprecated = False
+GROUP BY outer_mps.id, outer_mps.name, outer_mps.evidence_score
+

From 269da97cfe46805ad92251e0240f91942c721146 Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Tue, 16 Jan 2024 15:06:03 -0600
Subject: [PATCH 051/125] move feature next to variant in variant browse table

---
 .../variants-table.component.html             | 54 ++++++++++---------
 1 file changed, 30 insertions(+), 24 deletions(-)

diff --git a/client/src/app/components/variants/variants-table/variants-table.component.html b/client/src/app/components/variants/variants-table/variants-table.component.html
index 88a859591..52b1f9131 100644
--- a/client/src/app/components/variants/variants-table/variants-table.component.html
+++ b/client/src/app/components/variants/variants-table/variants-table.component.html
@@ -46,32 +46,29 @@
     [nzShowPagination]="false">
     <thead (nzSortOrderChange)="sortChange$.next($event)">
       <tr class="col-header-row">
-        <th nzWidth="150px"
+        <th
+          nzWidth="150px"
           nzLeft
           [nzColumnKey]="sortColumns.VariantName"
           [nzSortFn]="true">
           Variant
         </th>
-        <th nzWidth="170px">
-          Variant Aliases
+        <th
+          nzWidth="100px"
+          [nzColumnKey]="sortColumns.FeatureName"
+          [nzSortFn]="true">
+          Feature
         </th>
-        <th nzWidth="180px"
+        <th nzWidth="170px">Variant Aliases</th>
+        <th
+          nzWidth="180px"
           [nzFilters]="[{ text: 'None', value: true }]"
           [nzFilterFn]="true"
           (nzFilterChange)="onHasNoVariantTypeInputChange($event)">
           Variant Types
         </th>
-        <th nzWidth="100px"
-          [nzColumnKey]="sortColumns.FeatureName"
-          [nzSortFn]="true">
-          Feature
-        </th>
-        <th nzWidth="200px">
-          Diseases
-        </th>
-        <th nzWidth="180px">
-          Therapies
-        </th>
+        <th nzWidth="200px">Diseases</th>
+        <th nzWidth="180px">Therapies</th>
       </tr>
       <tr class="filter-row">
         <th nzLeft>
@@ -81,6 +78,13 @@
               filterChange$.next()
             "></cvc-clearable-input-filter>
         </th>
+        <th>
+          <cvc-clearable-input-filter
+            [(inputModel)]="featureNameInput"
+            (inputModelChange)="
+              filterChange$.next()
+            "></cvc-clearable-input-filter>
+        </th>
         <th>
           <cvc-clearable-input-filter
             [(inputModel)]="variantAliasInput"
@@ -94,10 +98,6 @@
             (inputModelChange)="filterChange$.next()">
           </cvc-clearable-input-filter>
         </th>
-        <th>
-          <cvc-clearable-input-filter [(inputModel)]="featureNameInput"
-            (inputModelChange)="filterChange$.next()"></cvc-clearable-input-filter>
-        </th>
         <th>
           <cvc-clearable-input-filter
             [(inputModel)]="diseaseNameInput"
@@ -125,6 +125,15 @@
               [variant]="variant"
               [truncateLongName]="true"></cvc-variant-tag>
           </td>
+          <td>
+            <cvc-feature-tag
+              [feature]="{
+                id: variant.featureId,
+                name: variant.featureName,
+                link: variant.featureLink
+              }"
+              [truncateLongName]="true"></cvc-feature-tag>
+          </td>
           <td>
             <cvc-plain-tag-overflow
               [maxDisplayCount]="1"
@@ -132,16 +141,13 @@
               [matchingText]="variantAliasInput"></cvc-plain-tag-overflow>
           </td>
           <td>
-            <cvc-tag-overflow tagType="variant-type"
+            <cvc-tag-overflow
+              tagType="variant-type"
               [tags]="variant.variantTypes"
               [maxDisplayCount]="1"
               [matchingText]="variantTypeNameInput">
             </cvc-tag-overflow>
           </td>
-          <td>
-            <cvc-feature-tag [feature]="{id: variant.featureId, name: variant.featureName, link: variant.featureLink}"
-              [truncateLongName]="true"></cvc-feature-tag>
-          </td>
           <td>
             <cvc-tag-overflow
               tagType="disease"

From 856ea1bf94db0cbb8cd308186dca23d6ccc61338 Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Tue, 16 Jan 2024 17:18:50 -0600
Subject: [PATCH 052/125] add missing comma

---
 server/app/jobs/refresh_materialized_views.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/app/jobs/refresh_materialized_views.rb b/server/app/jobs/refresh_materialized_views.rb
index a34ea339a..af38f0b4d 100644
--- a/server/app/jobs/refresh_materialized_views.rb
+++ b/server/app/jobs/refresh_materialized_views.rb
@@ -5,7 +5,7 @@ def perform(kwargs)
     to_refresh = if views == 'all'
                    [
                      MaterializedViews::DiseaseBrowseTableRow,
-                     MaterializedViews::FeatureBrowseTableRow
+                     MaterializedViews::FeatureBrowseTableRow,
                      MaterializedViews::SourceBrowseTableRow,
                      MaterializedViews::VariantBrowseTableRow,
                      MaterializedViews::VariantGroupBrowseTableRow,

From bfa84c14c5a4c7627104dc5fe241eceeb1ab5a06 Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Wed, 17 Jan 2024 15:18:09 -0600
Subject: [PATCH 053/125] stub in factor classes

---
 server/app/models/feature.rb         |  2 +-
 server/app/models/features/factor.rb | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 server/app/models/features/factor.rb

diff --git a/server/app/models/feature.rb b/server/app/models/feature.rb
index 282f5138d..3d7db5b5f 100644
--- a/server/app/models/feature.rb
+++ b/server/app/models/feature.rb
@@ -5,7 +5,7 @@ class Feature < ApplicationRecord
   include Subscribable
   include WithTimepointCounts
 
-  delegated_type :feature_instance, types: %w[ Features::Gene ]
+  delegated_type :feature_instance, types: %w[ Features::Gene Features::Factor ]
   has_and_belongs_to_many :feature_aliases, class_name: 'Features::FeatureAlias'
   has_and_belongs_to_many :sources
 
diff --git a/server/app/models/features/factor.rb b/server/app/models/features/factor.rb
new file mode 100644
index 000000000..4841e6adb
--- /dev/null
+++ b/server/app/models/features/factor.rb
@@ -0,0 +1,19 @@
+module Features
+  class Factor < ActiveRecord::Base
+    include Subscribable
+    include IsFeatureInstance
+
+    has_many :comment_mentions, foreign_key: :comment_id, class_name: 'EntityMention'
+
+    def display_name
+      name
+    end
+
+    def editable_fields
+      [
+        :description,
+        :source_ids
+      ]
+    end
+  end
+end

From b8b6826e6c2acb635e53d62f510e1b0d76a2c59b Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Wed, 17 Jan 2024 15:22:06 -0600
Subject: [PATCH 054/125] add initializer to enable yjit when present

---
 server/config/initializers/enable_yjit.rb | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 server/config/initializers/enable_yjit.rb

diff --git a/server/config/initializers/enable_yjit.rb b/server/config/initializers/enable_yjit.rb
new file mode 100644
index 000000000..613e5c578
--- /dev/null
+++ b/server/config/initializers/enable_yjit.rb
@@ -0,0 +1,5 @@
+if defined? RubyVM::YJIT.enable
+  Rails.application.config.after_initialize do
+    RubyVM::YJIT.enable
+  end
+end

From 105e6ad5138f23120737786fcea690f3d3cd964f Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Wed, 17 Jan 2024 15:23:09 -0600
Subject: [PATCH 055/125] enable tests on 3.3, remove almost EOL 3.0

---
 .github/workflows/tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 93e51b910..591b67910 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: 'ubuntu-latest'
     strategy:
       matrix:
-        ruby: ['3.0', '3.2']
+        ruby: ['3.2', '3.3']
     services:
         postgres:
           image: postgres:13

From 76651335f0a2e81f9b1e74c9994e6c7f4678dd29 Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Wed, 17 Jan 2024 15:30:24 -0600
Subject: [PATCH 056/125] set staging deploy to use ruby 3.3

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

diff --git a/server/config/deploy/staging.rb b/server/config/deploy/staging.rb
index 81806d66b..b34ea4623 100644
--- a/server/config/deploy/staging.rb
+++ b/server/config/deploy/staging.rb
@@ -1,7 +1,7 @@
 server "34.209.114.226", user: 'ubuntu', roles: %w{web db app}
 
 set :branch, 'staging'
-set :rbenv_ruby, '3.0.2'
+set :rbenv_ruby, '3.3.0'
 
 set :rails_env, 'staging'
 

From bb8d844756afcd38c367546a05790c2eea38ff3f Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Wed, 17 Jan 2024 16:21:03 -0600
Subject: [PATCH 057/125] update json serialization library

---
 server/Gemfile      | 2 +-
 server/Gemfile.lock | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/server/Gemfile b/server/Gemfile
index 508a3c387..b67fbb6be 100644
--- a/server/Gemfile
+++ b/server/Gemfile
@@ -29,7 +29,7 @@ gem 'search_object_graphql', '0.3.1'
 gem 'scenic', '~>1.5.4'
 
 #higher performance json encoding
-gem 'oj', '~> 3.13.10'
+gem 'oj', '~> 3.16.3'
 
 # Reduces boot times through caching; required in config/boot.rb
 gem 'bootsnap', '>= 1.4.4', require: false
diff --git a/server/Gemfile.lock b/server/Gemfile.lock
index 20cf94347..3a76b699c 100644
--- a/server/Gemfile.lock
+++ b/server/Gemfile.lock
@@ -98,6 +98,7 @@ GEM
     base64 (0.1.1)
     bcrypt_pbkdf (1.1.0)
     benchmark (0.2.1)
+    bigdecimal (3.1.5)
     bindex (0.8.1)
     bootsnap (1.16.0)
       msgpack (~> 1.2)
@@ -259,7 +260,8 @@ GEM
       multi_xml (~> 0.5)
       rack (>= 1.2, < 4)
     obo (0.1.5)
-    oj (3.13.23)
+    oj (3.16.3)
+      bigdecimal (>= 3.0)
     omniauth (2.0.4)
       hashie (>= 3.4.6)
       rack (>= 1.6.2, < 3)
@@ -505,7 +507,7 @@ DEPENDENCIES
   image_processing (~> 1.12.2)
   listen (~> 3.3)
   obo (~> 0.1.5)
-  oj (~> 3.13.10)
+  oj (~> 3.16.3)
   omniauth (~> 2.0.2)
   omniauth-github (~> 2.0.0)
   omniauth-google-oauth2 (~> 0.8.1)

From 8154a620ed12366bf1006d3f4b1f97538c3e5d5a Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Thu, 18 Jan 2024 10:18:45 -0600
Subject: [PATCH 058/125] update graphql libraries

---
 server/Gemfile      |  6 +++---
 server/Gemfile.lock | 19 ++++++++++---------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/server/Gemfile b/server/Gemfile
index b67fbb6be..bbea06e41 100644
--- a/server/Gemfile
+++ b/server/Gemfile
@@ -22,9 +22,9 @@ gem 'omniauth-google-oauth2', '~> 0.8.1'
 gem 'omniauth-orcid', '~> 2.1.1'
 gem 'omniauth-rails_csrf_protection', '~> 1.0.0'
 
-gem 'graphql','~> 1.12.4'
-gem 'graphql-batch', '~>0.4.3'
-gem 'search_object_graphql', '0.3.1'
+gem 'graphql','~> 2.2.5'
+gem 'graphql-batch', '~>0.5.3'
+gem 'search_object_graphql', '1.0.5'
 
 gem 'scenic', '~>1.5.4'
 
diff --git a/server/Gemfile.lock b/server/Gemfile.lock
index 3a76b699c..9ded39e80 100644
--- a/server/Gemfile.lock
+++ b/server/Gemfile.lock
@@ -183,9 +183,10 @@ GEM
     graphiql-rails (1.8.0)
       railties
       sprockets-rails
-    graphql (1.12.24)
-    graphql-batch (0.4.3)
-      graphql (>= 1.3, < 2)
+    graphql (2.2.5)
+      racc (~> 1.4)
+    graphql-batch (0.5.3)
+      graphql (>= 1.12.18, < 3)
       promise.rb (~> 0.7.2)
     hashie (5.0.0)
     htmlentities (4.3.4)
@@ -389,9 +390,9 @@ GEM
       activerecord (>= 4.0.0)
       railties (>= 4.0.0)
     search_object (1.2.5)
-    search_object_graphql (0.3.1)
-      graphql (~> 1.8)
-      search_object (~> 1.2.2)
+    search_object_graphql (1.0.5)
+      graphql (> 1.8)
+      search_object (~> 1.2.5)
     searchkick (4.5.2)
       activemodel (>= 5)
       elasticsearch (>= 6)
@@ -501,8 +502,8 @@ DEPENDENCIES
   ed25519
   elasticsearch (~> 7.13.0)
   graphiql-rails (~> 1.8.0)
-  graphql (~> 1.12.4)
-  graphql-batch (~> 0.4.3)
+  graphql (~> 2.2.5)
+  graphql-batch (~> 0.5.3)
   htmlentities (~> 4.3.4)
   image_processing (~> 1.12.2)
   listen (~> 3.3)
@@ -524,7 +525,7 @@ DEPENDENCIES
   sanitize (~> 6.0.2)
   sass-rails (>= 6)
   scenic (~> 1.5.4)
-  search_object_graphql (= 0.3.1)
+  search_object_graphql (= 1.0.5)
   searchkick (~> 4.5.0)
   sidekiq (< 8)
   sidekiq-cron (~> 1.10.0)

From 1f177215b3a4f979cd437145c5f24e13ad424d86 Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Thu, 18 Jan 2024 10:59:28 -0600
Subject: [PATCH 059/125] update GA to use new Graphql tracing api; old one was
 removed

---
 server/app/controllers/graphql_controller.rb |  3 +-
 server/app/graphql/civic2_schema.rb          |  2 ++
 server/app/lib/google_analytics_tracer.rb    | 11 +++++++
 server/app/lib/graphql_analytics_tracer.rb   | 30 --------------------
 4 files changed, 15 insertions(+), 31 deletions(-)
 create mode 100644 server/app/lib/google_analytics_tracer.rb
 delete mode 100644 server/app/lib/graphql_analytics_tracer.rb

diff --git a/server/app/controllers/graphql_controller.rb b/server/app/controllers/graphql_controller.rb
index 692c950a8..aa5cbce43 100644
--- a/server/app/controllers/graphql_controller.rb
+++ b/server/app/controllers/graphql_controller.rb
@@ -12,7 +12,8 @@ def execute
 
     context = {
       current_user: current_user,
-      tracers: [GraphqlAnalyticsTracer.for_request(request)]
+      trace_mode: Analytics.should_submit?(request) ? :analytics : nil,
+      request_ip: request.remote_ip
     }
 
     result = Civic2Schema.execute(query, variables: variables, context: context, operation_name: operation_name)
diff --git a/server/app/graphql/civic2_schema.rb b/server/app/graphql/civic2_schema.rb
index 5a44f45fc..a1ce97cdf 100644
--- a/server/app/graphql/civic2_schema.rb
+++ b/server/app/graphql/civic2_schema.rb
@@ -3,6 +3,8 @@ class Civic2Schema < GraphQL::Schema
   mutation(Types::MutationType)
   query(Types::QueryType)
 
+  trace_with GoogleAnalyticsTracer, mode: :analytics
+
   use GraphQL::Batch
 
   # Union and Interface Resolution
diff --git a/server/app/lib/google_analytics_tracer.rb b/server/app/lib/google_analytics_tracer.rb
new file mode 100644
index 000000000..0e4f42c84
--- /dev/null
+++ b/server/app/lib/google_analytics_tracer.rb
@@ -0,0 +1,11 @@
+module GoogleAnalyticsTracer
+  def analyze_query(query: )
+    query_type = query.selected_operation.selections&.first&.name
+
+    SubmitApiAnalytics.perform_later(
+      user_ip: query.context[:request_ip],
+      query_type: query_type
+    )
+    super
+  end
+end
diff --git a/server/app/lib/graphql_analytics_tracer.rb b/server/app/lib/graphql_analytics_tracer.rb
deleted file mode 100644
index 2ba5311da..000000000
--- a/server/app/lib/graphql_analytics_tracer.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-RequestTracer = Struct.new(:user_ip, keyword_init: true) do
-  def trace(key, data)
-    if key == "analyze_query"
-      query = data[:query]
-      query_type = query.selected_operation.selections&.first&.name
-
-      SubmitApiAnalytics.perform_later(
-        user_ip: user_ip,
-        query_type: query_type
-      )
-    end
-    yield
-  end
-end
-
-class NullTracer
-  def self.trace(key, data)
-    yield
-  end
-end
-
-class GraphqlAnalyticsTracer
-  def self.for_request(req)
-    if Analytics.should_submit?(req)
-      RequestTracer.new(user_ip: req.remote_ip)
-    else
-      NullTracer
-    end
-  end
-end

From 04ca066530de863249b841ffe833368b14f1f2cc Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Thu, 18 Jan 2024 12:31:54 -0600
Subject: [PATCH 060/125] get fixtures working with features

---
 server/test/fixtures/{genes.yml => feature_genes.yml} | 0
 server/test/fixtures/features.yml                     | 8 ++++++++
 server/test/fixtures/variants.yml                     | 4 ++++
 server/test/test_helper.rb                            | 2 ++
 4 files changed, 14 insertions(+)
 rename server/test/fixtures/{genes.yml => feature_genes.yml} (100%)
 create mode 100644 server/test/fixtures/features.yml

diff --git a/server/test/fixtures/genes.yml b/server/test/fixtures/feature_genes.yml
similarity index 100%
rename from server/test/fixtures/genes.yml
rename to server/test/fixtures/feature_genes.yml
diff --git a/server/test/fixtures/features.yml b/server/test/fixtures/features.yml
new file mode 100644
index 000000000..ae7587d88
--- /dev/null
+++ b/server/test/fixtures/features.yml
@@ -0,0 +1,8 @@
+braf:
+  name: BRAF
+  feature_instance: braf (Features::Gene)
+
+vhl:
+  name: VHL
+  feature_instance: vhl (Features::Gene)
+
diff --git a/server/test/fixtures/variants.yml b/server/test/fixtures/variants.yml
index 28e056be4..3c29e5c65 100644
--- a/server/test/fixtures/variants.yml
+++ b/server/test/fixtures/variants.yml
@@ -1,19 +1,23 @@
 v600e:
   name: V600E
+  feature: braf
   gene: braf
   single_variant_molecular_profile: mp1
 
 v600k:
   name: V600K
+  feature: braf
   gene: braf
   single_variant_molecular_profile: mp2
 
 w88:
   name: W88*
+  feature: vhl
   gene: vhl
   single_variant_molecular_profile: mp3
 
 v87e:
   name: V87E (c.260T>A)
+  feature: vhl
   gene: vhl
   single_variant_molecular_profile: mp4
diff --git a/server/test/test_helper.rb b/server/test/test_helper.rb
index 47b598dee..e421c1e35 100644
--- a/server/test/test_helper.rb
+++ b/server/test/test_helper.rb
@@ -9,5 +9,7 @@ class ActiveSupport::TestCase
   # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order.
   fixtures :all
 
+  set_fixture_class feature_genes: Features::Gene
+
   # Add more helper methods to be used by all tests here...
 end

From 5c0cb2eb684d2f291ab7524c9ea44773fda776a8 Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Thu, 18 Jan 2024 12:39:29 -0600
Subject: [PATCH 061/125] run missing migration

---
 server/db/schema.rb | 231 ++++++++++++++++++++++----------------------
 1 file changed, 115 insertions(+), 116 deletions(-)

diff --git a/server/db/schema.rb b/server/db/schema.rb
index d77e1f26c..d5ea4a3ed 100644
--- a/server/db/schema.rb
+++ b/server/db/schema.rb
@@ -10,8 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2024_01_12_212453) do
-
+ActiveRecord::Schema[7.1].define(version: 2024_01_12_212453) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -33,7 +32,7 @@
     t.string "record_type", null: false
     t.bigint "record_id", null: false
     t.bigint "blob_id", null: false
-    t.datetime "created_at", null: false
+    t.datetime "created_at", precision: nil, null: false
     t.index ["blob_id"], name: "index_active_storage_attachments_on_blob_id"
     t.index ["record_type", "record_id", "name", "blob_id"], name: "index_active_storage_attachments_uniqueness", unique: true
   end
@@ -46,7 +45,7 @@
     t.string "service_name", null: false
     t.bigint "byte_size", null: false
     t.string "checksum", null: false
-    t.datetime "created_at", null: false
+    t.datetime "created_at", precision: nil, null: false
     t.index ["key"], name: "index_active_storage_blobs_on_key", unique: true
   end
 
@@ -62,8 +61,8 @@
     t.bigint "organization_id"
     t.string "subject_type", null: false
     t.bigint "subject_id", null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.text "verbiage"
     t.text "note"
     t.index ["organization_id"], name: "index_activities_on_organization_id"
@@ -76,15 +75,15 @@
     t.string "entity_type", null: false
     t.bigint "entity_id", null: false
     t.bigint "activity_id", null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["activity_id"], name: "index_activity_linked_entities_on_activity_id"
     t.index ["entity_type", "entity_id"], name: "index_activity_linked_entities_on_entity"
   end
 
   create_table "advanced_searches", id: :serial, force: :cascade do |t|
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.text "params"
     t.text "search_type"
     t.text "token"
@@ -94,16 +93,16 @@
   create_table "affiliations", id: false, force: :cascade do |t|
     t.bigint "user_id"
     t.bigint "organization_id"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.index ["organization_id"], name: "index_affiliations_on_organization_id"
     t.index ["user_id"], name: "index_affiliations_on_user_id"
   end
 
   create_table "assertions", id: :serial, force: :cascade do |t|
     t.text "description"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.boolean "deleted", default: false
     t.text "status", default: "submitted", null: false
     t.integer "nccn_guideline_old"
@@ -133,8 +132,8 @@
   create_table "assertions_clingen_codes", id: false, force: :cascade do |t|
     t.bigint "assertion_id", null: false
     t.bigint "clingen_code_id", null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["assertion_id"], name: "index_assertions_clingen_codes_on_assertion_id"
     t.index ["clingen_code_id", "assertion_id"], name: "idx_clingencodes_assertions"
   end
@@ -180,7 +179,7 @@
     t.string "comment"
     t.string "remote_address"
     t.string "request_uuid"
-    t.datetime "created_at"
+    t.datetime "created_at", precision: nil
     t.index ["action"], name: "index_audits_on_action"
     t.index ["associated_id", "associated_type"], name: "associated_index"
     t.index ["auditable_id", "auditable_type"], name: "auditable_index"
@@ -193,24 +192,24 @@
     t.integer "user_id", null: false
     t.string "provider", null: false
     t.string "uid", null: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.index ["user_id"], name: "index_authorizations_on_user_id"
   end
 
   create_table "authors", id: :serial, force: :cascade do |t|
     t.text "last_name"
     t.text "fore_name"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
   end
 
   create_table "authors_sources", id: false, force: :cascade do |t|
     t.integer "source_id"
     t.integer "author_id"
     t.integer "author_position"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.index ["author_id", "source_id"], name: "index_authors_sources_on_author_id_and_source_id"
     t.index ["source_id", "author_id"], name: "idx_author_source_id"
     t.index ["source_id"], name: "index_authors_sources_on_source_id"
@@ -221,8 +220,8 @@
     t.integer "user_id"
     t.text "tier"
     t.text "message"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.index ["badge_id", "user_id"], name: "index_badge_awards_on_badge_id_and_user_id"
     t.index ["user_id", "badge_id"], name: "index_badge_awards_on_user_id_and_badge_id"
   end
@@ -231,8 +230,8 @@
     t.integer "user_id"
     t.integer "badge_id"
     t.string "redemption_code"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.index ["badge_id"], name: "index_badge_claims_on_badge_id"
     t.index ["user_id"], name: "index_badge_claims_on_user_id"
   end
@@ -241,8 +240,8 @@
     t.text "name", null: false
     t.text "description", null: false
     t.text "additional_fields"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.text "display_name"
     t.index ["name"], name: "index_badges_on_name"
   end
@@ -258,8 +257,8 @@
     t.text "nct_id"
     t.text "name"
     t.text "description"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.index ["nct_id"], name: "index_clinical_trials_on_nct_id"
   end
 
@@ -274,8 +273,8 @@
 
   create_table "clinvar_entries", id: :serial, force: :cascade do |t|
     t.string "clinvar_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.index ["clinvar_id"], name: "index_clinvar_entries_on_clinvar_id"
   end
 
@@ -295,8 +294,8 @@
     t.integer "commentable_id"
     t.integer "user_id"
     t.string "role", default: "comments"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.index ["commentable_id"], name: "index_comments_on_commentable_id"
     t.index ["commentable_type"], name: "index_comments_on_commentable_type"
     t.index ["user_id"], name: "index_comments_on_user_id"
@@ -306,8 +305,8 @@
     t.integer "user_id", null: false
     t.boolean "coi_present", null: false
     t.text "coi_statement"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
   end
 
   create_table "countries", id: :serial, force: :cascade do |t|
@@ -322,8 +321,8 @@
   create_table "definitions", id: :serial, force: :cascade do |t|
     t.string "term", null: false
     t.text "text", null: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.index ["term"], name: "index_definitions_on_term"
   end
 
@@ -342,8 +341,8 @@
   create_table "diseases", id: :serial, force: :cascade do |t|
     t.text "doid"
     t.string "display_name", null: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.string "name"
     t.boolean "deprecated", default: false, null: false
     t.index ["name"], name: "index_diseases_on_name"
@@ -351,8 +350,8 @@
 
   create_table "domain_expert_tags", id: :serial, force: :cascade do |t|
     t.text "description"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.string "domain_of_expertise_type"
     t.integer "domain_of_expertise_id"
     t.integer "user_id"
@@ -362,8 +361,8 @@
   end
 
   create_table "entity_mentions", force: :cascade do |t|
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.string "entity_type"
     t.bigint "entity_id"
     t.bigint "comment_id"
@@ -372,8 +371,8 @@
   end
 
   create_table "events", id: :serial, force: :cascade do |t|
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.text "action"
     t.text "description"
     t.integer "originating_user_id"
@@ -400,8 +399,8 @@
     t.text "description", null: false
     t.integer "disease_id"
     t.integer "source_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.integer "rating"
     t.string "status"
     t.string "variant_hgvs"
@@ -411,7 +410,7 @@
     t.integer "evidence_direction"
     t.integer "significance"
     t.boolean "deleted", default: false
-    t.datetime "deleted_at"
+    t.datetime "deleted_at", precision: nil
     t.integer "therapy_interaction_type"
     t.boolean "flagged", default: false, null: false
     t.bigint "molecular_profile_id"
@@ -444,8 +443,8 @@
 
   create_table "feature_aliases", force: :cascade do |t|
     t.text "name", null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["name"], name: "index_feature_aliases_on_name"
   end
 
@@ -460,8 +459,8 @@
   create_table "features", force: :cascade do |t|
     t.text "name", null: false
     t.text "description"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.string "feature_instance_type", null: false
     t.bigint "feature_instance_id", null: false
     t.boolean "flagged", default: false, null: false
@@ -482,8 +481,8 @@
     t.string "flaggable_type"
     t.integer "flaggable_id"
     t.text "state"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.index ["flaggable_type", "flaggable_id"], name: "index_flags_on_flaggable_type_and_flaggable_id"
     t.index ["flagging_user_id"], name: "index_flags_on_flagging_user_id"
     t.index ["resolving_user_id"], name: "index_flags_on_resolving_user_id"
@@ -507,11 +506,11 @@
     t.string "name", null: false
     t.text "description", null: false
     t.text "official_name", null: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.text "clinical_description"
     t.boolean "deleted", default: false
-    t.datetime "deleted_at"
+    t.datetime "deleted_at", precision: nil
     t.boolean "flagged", default: false, null: false
     t.index "char_length((name)::text)", name: "gene_name_size_idx"
     t.index ["deleted"], name: "index_genes_on_deleted"
@@ -521,15 +520,15 @@
   create_table "genes_sources", id: false, force: :cascade do |t|
     t.integer "gene_id", null: false
     t.integer "source_id", null: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.index ["gene_id", "source_id"], name: "index_genes_sources_on_gene_id_and_source_id"
   end
 
   create_table "hgvs_descriptions", id: :serial, force: :cascade do |t|
     t.text "description"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.index ["description"], name: "index_hgvs_descriptions_on_description"
   end
 
@@ -556,8 +555,8 @@
 
   create_table "molecular_profiles", force: :cascade do |t|
     t.string "name"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.text "description"
     t.boolean "flagged", default: false, null: false
     t.float "evidence_score", null: false
@@ -570,8 +569,8 @@
   create_table "molecular_profiles_sources", id: false, force: :cascade do |t|
     t.bigint "molecular_profile_id", null: false
     t.bigint "source_id", null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["molecular_profile_id", "source_id"], name: "idx_mp_source_id"
   end
 
@@ -593,8 +592,8 @@
     t.boolean "seen", default: false
     t.integer "type"
     t.text "description"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.index ["created_at"], name: "index_notifications_on_created_at"
     t.index ["notified_user_id"], name: "index_notifications_on_notified_user_id"
   end
@@ -602,7 +601,7 @@
   create_table "ontologies", id: :serial, force: :cascade do |t|
     t.string "name"
     t.string "version"
-    t.datetime "import_date"
+    t.datetime "import_date", precision: nil
     t.string "permalink_format"
     t.string "civic_class"
     t.string "id_name"
@@ -613,9 +612,9 @@
     t.text "url"
     t.text "description"
     t.integer "parent_id"
-    t.datetime "created_at", precision: 6
-    t.datetime "updated_at", precision: 6
-    t.datetime "most_recent_activity_timestamp"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.datetime "most_recent_activity_timestamp", precision: nil
     t.index ["most_recent_activity_timestamp"], name: "index_organizations_on_most_recent_activity_timestamp"
   end
 
@@ -628,8 +627,8 @@
 
   create_table "pipeline_types", id: :serial, force: :cascade do |t|
     t.text "name", null: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.index ["name"], name: "index_pipeline_types_on_name"
   end
 
@@ -650,8 +649,8 @@
   end
 
   create_table "revision_sets", force: :cascade do |t|
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
   create_table "revisions", force: :cascade do |t|
@@ -661,8 +660,8 @@
     t.text "field_name", null: false
     t.jsonb "current_value"
     t.jsonb "suggested_value"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.uuid "revisionset_id"
     t.integer "revision_set_id"
     t.index ["created_at"], name: "index_revisions_on_created_at"
@@ -676,8 +675,8 @@
 
   create_table "role_mentions", force: :cascade do |t|
     t.integer "role", null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.bigint "comment_id"
     t.index ["comment_id"], name: "index_role_mentions_on_comment_id"
   end
@@ -687,8 +686,8 @@
     t.integer "user_id"
     t.text "initial_comment"
     t.text "status"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.text "reason"
     t.integer "disease_id"
     t.bigint "molecular_profile_id"
@@ -699,8 +698,8 @@
     t.string "citation_id", null: false
     t.string "study_type"
     t.text "citation"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.text "abstract"
     t.boolean "open_access"
     t.text "pmc_id"
@@ -723,8 +722,8 @@
   create_table "sources_variant_groups", id: false, force: :cascade do |t|
     t.integer "variant_group_id", null: false
     t.integer "source_id", null: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
   end
 
   create_table "subscriptions", id: :serial, force: :cascade do |t|
@@ -732,8 +731,8 @@
     t.string "subscribable_type"
     t.integer "subscribable_id"
     t.string "type"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.text "action_type"
     t.text "action_class"
     t.index ["action_type", "action_class"], name: "index_subscriptions_on_action_type_and_action_class"
@@ -747,8 +746,8 @@
     t.integer "moderated_id"
     t.integer "user_id", null: false
     t.string "status", default: "new", null: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.index ["created_at"], name: "index_suggested_changes_on_created_at"
     t.index ["moderated_id", "moderated_type"], name: "index_suggested_changes_on_moderated_id_and_moderated_type"
     t.index ["status"], name: "index_suggested_changes_on_status"
@@ -757,8 +756,8 @@
 
   create_table "therapies", id: :serial, force: :cascade do |t|
     t.string "name", null: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.text "ncit_id"
     t.boolean "deprecated", default: false, null: false
     t.index ["name"], name: "index_therapies_on_name"
@@ -779,13 +778,13 @@
 
   create_table "tsv_releases", id: :serial, force: :cascade do |t|
     t.text "path", null: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
   end
 
   create_table "user_mentions", force: :cascade do |t|
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.bigint "user_id"
     t.bigint "comment_id"
     t.index ["comment_id"], name: "index_user_mentions_on_comment_id"
@@ -797,14 +796,14 @@
     t.string "name"
     t.string "url"
     t.string "username"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.string "orcid"
     t.integer "area_of_expertise"
     t.boolean "deleted", default: false
-    t.datetime "deleted_at"
+    t.datetime "deleted_at", precision: nil
     t.integer "role", default: 0
-    t.datetime "last_seen_at"
+    t.datetime "last_seen_at", precision: nil
     t.text "twitter_handle"
     t.text "facebook_profile"
     t.text "linkedin_profile"
@@ -814,7 +813,7 @@
     t.boolean "signup_complete"
     t.integer "country_id"
     t.integer "most_recent_organization_id"
-    t.datetime "most_recent_activity_timestamp"
+    t.datetime "most_recent_activity_timestamp", precision: nil
     t.index ["country_id"], name: "index_users_on_country_id"
     t.index ["deleted"], name: "index_users_on_deleted"
     t.index ["last_seen_at"], name: "index_users_on_last_seen_at"
@@ -837,18 +836,18 @@
   create_table "variant_group_variants", id: false, force: :cascade do |t|
     t.integer "variant_id", null: false
     t.integer "variant_group_id", null: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.index ["variant_id", "variant_group_id"], name: "index_variant_group_variants_on_variant_id_and_variant_group_id"
   end
 
   create_table "variant_groups", id: :serial, force: :cascade do |t|
     t.string "name", null: false
     t.text "description"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.boolean "deleted", default: false
-    t.datetime "deleted_at"
+    t.datetime "deleted_at", precision: nil
     t.boolean "flagged", default: false, null: false
     t.index ["deleted"], name: "index_variant_groups_on_deleted"
   end
@@ -858,8 +857,8 @@
     t.text "display_name", null: false
     t.text "description", null: false
     t.text "soid", null: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.integer "parent_id"
     t.integer "lft"
     t.integer "rgt"
@@ -871,18 +870,18 @@
   create_table "variant_types_variants", id: false, force: :cascade do |t|
     t.integer "variant_id", null: false
     t.integer "variant_type_id", null: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.index ["variant_id", "variant_type_id"], name: "index_variant_types_variants_on_variant_id_and_variant_type_id"
   end
 
   create_table "variants", id: :serial, force: :cascade do |t|
     t.integer "gene_id", null: false
     t.string "name", null: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.boolean "deleted", default: false
-    t.datetime "deleted_at"
+    t.datetime "deleted_at", precision: nil
     t.text "genome_build"
     t.text "chromosome"
     t.integer "start"
@@ -925,8 +924,8 @@
 
   create_table "view_last_updated_timestamps", force: :cascade do |t|
     t.text "view_name", null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["view_name"], name: "index_view_last_updated_timestamps_on_view_name"
   end
 

From 3272b8ad83eec736c2e4393c7ca7c6b1dfa802e7 Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Thu, 18 Jan 2024 12:51:44 -0600
Subject: [PATCH 062/125] run rails update tool

---
 client/src/app/generated/server.model.graphql |  62 +-
 client/src/app/generated/server.schema.json   | 949 ++++++++++--------
 server/Gemfile                                |   8 +-
 server/Gemfile.lock                           | 307 +++---
 server/bin/rails                              |   3 +-
 server/bin/rake                               |   1 -
 server/bin/setup                              |  23 +-
 server/config/application.rb                  |   8 +-
 server/config/boot.rb                         |   2 +-
 server/config/environments/development.rb     |  25 +-
 server/config/initializers/assets.rb          |   4 +-
 .../initializers/content_security_policy.rb   |  47 +-
 .../initializers/filter_parameter_logging.rb  |   4 +-
 server/config/initializers/inflections.rb     |   8 +-
 .../new_framework_defaults_7_1.rb             | 268 +++++
 .../config/initializers/permissions_policy.rb |  20 +-
 ..._to_active_storage_blobs.active_storage.rb |  22 +
 ..._storage_variant_records.active_storage.rb |  27 +
 ...e_storage_blobs_checksum.active_storage.rb |   8 +
 server/db/schema.rb                           | 315 +++---
 server/test/test_helper.rb                    |   3 -
 21 files changed, 1284 insertions(+), 830 deletions(-)
 create mode 100644 server/config/initializers/new_framework_defaults_7_1.rb
 create mode 100644 server/db/migrate/20240118184728_add_service_name_to_active_storage_blobs.active_storage.rb
 create mode 100644 server/db/migrate/20240118184729_create_active_storage_variant_records.active_storage.rb
 create mode 100644 server/db/migrate/20240118184730_remove_not_null_on_active_storage_blobs_checksum.active_storage.rb

diff --git a/client/src/app/generated/server.model.graphql b/client/src/app/generated/server.model.graphql
index b328ca97a..ab09c8cbf 100644
--- a/client/src/app/generated/server.model.graphql
+++ b/client/src/app/generated/server.model.graphql
@@ -46,7 +46,7 @@ input AcceptRevisionsInput {
 }
 
 """
-Autogenerated return type of AcceptRevisions
+Autogenerated return type of AcceptRevisions.
 """
 type AcceptRevisionsPayload {
   """
@@ -167,7 +167,7 @@ input AddCommentInput {
 }
 
 """
-Autogenerated return type of AddComment
+Autogenerated return type of AddComment.
 """
 type AddCommentPayload {
   """
@@ -202,7 +202,7 @@ input AddDiseaseInput {
 }
 
 """
-Autogenerated return type of AddDisease
+Autogenerated return type of AddDisease.
 """
 type AddDiseasePayload {
   """
@@ -242,7 +242,7 @@ input AddRemoteCitationInput {
 }
 
 """
-Autogenerated return type of AddRemoteCitation
+Autogenerated return type of AddRemoteCitation.
 """
 type AddRemoteCitationPayload {
   """
@@ -277,7 +277,7 @@ input AddTherapyInput {
 }
 
 """
-Autogenerated return type of AddTherapy
+Autogenerated return type of AddTherapy.
 """
 type AddTherapyPayload {
   """
@@ -1823,7 +1823,7 @@ input CreateMolecularProfileInput {
 }
 
 """
-Autogenerated return type of CreateMolecularProfile
+Autogenerated return type of CreateMolecularProfile.
 """
 type CreateMolecularProfilePayload {
   """
@@ -1879,7 +1879,7 @@ input CreateVariantInput {
 }
 
 """
-Autogenerated return type of CreateVariant
+Autogenerated return type of CreateVariant.
 """
 type CreateVariantPayload {
   """
@@ -1978,7 +1978,7 @@ input DeprecateComplexMolecularProfileInput {
 }
 
 """
-Autogenerated return type of DeprecateComplexMolecularProfile
+Autogenerated return type of DeprecateComplexMolecularProfile.
 """
 type DeprecateComplexMolecularProfilePayload {
   """
@@ -2039,7 +2039,7 @@ input DeprecateVariantInput {
 }
 
 """
-Autogenerated return type of DeprecateVariant
+Autogenerated return type of DeprecateVariant.
 """
 type DeprecateVariantPayload {
   """
@@ -2178,7 +2178,7 @@ input EditUserInput {
 }
 
 """
-Autogenerated return type of EditUser
+Autogenerated return type of EditUser.
 """
 type EditUserPayload {
   """
@@ -3012,7 +3012,7 @@ input FlagEntityInput {
 }
 
 """
-Autogenerated return type of FlagEntity
+Autogenerated return type of FlagEntity.
 """
 type FlagEntityPayload {
   """
@@ -3434,7 +3434,7 @@ enum GenesSortColumns {
 """
 An ISO 8601-encoded datetime
 """
-scalar ISO8601DateTime
+scalar ISO8601DateTime @specifiedBy(url: "https://tools.ietf.org/html/rfc3339")
 
 input IntSearchInput {
   comparisonOperator: IntSearchOperator!
@@ -3783,7 +3783,7 @@ input ModerateAssertionInput {
 }
 
 """
-Autogenerated return type of ModerateAssertion
+Autogenerated return type of ModerateAssertion.
 """
 type ModerateAssertionPayload {
   """
@@ -3838,7 +3838,7 @@ input ModerateEvidenceItemInput {
 }
 
 """
-Autogenerated return type of ModerateEvidenceItem
+Autogenerated return type of ModerateEvidenceItem.
 """
 type ModerateEvidenceItemPayload {
   """
@@ -6762,7 +6762,7 @@ input RejectRevisionsInput {
 }
 
 """
-Autogenerated return type of RejectRevisions
+Autogenerated return type of RejectRevisions.
 """
 type RejectRevisionsPayload {
   """
@@ -6818,7 +6818,7 @@ input ResolveFlagInput {
 }
 
 """
-Autogenerated return type of ResolveFlag
+Autogenerated return type of ResolveFlag.
 """
 type ResolveFlagPayload {
   """
@@ -7557,7 +7557,7 @@ input SubmitAssertionInput {
 }
 
 """
-Autogenerated return type of SubmitAssertion
+Autogenerated return type of SubmitAssertion.
 """
 type SubmitAssertionPayload {
   """
@@ -7612,7 +7612,7 @@ input SubmitEvidenceItemInput {
 }
 
 """
-Autogenerated return type of SubmitEvidenceItem
+Autogenerated return type of SubmitEvidenceItem.
 """
 type SubmitEvidenceItemPayload {
   """
@@ -7665,7 +7665,7 @@ input SubmitVariantGroupInput {
 }
 
 """
-Autogenerated return type of SubmitVariantGroup
+Autogenerated return type of SubmitVariantGroup.
 """
 type SubmitVariantGroupPayload {
   """
@@ -7755,7 +7755,7 @@ input SubscribeInput {
 }
 
 """
-Autogenerated return type of Subscribe
+Autogenerated return type of Subscribe.
 """
 type SubscribePayload {
   """
@@ -7809,7 +7809,7 @@ input SuggestAssertionRevisionInput {
 }
 
 """
-Autogenerated return type of SuggestAssertionRevision
+Autogenerated return type of SuggestAssertionRevision.
 """
 type SuggestAssertionRevisionPayload {
   """
@@ -7867,7 +7867,7 @@ input SuggestEvidenceItemRevisionInput {
 }
 
 """
-Autogenerated return type of SuggestEvidenceItemRevision
+Autogenerated return type of SuggestEvidenceItemRevision.
 """
 type SuggestEvidenceItemRevisionPayload {
   """
@@ -7925,7 +7925,7 @@ input SuggestGeneRevisionInput {
 }
 
 """
-Autogenerated return type of SuggestGeneRevision
+Autogenerated return type of SuggestGeneRevision.
 """
 type SuggestGeneRevisionPayload {
   """
@@ -7983,7 +7983,7 @@ input SuggestMolecularProfileRevisionInput {
 }
 
 """
-Autogenerated return type of SuggestMolecularProfileRevision
+Autogenerated return type of SuggestMolecularProfileRevision.
 """
 type SuggestMolecularProfileRevisionPayload {
   """
@@ -8072,7 +8072,7 @@ input SuggestSourceInput {
 }
 
 """
-Autogenerated return type of SuggestSource
+Autogenerated return type of SuggestSource.
 """
 type SuggestSourcePayload {
   """
@@ -8121,7 +8121,7 @@ input SuggestVariantGroupRevisionInput {
 }
 
 """
-Autogenerated return type of SuggestVariantGroupRevision
+Autogenerated return type of SuggestVariantGroupRevision.
 """
 type SuggestVariantGroupRevisionPayload {
   """
@@ -8179,7 +8179,7 @@ input SuggestVariantRevisionInput {
 }
 
 """
-Autogenerated return type of SuggestVariantRevision
+Autogenerated return type of SuggestVariantRevision.
 """
 type SuggestVariantRevisionPayload {
   """
@@ -8312,7 +8312,7 @@ input UnsubscribeInput {
 }
 
 """
-Autogenerated return type of Unsubscribe
+Autogenerated return type of Unsubscribe.
 """
 type UnsubscribePayload {
   """
@@ -8347,7 +8347,7 @@ input UpdateCoiInput {
 }
 
 """
-Autogenerated return type of UpdateCoi
+Autogenerated return type of UpdateCoi.
 """
 type UpdateCoiPayload {
   """
@@ -8378,7 +8378,7 @@ input UpdateNotificationStatusInput {
 }
 
 """
-Autogenerated return type of UpdateNotificationStatus
+Autogenerated return type of UpdateNotificationStatus.
 """
 type UpdateNotificationStatusPayload {
   """
@@ -8439,7 +8439,7 @@ input UpdateSourceSuggestionStatusInput {
 }
 
 """
-Autogenerated return type of UpdateSourceSuggestionStatus
+Autogenerated return type of UpdateSourceSuggestionStatus.
 """
 type UpdateSourceSuggestionStatusPayload {
   """
diff --git a/client/src/app/generated/server.schema.json b/client/src/app/generated/server.schema.json
index f97c2fc12..c3e3cc1f6 100644
--- a/client/src/app/generated/server.schema.json
+++ b/client/src/app/generated/server.schema.json
@@ -232,6 +232,18 @@
           "description": "Autogenerated input type of AcceptRevisions",
           "fields": null,
           "inputFields": [
+            {
+              "name": "clientMutationId",
+              "description": "A unique identifier for the client performing the mutation.",
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "organizationId",
               "description": "The ID of the organization to credit the user's contributions to.\nIf the user belongs to a single organization or no organizations, this field is not required.\nThis field is required if the user belongs to more than one organization.\nThe user must belong to the organization provided.",
@@ -287,18 +299,6 @@
               "defaultValue": null,
               "isDeprecated": false,
               "deprecationReason": null
-            },
-            {
-              "name": "clientMutationId",
-              "description": "A unique identifier for the client performing the mutation.",
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "defaultValue": null,
-              "isDeprecated": false,
-              "deprecationReason": null
             }
           ],
           "interfaces": null,
@@ -308,7 +308,7 @@
         {
           "kind": "OBJECT",
           "name": "AcceptRevisionsPayload",
-          "description": "Autogenerated return type of AcceptRevisions",
+          "description": "Autogenerated return type of AcceptRevisions.",
           "fields": [
             {
               "name": "clientMutationId",
@@ -626,7 +626,7 @@
             }
           ],
           "inputFields": null,
-          "interfaces": null,
+          "interfaces": [],
           "enumValues": null,
           "possibleTypes": [
             {
@@ -863,6 +863,18 @@
           "description": "Autogenerated input type of AddComment",
           "fields": null,
           "inputFields": [
+            {
+              "name": "clientMutationId",
+              "description": "A unique identifier for the client performing the mutation.",
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "organizationId",
               "description": "The ID of the organization to credit the user's contributions to.\nIf the user belongs to a single organization or no organizations, this field is not required.\nThis field is required if the user belongs to more than one organization.\nThe user must belong to the organization provided.",
@@ -918,18 +930,6 @@
               "defaultValue": null,
               "isDeprecated": false,
               "deprecationReason": null
-            },
-            {
-              "name": "clientMutationId",
-              "description": "A unique identifier for the client performing the mutation.",
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "defaultValue": null,
-              "isDeprecated": false,
-              "deprecationReason": null
             }
           ],
           "interfaces": null,
@@ -939,7 +939,7 @@
         {
           "kind": "OBJECT",
           "name": "AddCommentPayload",
-          "description": "Autogenerated return type of AddComment",
+          "description": "Autogenerated return type of AddComment.",
           "fields": [
             {
               "name": "clientMutationId",
@@ -977,6 +977,18 @@
           "description": "Autogenerated input type of AddDisease",
           "fields": null,
           "inputFields": [
+            {
+              "name": "clientMutationId",
+              "description": "A unique identifier for the client performing the mutation.",
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "name",
               "description": "The name of the disease.",
@@ -1004,18 +1016,6 @@
               "defaultValue": null,
               "isDeprecated": false,
               "deprecationReason": null
-            },
-            {
-              "name": "clientMutationId",
-              "description": "A unique identifier for the client performing the mutation.",
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "defaultValue": null,
-              "isDeprecated": false,
-              "deprecationReason": null
             }
           ],
           "interfaces": null,
@@ -1025,7 +1025,7 @@
         {
           "kind": "OBJECT",
           "name": "AddDiseasePayload",
-          "description": "Autogenerated return type of AddDisease",
+          "description": "Autogenerated return type of AddDisease.",
           "fields": [
             {
               "name": "clientMutationId",
@@ -1083,6 +1083,18 @@
           "description": "Autogenerated input type of AddRemoteCitation",
           "fields": null,
           "inputFields": [
+            {
+              "name": "clientMutationId",
+              "description": "A unique identifier for the client performing the mutation.",
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "citationId",
               "description": "The external id for the source to add.",
@@ -1114,18 +1126,6 @@
               "defaultValue": null,
               "isDeprecated": false,
               "deprecationReason": null
-            },
-            {
-              "name": "clientMutationId",
-              "description": "A unique identifier for the client performing the mutation.",
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "defaultValue": null,
-              "isDeprecated": false,
-              "deprecationReason": null
             }
           ],
           "interfaces": null,
@@ -1135,7 +1135,7 @@
         {
           "kind": "OBJECT",
           "name": "AddRemoteCitationPayload",
-          "description": "Autogenerated return type of AddRemoteCitation",
+          "description": "Autogenerated return type of AddRemoteCitation.",
           "fields": [
             {
               "name": "clientMutationId",
@@ -1177,6 +1177,18 @@
           "description": "Autogenerated input type of AddTherapy",
           "fields": null,
           "inputFields": [
+            {
+              "name": "clientMutationId",
+              "description": "A unique identifier for the client performing the mutation.",
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "name",
               "description": "The name of the therapy.",
@@ -1204,18 +1216,6 @@
               "defaultValue": null,
               "isDeprecated": false,
               "deprecationReason": null
-            },
-            {
-              "name": "clientMutationId",
-              "description": "A unique identifier for the client performing the mutation.",
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "defaultValue": null,
-              "isDeprecated": false,
-              "deprecationReason": null
             }
           ],
           "interfaces": null,
@@ -1225,7 +1225,7 @@
         {
           "kind": "OBJECT",
           "name": "AddTherapyPayload",
-          "description": "Autogenerated return type of AddTherapy",
+          "description": "Autogenerated return type of AddTherapy.",
           "fields": [
             {
               "name": "clientMutationId",
@@ -2441,22 +2441,22 @@
             },
             {
               "kind": "INTERFACE",
-              "name": "Flaggable",
+              "name": "EventOriginObject",
               "ofType": null
             },
             {
               "kind": "INTERFACE",
-              "name": "WithRevisions",
+              "name": "EventSubject",
               "ofType": null
             },
             {
               "kind": "INTERFACE",
-              "name": "EventSubject",
+              "name": "Flaggable",
               "ofType": null
             },
             {
               "kind": "INTERFACE",
-              "name": "EventOriginObject",
+              "name": "WithRevisions",
               "ofType": null
             }
           ],
@@ -8558,7 +8558,7 @@
             }
           ],
           "inputFields": null,
-          "interfaces": null,
+          "interfaces": [],
           "enumValues": null,
           "possibleTypes": [
             {
@@ -9246,6 +9246,18 @@
           "description": "Autogenerated input type of CreateMolecularProfile",
           "fields": null,
           "inputFields": [
+            {
+              "name": "clientMutationId",
+              "description": "A unique identifier for the client performing the mutation.",
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "organizationId",
               "description": "The ID of the organization to credit the user's contributions to.\nIf the user belongs to a single organization or no organizations, this field is not required.\nThis field is required if the user belongs to more than one organization.\nThe user must belong to the organization provided.",
@@ -9273,18 +9285,6 @@
               "defaultValue": null,
               "isDeprecated": false,
               "deprecationReason": null
-            },
-            {
-              "name": "clientMutationId",
-              "description": "A unique identifier for the client performing the mutation.",
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "defaultValue": null,
-              "isDeprecated": false,
-              "deprecationReason": null
             }
           ],
           "interfaces": null,
@@ -9294,7 +9294,7 @@
         {
           "kind": "OBJECT",
           "name": "CreateMolecularProfilePayload",
-          "description": "Autogenerated return type of CreateMolecularProfile",
+          "description": "Autogenerated return type of CreateMolecularProfile.",
           "fields": [
             {
               "name": "clientMutationId",
@@ -9521,6 +9521,18 @@
           "description": "Autogenerated input type of CreateVariant",
           "fields": null,
           "inputFields": [
+            {
+              "name": "clientMutationId",
+              "description": "A unique identifier for the client performing the mutation.",
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "organizationId",
               "description": "The ID of the organization to credit the user's contributions to.\nIf the user belongs to a single organization or no organizations, this field is not required.\nThis field is required if the user belongs to more than one organization.\nThe user must belong to the organization provided.",
@@ -9564,18 +9576,6 @@
               "defaultValue": null,
               "isDeprecated": false,
               "deprecationReason": null
-            },
-            {
-              "name": "clientMutationId",
-              "description": "A unique identifier for the client performing the mutation.",
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "defaultValue": null,
-              "isDeprecated": false,
-              "deprecationReason": null
             }
           ],
           "interfaces": null,
@@ -9585,7 +9585,7 @@
         {
           "kind": "OBJECT",
           "name": "CreateVariantPayload",
-          "description": "Autogenerated return type of CreateVariant",
+          "description": "Autogenerated return type of CreateVariant.",
           "fields": [
             {
               "name": "clientMutationId",
@@ -10017,6 +10017,18 @@
           "description": "Autogenerated input type of DeprecateComplexMolecularProfile",
           "fields": null,
           "inputFields": [
+            {
+              "name": "clientMutationId",
+              "description": "A unique identifier for the client performing the mutation.",
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "organizationId",
               "description": "The ID of the organization to credit the user's contributions to.\nIf the user belongs to a single organization or no organizations, this field is not required.\nThis field is required if the user belongs to more than one organization.\nThe user must belong to the organization provided.",
@@ -10076,18 +10088,6 @@
               "defaultValue": null,
               "isDeprecated": false,
               "deprecationReason": null
-            },
-            {
-              "name": "clientMutationId",
-              "description": "A unique identifier for the client performing the mutation.",
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "defaultValue": null,
-              "isDeprecated": false,
-              "deprecationReason": null
             }
           ],
           "interfaces": null,
@@ -10097,7 +10097,7 @@
         {
           "kind": "OBJECT",
           "name": "DeprecateComplexMolecularProfilePayload",
-          "description": "Autogenerated return type of DeprecateComplexMolecularProfile",
+          "description": "Autogenerated return type of DeprecateComplexMolecularProfile.",
           "fields": [
             {
               "name": "clientMutationId",
@@ -10328,6 +10328,18 @@
           "description": "Autogenerated input type of DeprecateVariant",
           "fields": null,
           "inputFields": [
+            {
+              "name": "clientMutationId",
+              "description": "A unique identifier for the client performing the mutation.",
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "organizationId",
               "description": "The ID of the organization to credit the user's contributions to.\nIf the user belongs to a single organization or no organizations, this field is not required.\nThis field is required if the user belongs to more than one organization.\nThe user must belong to the organization provided.",
@@ -10387,18 +10399,6 @@
               "defaultValue": null,
               "isDeprecated": false,
               "deprecationReason": null
-            },
-            {
-              "name": "clientMutationId",
-              "description": "A unique identifier for the client performing the mutation.",
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "defaultValue": null,
-              "isDeprecated": false,
-              "deprecationReason": null
             }
           ],
           "interfaces": null,
@@ -10408,7 +10408,7 @@
         {
           "kind": "OBJECT",
           "name": "DeprecateVariantPayload",
-          "description": "Autogenerated return type of DeprecateVariant",
+          "description": "Autogenerated return type of DeprecateVariant.",
           "fields": [
             {
               "name": "clientMutationId",
@@ -10917,6 +10917,18 @@
           "description": "Autogenerated input type of EditUser",
           "fields": null,
           "inputFields": [
+            {
+              "name": "clientMutationId",
+              "description": "A unique identifier for the client performing the mutation.",
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "name",
               "description": "The user's full name",
@@ -11092,18 +11104,6 @@
               "defaultValue": null,
               "isDeprecated": false,
               "deprecationReason": null
-            },
-            {
-              "name": "clientMutationId",
-              "description": "A unique identifier for the client performing the mutation.",
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "defaultValue": null,
-              "isDeprecated": false,
-              "deprecationReason": null
             }
           ],
           "interfaces": null,
@@ -11113,7 +11113,7 @@
         {
           "kind": "OBJECT",
           "name": "EditUserPayload",
-          "description": "Autogenerated return type of EditUser",
+          "description": "Autogenerated return type of EditUser.",
           "fields": [
             {
               "name": "clientMutationId",
@@ -11733,7 +11733,7 @@
             }
           ],
           "inputFields": null,
-          "interfaces": null,
+          "interfaces": [],
           "enumValues": null,
           "possibleTypes": [
             {
@@ -11946,7 +11946,7 @@
             }
           ],
           "inputFields": null,
-          "interfaces": null,
+          "interfaces": [],
           "enumValues": null,
           "possibleTypes": [
             {
@@ -12994,22 +12994,22 @@
             },
             {
               "kind": "INTERFACE",
-              "name": "Flaggable",
+              "name": "EventOriginObject",
               "ofType": null
             },
             {
               "kind": "INTERFACE",
-              "name": "WithRevisions",
+              "name": "EventSubject",
               "ofType": null
             },
             {
               "kind": "INTERFACE",
-              "name": "EventSubject",
+              "name": "Flaggable",
               "ofType": null
             },
             {
               "kind": "INTERFACE",
-              "name": "EventOriginObject",
+              "name": "WithRevisions",
               "ofType": null
             }
           ],
@@ -14967,6 +14967,18 @@
           "description": "Autogenerated input type of FlagEntity",
           "fields": null,
           "inputFields": [
+            {
+              "name": "clientMutationId",
+              "description": "A unique identifier for the client performing the mutation.",
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "organizationId",
               "description": "The ID of the organization to credit the user's contributions to.\nIf the user belongs to a single organization or no organizations, this field is not required.\nThis field is required if the user belongs to more than one organization.\nThe user must belong to the organization provided.",
@@ -15010,18 +15022,6 @@
               "defaultValue": null,
               "isDeprecated": false,
               "deprecationReason": null
-            },
-            {
-              "name": "clientMutationId",
-              "description": "A unique identifier for the client performing the mutation.",
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "defaultValue": null,
-              "isDeprecated": false,
-              "deprecationReason": null
             }
           ],
           "interfaces": null,
@@ -15031,7 +15031,7 @@
         {
           "kind": "OBJECT",
           "name": "FlagEntityPayload",
-          "description": "Autogenerated return type of FlagEntity",
+          "description": "Autogenerated return type of FlagEntity.",
           "fields": [
             {
               "name": "clientMutationId",
@@ -15270,7 +15270,7 @@
             }
           ],
           "inputFields": null,
-          "interfaces": null,
+          "interfaces": [],
           "enumValues": null,
           "possibleTypes": [
             {
@@ -16186,22 +16186,22 @@
             },
             {
               "kind": "INTERFACE",
-              "name": "Flaggable",
+              "name": "EventSubject",
               "ofType": null
             },
             {
               "kind": "INTERFACE",
-              "name": "WithRevisions",
+              "name": "Flaggable",
               "ofType": null
             },
             {
               "kind": "INTERFACE",
-              "name": "EventSubject",
+              "name": "MolecularProfileComponent",
               "ofType": null
             },
             {
               "kind": "INTERFACE",
-              "name": "MolecularProfileComponent",
+              "name": "WithRevisions",
               "ofType": null
             }
           ],
@@ -18552,6 +18552,18 @@
           "description": "Autogenerated input type of ModerateAssertion",
           "fields": null,
           "inputFields": [
+            {
+              "name": "clientMutationId",
+              "description": "A unique identifier for the client performing the mutation.",
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "organizationId",
               "description": "The ID of the organization to credit the user's contributions to.\nIf the user belongs to a single organization or no organizations, this field is not required.\nThis field is required if the user belongs to more than one organization.\nThe user must belong to the organization provided.",
@@ -18595,18 +18607,6 @@
               "defaultValue": null,
               "isDeprecated": false,
               "deprecationReason": null
-            },
-            {
-              "name": "clientMutationId",
-              "description": "A unique identifier for the client performing the mutation.",
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "defaultValue": null,
-              "isDeprecated": false,
-              "deprecationReason": null
             }
           ],
           "interfaces": null,
@@ -18616,7 +18616,7 @@
         {
           "kind": "OBJECT",
           "name": "ModerateAssertionPayload",
-          "description": "Autogenerated return type of ModerateAssertion",
+          "description": "Autogenerated return type of ModerateAssertion.",
           "fields": [
             {
               "name": "assertion",
@@ -18827,6 +18827,18 @@
           "description": "Autogenerated input type of ModerateEvidenceItem",
           "fields": null,
           "inputFields": [
+            {
+              "name": "clientMutationId",
+              "description": "A unique identifier for the client performing the mutation.",
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "organizationId",
               "description": "The ID of the organization to credit the user's contributions to.\nIf the user belongs to a single organization or no organizations, this field is not required.\nThis field is required if the user belongs to more than one organization.\nThe user must belong to the organization provided.",
@@ -18870,18 +18882,6 @@
               "defaultValue": null,
               "isDeprecated": false,
               "deprecationReason": null
-            },
-            {
-              "name": "clientMutationId",
-              "description": "A unique identifier for the client performing the mutation.",
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "defaultValue": null,
-              "isDeprecated": false,
-              "deprecationReason": null
             }
           ],
           "interfaces": null,
@@ -18891,7 +18891,7 @@
         {
           "kind": "OBJECT",
           "name": "ModerateEvidenceItemPayload",
-          "description": "Autogenerated return type of ModerateEvidenceItem",
+          "description": "Autogenerated return type of ModerateEvidenceItem.",
           "fields": [
             {
               "name": "clientMutationId",
@@ -20179,22 +20179,22 @@
             },
             {
               "kind": "INTERFACE",
-              "name": "Flaggable",
+              "name": "EventOriginObject",
               "ofType": null
             },
             {
               "kind": "INTERFACE",
-              "name": "WithRevisions",
+              "name": "EventSubject",
               "ofType": null
             },
             {
               "kind": "INTERFACE",
-              "name": "EventSubject",
+              "name": "Flaggable",
               "ofType": null
             },
             {
               "kind": "INTERFACE",
-              "name": "EventOriginObject",
+              "name": "WithRevisions",
               "ofType": null
             }
           ],
@@ -20283,7 +20283,7 @@
             }
           ],
           "inputFields": null,
-          "interfaces": null,
+          "interfaces": [],
           "enumValues": null,
           "possibleTypes": [
             {
@@ -31274,6 +31274,18 @@
           "description": "Autogenerated input type of RejectRevisions",
           "fields": null,
           "inputFields": [
+            {
+              "name": "clientMutationId",
+              "description": "A unique identifier for the client performing the mutation.",
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "organizationId",
               "description": "The ID of the organization to credit the user's contributions to.\nIf the user belongs to a single organization or no organizations, this field is not required.\nThis field is required if the user belongs to more than one organization.\nThe user must belong to the organization provided.",
@@ -31333,18 +31345,6 @@
               "defaultValue": null,
               "isDeprecated": false,
               "deprecationReason": null
-            },
-            {
-              "name": "clientMutationId",
-              "description": "A unique identifier for the client performing the mutation.",
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "defaultValue": null,
-              "isDeprecated": false,
-              "deprecationReason": null
             }
           ],
           "interfaces": null,
@@ -31354,7 +31354,7 @@
         {
           "kind": "OBJECT",
           "name": "RejectRevisionsPayload",
-          "description": "Autogenerated return type of RejectRevisions",
+          "description": "Autogenerated return type of RejectRevisions.",
           "fields": [
             {
               "name": "clientMutationId",
@@ -31589,6 +31589,18 @@
           "description": "Autogenerated input type of ResolveFlag",
           "fields": null,
           "inputFields": [
+            {
+              "name": "clientMutationId",
+              "description": "A unique identifier for the client performing the mutation.",
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "organizationId",
               "description": "The ID of the organization to credit the user's contributions to.\nIf the user belongs to a single organization or no organizations, this field is not required.\nThis field is required if the user belongs to more than one organization.\nThe user must belong to the organization provided.",
@@ -31632,18 +31644,6 @@
               "defaultValue": null,
               "isDeprecated": false,
               "deprecationReason": null
-            },
-            {
-              "name": "clientMutationId",
-              "description": "A unique identifier for the client performing the mutation.",
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "defaultValue": null,
-              "isDeprecated": false,
-              "deprecationReason": null
             }
           ],
           "interfaces": null,
@@ -31653,7 +31653,7 @@
         {
           "kind": "OBJECT",
           "name": "ResolveFlagPayload",
-          "description": "Autogenerated return type of ResolveFlag",
+          "description": "Autogenerated return type of ResolveFlag.",
           "fields": [
             {
               "name": "clientMutationId",
@@ -32189,7 +32189,7 @@
           "interfaces": [
             {
               "kind": "INTERFACE",
-              "name": "EventSubject",
+              "name": "Commentable",
               "ofType": null
             },
             {
@@ -32199,7 +32199,7 @@
             },
             {
               "kind": "INTERFACE",
-              "name": "Commentable",
+              "name": "EventSubject",
               "ofType": null
             }
           ],
@@ -33577,12 +33577,12 @@
           "interfaces": [
             {
               "kind": "INTERFACE",
-              "name": "EventSubject",
+              "name": "Commentable",
               "ofType": null
             },
             {
               "kind": "INTERFACE",
-              "name": "Commentable",
+              "name": "EventSubject",
               "ofType": null
             }
           ],
@@ -34169,12 +34169,12 @@
           "interfaces": [
             {
               "kind": "INTERFACE",
-              "name": "EventSubject",
+              "name": "Commentable",
               "ofType": null
             },
             {
               "kind": "INTERFACE",
-              "name": "Commentable",
+              "name": "EventSubject",
               "ofType": null
             }
           ],
@@ -34576,12 +34576,12 @@
           "interfaces": [
             {
               "kind": "INTERFACE",
-              "name": "EventSubject",
+              "name": "EventOriginObject",
               "ofType": null
             },
             {
               "kind": "INTERFACE",
-              "name": "EventOriginObject",
+              "name": "EventSubject",
               "ofType": null
             }
           ],
@@ -35442,6 +35442,18 @@
           "description": "Autogenerated input type of SubmitAssertion",
           "fields": null,
           "inputFields": [
+            {
+              "name": "clientMutationId",
+              "description": "A unique identifier for the client performing the mutation.",
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "organizationId",
               "description": "The ID of the organization to credit the user's contributions to.\nIf the user belongs to a single organization or no organizations, this field is not required.\nThis field is required if the user belongs to more than one organization.\nThe user must belong to the organization provided.",
@@ -35481,18 +35493,6 @@
               "defaultValue": null,
               "isDeprecated": false,
               "deprecationReason": null
-            },
-            {
-              "name": "clientMutationId",
-              "description": "A unique identifier for the client performing the mutation.",
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "defaultValue": null,
-              "isDeprecated": false,
-              "deprecationReason": null
             }
           ],
           "interfaces": null,
@@ -35502,7 +35502,7 @@
         {
           "kind": "OBJECT",
           "name": "SubmitAssertionPayload",
-          "description": "Autogenerated return type of SubmitAssertion",
+          "description": "Autogenerated return type of SubmitAssertion.",
           "fields": [
             {
               "name": "assertion",
@@ -35713,6 +35713,18 @@
           "description": "Autogenerated input type of SubmitEvidenceItem",
           "fields": null,
           "inputFields": [
+            {
+              "name": "clientMutationId",
+              "description": "A unique identifier for the client performing the mutation.",
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "organizationId",
               "description": "The ID of the organization to credit the user's contributions to.\nIf the user belongs to a single organization or no organizations, this field is not required.\nThis field is required if the user belongs to more than one organization.\nThe user must belong to the organization provided.",
@@ -35752,18 +35764,6 @@
               "defaultValue": null,
               "isDeprecated": false,
               "deprecationReason": null
-            },
-            {
-              "name": "clientMutationId",
-              "description": "A unique identifier for the client performing the mutation.",
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "defaultValue": null,
-              "isDeprecated": false,
-              "deprecationReason": null
             }
           ],
           "interfaces": null,
@@ -35773,7 +35773,7 @@
         {
           "kind": "OBJECT",
           "name": "SubmitEvidenceItemPayload",
-          "description": "Autogenerated return type of SubmitEvidenceItem",
+          "description": "Autogenerated return type of SubmitEvidenceItem.",
           "fields": [
             {
               "name": "clientMutationId",
@@ -35815,6 +35815,18 @@
           "description": "Autogenerated input type of SubmitVariantGroup",
           "fields": null,
           "inputFields": [
+            {
+              "name": "clientMutationId",
+              "description": "A unique identifier for the client performing the mutation.",
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "organizationId",
               "description": "The ID of the organization to credit the user's contributions to.\nIf the user belongs to a single organization or no organizations, this field is not required.\nThis field is required if the user belongs to more than one organization.\nThe user must belong to the organization provided.",
@@ -35902,18 +35914,6 @@
               "defaultValue": null,
               "isDeprecated": false,
               "deprecationReason": null
-            },
-            {
-              "name": "clientMutationId",
-              "description": "A unique identifier for the client performing the mutation.",
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "defaultValue": null,
-              "isDeprecated": false,
-              "deprecationReason": null
             }
           ],
           "interfaces": null,
@@ -35923,7 +35923,7 @@
         {
           "kind": "OBJECT",
           "name": "SubmitVariantGroupPayload",
-          "description": "Autogenerated return type of SubmitVariantGroup",
+          "description": "Autogenerated return type of SubmitVariantGroup.",
           "fields": [
             {
               "name": "clientMutationId",
@@ -36165,6 +36165,18 @@
           "description": "Autogenerated input type of Subscribe",
           "fields": null,
           "inputFields": [
+            {
+              "name": "clientMutationId",
+              "description": "A unique identifier for the client performing the mutation.",
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "subscribables",
               "description": "A list of one or more entities to subscribe to, each identified by its ID and type.",
@@ -36200,18 +36212,6 @@
               "defaultValue": "false",
               "isDeprecated": false,
               "deprecationReason": null
-            },
-            {
-              "name": "clientMutationId",
-              "description": "A unique identifier for the client performing the mutation.",
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "defaultValue": null,
-              "isDeprecated": false,
-              "deprecationReason": null
             }
           ],
           "interfaces": null,
@@ -36221,7 +36221,7 @@
         {
           "kind": "OBJECT",
           "name": "SubscribePayload",
-          "description": "Autogenerated return type of Subscribe",
+          "description": "Autogenerated return type of Subscribe.",
           "fields": [
             {
               "name": "clientMutationId",
@@ -36314,6 +36314,18 @@
           "description": "Autogenerated input type of SuggestAssertionRevision",
           "fields": null,
           "inputFields": [
+            {
+              "name": "clientMutationId",
+              "description": "A unique identifier for the client performing the mutation.",
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "organizationId",
               "description": "The ID of the organization to credit the user's contributions to.\nIf the user belongs to a single organization or no organizations, this field is not required.\nThis field is required if the user belongs to more than one organization.\nThe user must belong to the organization provided.",
@@ -36373,18 +36385,6 @@
               "defaultValue": null,
               "isDeprecated": false,
               "deprecationReason": null
-            },
-            {
-              "name": "clientMutationId",
-              "description": "A unique identifier for the client performing the mutation.",
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "defaultValue": null,
-              "isDeprecated": false,
-              "deprecationReason": null
             }
           ],
           "interfaces": null,
@@ -36394,7 +36394,7 @@
         {
           "kind": "OBJECT",
           "name": "SuggestAssertionRevisionPayload",
-          "description": "Autogenerated return type of SuggestAssertionRevision",
+          "description": "Autogenerated return type of SuggestAssertionRevision.",
           "fields": [
             {
               "name": "assertion",
@@ -36460,6 +36460,18 @@
           "description": "Autogenerated input type of SuggestEvidenceItemRevision",
           "fields": null,
           "inputFields": [
+            {
+              "name": "clientMutationId",
+              "description": "A unique identifier for the client performing the mutation.",
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "organizationId",
               "description": "The ID of the organization to credit the user's contributions to.\nIf the user belongs to a single organization or no organizations, this field is not required.\nThis field is required if the user belongs to more than one organization.\nThe user must belong to the organization provided.",
@@ -36519,18 +36531,6 @@
               "defaultValue": null,
               "isDeprecated": false,
               "deprecationReason": null
-            },
-            {
-              "name": "clientMutationId",
-              "description": "A unique identifier for the client performing the mutation.",
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "defaultValue": null,
-              "isDeprecated": false,
-              "deprecationReason": null
             }
           ],
           "interfaces": null,
@@ -36540,7 +36540,7 @@
         {
           "kind": "OBJECT",
           "name": "SuggestEvidenceItemRevisionPayload",
-          "description": "Autogenerated return type of SuggestEvidenceItemRevision",
+          "description": "Autogenerated return type of SuggestEvidenceItemRevision.",
           "fields": [
             {
               "name": "clientMutationId",
@@ -36606,6 +36606,18 @@
           "description": "Autogenerated input type of SuggestGeneRevision",
           "fields": null,
           "inputFields": [
+            {
+              "name": "clientMutationId",
+              "description": "A unique identifier for the client performing the mutation.",
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "organizationId",
               "description": "The ID of the organization to credit the user's contributions to.\nIf the user belongs to a single organization or no organizations, this field is not required.\nThis field is required if the user belongs to more than one organization.\nThe user must belong to the organization provided.",
@@ -36665,18 +36677,6 @@
               "defaultValue": null,
               "isDeprecated": false,
               "deprecationReason": null
-            },
-            {
-              "name": "clientMutationId",
-              "description": "A unique identifier for the client performing the mutation.",
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "defaultValue": null,
-              "isDeprecated": false,
-              "deprecationReason": null
             }
           ],
           "interfaces": null,
@@ -36686,7 +36686,7 @@
         {
           "kind": "OBJECT",
           "name": "SuggestGeneRevisionPayload",
-          "description": "Autogenerated return type of SuggestGeneRevision",
+          "description": "Autogenerated return type of SuggestGeneRevision.",
           "fields": [
             {
               "name": "clientMutationId",
@@ -36752,6 +36752,18 @@
           "description": "Autogenerated input type of SuggestMolecularProfileRevision",
           "fields": null,
           "inputFields": [
+            {
+              "name": "clientMutationId",
+              "description": "A unique identifier for the client performing the mutation.",
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "organizationId",
               "description": "The ID of the organization to credit the user's contributions to.\nIf the user belongs to a single organization or no organizations, this field is not required.\nThis field is required if the user belongs to more than one organization.\nThe user must belong to the organization provided.",
@@ -36811,18 +36823,6 @@
               "defaultValue": null,
               "isDeprecated": false,
               "deprecationReason": null
-            },
-            {
-              "name": "clientMutationId",
-              "description": "A unique identifier for the client performing the mutation.",
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "defaultValue": null,
-              "isDeprecated": false,
-              "deprecationReason": null
             }
           ],
           "interfaces": null,
@@ -36832,7 +36832,7 @@
         {
           "kind": "OBJECT",
           "name": "SuggestMolecularProfileRevisionPayload",
-          "description": "Autogenerated return type of SuggestMolecularProfileRevision",
+          "description": "Autogenerated return type of SuggestMolecularProfileRevision.",
           "fields": [
             {
               "name": "clientMutationId",
@@ -37292,6 +37292,18 @@
           "description": "Autogenerated input type of SuggestSource",
           "fields": null,
           "inputFields": [
+            {
+              "name": "clientMutationId",
+              "description": "A unique identifier for the client performing the mutation.",
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "organizationId",
               "description": "The ID of the organization to credit the user's contributions to.\nIf the user belongs to a single organization or no organizations, this field is not required.\nThis field is required if the user belongs to more than one organization.\nThe user must belong to the organization provided.",
@@ -37359,18 +37371,6 @@
               "defaultValue": null,
               "isDeprecated": false,
               "deprecationReason": null
-            },
-            {
-              "name": "clientMutationId",
-              "description": "A unique identifier for the client performing the mutation.",
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "defaultValue": null,
-              "isDeprecated": false,
-              "deprecationReason": null
             }
           ],
           "interfaces": null,
@@ -37380,7 +37380,7 @@
         {
           "kind": "OBJECT",
           "name": "SuggestSourcePayload",
-          "description": "Autogenerated return type of SuggestSource",
+          "description": "Autogenerated return type of SuggestSource.",
           "fields": [
             {
               "name": "clientMutationId",
@@ -37422,6 +37422,18 @@
           "description": "Autogenerated input type of SuggestVariantGroupRevision",
           "fields": null,
           "inputFields": [
+            {
+              "name": "clientMutationId",
+              "description": "A unique identifier for the client performing the mutation.",
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "organizationId",
               "description": "The ID of the organization to credit the user's contributions to.\nIf the user belongs to a single organization or no organizations, this field is not required.\nThis field is required if the user belongs to more than one organization.\nThe user must belong to the organization provided.",
@@ -37481,18 +37493,6 @@
               "defaultValue": null,
               "isDeprecated": false,
               "deprecationReason": null
-            },
-            {
-              "name": "clientMutationId",
-              "description": "A unique identifier for the client performing the mutation.",
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "defaultValue": null,
-              "isDeprecated": false,
-              "deprecationReason": null
             }
           ],
           "interfaces": null,
@@ -37502,7 +37502,7 @@
         {
           "kind": "OBJECT",
           "name": "SuggestVariantGroupRevisionPayload",
-          "description": "Autogenerated return type of SuggestVariantGroupRevision",
+          "description": "Autogenerated return type of SuggestVariantGroupRevision.",
           "fields": [
             {
               "name": "clientMutationId",
@@ -37568,6 +37568,18 @@
           "description": "Autogenerated input type of SuggestVariantRevision",
           "fields": null,
           "inputFields": [
+            {
+              "name": "clientMutationId",
+              "description": "A unique identifier for the client performing the mutation.",
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "organizationId",
               "description": "The ID of the organization to credit the user's contributions to.\nIf the user belongs to a single organization or no organizations, this field is not required.\nThis field is required if the user belongs to more than one organization.\nThe user must belong to the organization provided.",
@@ -37623,18 +37635,6 @@
               "defaultValue": null,
               "isDeprecated": false,
               "deprecationReason": null
-            },
-            {
-              "name": "clientMutationId",
-              "description": "A unique identifier for the client performing the mutation.",
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "defaultValue": null,
-              "isDeprecated": false,
-              "deprecationReason": null
             }
           ],
           "interfaces": null,
@@ -37644,7 +37644,7 @@
         {
           "kind": "OBJECT",
           "name": "SuggestVariantRevisionPayload",
-          "description": "Autogenerated return type of SuggestVariantRevision",
+          "description": "Autogenerated return type of SuggestVariantRevision.",
           "fields": [
             {
               "name": "clientMutationId",
@@ -38315,6 +38315,18 @@
           "description": "Autogenerated input type of Unsubscribe",
           "fields": null,
           "inputFields": [
+            {
+              "name": "clientMutationId",
+              "description": "A unique identifier for the client performing the mutation.",
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "subscribables",
               "description": "A list of one or more entities to unsubscribe from, each identified by its ID and type.",
@@ -38350,18 +38362,6 @@
               "defaultValue": "false",
               "isDeprecated": false,
               "deprecationReason": null
-            },
-            {
-              "name": "clientMutationId",
-              "description": "A unique identifier for the client performing the mutation.",
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "defaultValue": null,
-              "isDeprecated": false,
-              "deprecationReason": null
             }
           ],
           "interfaces": null,
@@ -38371,7 +38371,7 @@
         {
           "kind": "OBJECT",
           "name": "UnsubscribePayload",
-          "description": "Autogenerated return type of Unsubscribe",
+          "description": "Autogenerated return type of Unsubscribe.",
           "fields": [
             {
               "name": "clientMutationId",
@@ -38421,6 +38421,18 @@
           "description": "Autogenerated input type of UpdateCoi",
           "fields": null,
           "inputFields": [
+            {
+              "name": "clientMutationId",
+              "description": "A unique identifier for the client performing the mutation.",
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "coiPresent",
               "description": "Does the user report having a conflict of interest? Mark true if so.",
@@ -38448,18 +38460,6 @@
               "defaultValue": null,
               "isDeprecated": false,
               "deprecationReason": null
-            },
-            {
-              "name": "clientMutationId",
-              "description": "A unique identifier for the client performing the mutation.",
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "defaultValue": null,
-              "isDeprecated": false,
-              "deprecationReason": null
             }
           ],
           "interfaces": null,
@@ -38469,7 +38469,7 @@
         {
           "kind": "OBJECT",
           "name": "UpdateCoiPayload",
-          "description": "Autogenerated return type of UpdateCoi",
+          "description": "Autogenerated return type of UpdateCoi.",
           "fields": [
             {
               "name": "clientMutationId",
@@ -38511,6 +38511,18 @@
           "description": "Autogenerated input type of UpdateNotificationStatus",
           "fields": null,
           "inputFields": [
+            {
+              "name": "clientMutationId",
+              "description": "A unique identifier for the client performing the mutation.",
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "ids",
               "description": "A list of one or more Notification IDs.",
@@ -38550,18 +38562,6 @@
               "defaultValue": null,
               "isDeprecated": false,
               "deprecationReason": null
-            },
-            {
-              "name": "clientMutationId",
-              "description": "A unique identifier for the client performing the mutation.",
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "defaultValue": null,
-              "isDeprecated": false,
-              "deprecationReason": null
             }
           ],
           "interfaces": null,
@@ -38571,7 +38571,7 @@
         {
           "kind": "OBJECT",
           "name": "UpdateNotificationStatusPayload",
-          "description": "Autogenerated return type of UpdateNotificationStatus",
+          "description": "Autogenerated return type of UpdateNotificationStatus.",
           "fields": [
             {
               "name": "clientMutationId",
@@ -38806,6 +38806,18 @@
           "description": "Autogenerated input type of UpdateSourceSuggestionStatus",
           "fields": null,
           "inputFields": [
+            {
+              "name": "clientMutationId",
+              "description": "A unique identifier for the client performing the mutation.",
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "organizationId",
               "description": "The ID of the organization to credit the user's contributions to.\nIf the user belongs to a single organization or no organizations, this field is not required.\nThis field is required if the user belongs to more than one organization.\nThe user must belong to the organization provided.",
@@ -38861,18 +38873,6 @@
               "defaultValue": null,
               "isDeprecated": false,
               "deprecationReason": null
-            },
-            {
-              "name": "clientMutationId",
-              "description": "A unique identifier for the client performing the mutation.",
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "defaultValue": null,
-              "isDeprecated": false,
-              "deprecationReason": null
             }
           ],
           "interfaces": null,
@@ -38882,7 +38882,7 @@
         {
           "kind": "OBJECT",
           "name": "UpdateSourceSuggestionStatusPayload",
-          "description": "Autogenerated return type of UpdateSourceSuggestionStatus",
+          "description": "Autogenerated return type of UpdateSourceSuggestionStatus.",
           "fields": [
             {
               "name": "clientMutationId",
@@ -41115,27 +41115,27 @@
             },
             {
               "kind": "INTERFACE",
-              "name": "Flaggable",
+              "name": "EventOriginObject",
               "ofType": null
             },
             {
               "kind": "INTERFACE",
-              "name": "WithRevisions",
+              "name": "EventSubject",
               "ofType": null
             },
             {
               "kind": "INTERFACE",
-              "name": "EventSubject",
+              "name": "Flaggable",
               "ofType": null
             },
             {
               "kind": "INTERFACE",
-              "name": "EventOriginObject",
+              "name": "MolecularProfileComponent",
               "ofType": null
             },
             {
               "kind": "INTERFACE",
-              "name": "MolecularProfileComponent",
+              "name": "WithRevisions",
               "ofType": null
             }
           ],
@@ -42322,17 +42322,17 @@
             },
             {
               "kind": "INTERFACE",
-              "name": "Flaggable",
+              "name": "EventSubject",
               "ofType": null
             },
             {
               "kind": "INTERFACE",
-              "name": "WithRevisions",
+              "name": "Flaggable",
               "ofType": null
             },
             {
               "kind": "INTERFACE",
-              "name": "EventSubject",
+              "name": "WithRevisions",
               "ofType": null
             }
           ],
@@ -43307,7 +43307,7 @@
             }
           ],
           "inputFields": null,
-          "interfaces": null,
+          "interfaces": [],
           "enumValues": null,
           "possibleTypes": [
             {
@@ -43396,6 +43396,18 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "isRepeatable",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "Boolean",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "locations",
               "description": null,
@@ -43605,6 +43617,12 @@
               "description": "Location adjacent to an input object field definition.",
               "isDeprecated": false,
               "deprecationReason": null
+            },
+            {
+              "name": "VARIABLE_DEFINITION",
+              "description": "Location adjacent to a variable definition.",
+              "isDeprecated": false,
+              "deprecationReason": null
             }
           ],
           "possibleTypes": null
@@ -43896,6 +43914,18 @@
           "name": "__Schema",
           "description": "A GraphQL Schema defines the capabilities of a GraphQL server. It exposes all available types and directives on the server, as well as the entry points for query, mutation, and subscription operations.",
           "fields": [
+            {
+              "name": "description",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "directives",
               "description": "A list of all directives supported by this server.",
@@ -44126,6 +44156,22 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "isOneOf",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Boolean",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "kind",
               "description": null,
@@ -44185,6 +44231,18 @@
               },
               "isDeprecated": false,
               "deprecationReason": null
+            },
+            {
+              "name": "specifiedByURL",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
             }
           ],
           "inputFields": null,
@@ -44330,6 +44388,39 @@
               "deprecationReason": null
             }
           ]
+        },
+        {
+          "name": "oneOf",
+          "description": "Requires that exactly one field must be supplied and that field must not be `null`.",
+          "locations": [
+            "INPUT_OBJECT"
+          ],
+          "args": []
+        },
+        {
+          "name": "specifiedBy",
+          "description": "Exposes a URL that specifies the behavior of this scalar.",
+          "locations": [
+            "SCALAR"
+          ],
+          "args": [
+            {
+              "name": "url",
+              "description": "The URL that specifies the behavior of this scalar.",
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ]
         }
       ]
     }
diff --git a/server/Gemfile b/server/Gemfile
index bbea06e41..1a988533d 100644
--- a/server/Gemfile
+++ b/server/Gemfile
@@ -4,7 +4,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 ruby '~>3.0'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails', branch: 'main'
-gem 'rails', '~> 6.1', '>= 6.1.3.1'
+gem 'rails', '~> 7.1'
 # Use postgresql as the database for Active Record
 gem 'pg', '~> 1.1'
 # Use Puma as the app server
@@ -63,7 +63,7 @@ gem 'sidekiq', '< 8'
 gem 'sidekiq-cron', '~> 1.10.0'
 
 gem 'aws-sdk-s3', '~> 1.94.0'
-gem 'awesome_nested_set', '~> 3.3.0'
+gem 'awesome_nested_set', '~> 3.6.0'
 gem 'obo', '~> 0.1.5'
 
 gem 'activejob-null', '~> 0.0.1'
@@ -71,6 +71,8 @@ gem 'activejob-null', '~> 0.0.1'
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
   gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
+  gem 'pry'
+  gem 'pry-rails'
 end
 
 group :development do
@@ -89,8 +91,6 @@ group :development do
   gem 'ed25519'
   gem 'bcrypt_pbkdf'
 
-  gem 'pry'
-  gem 'pry-rails'
   gem 'solargraph'
   gem 'solargraph-rails'
 
diff --git a/server/Gemfile.lock b/server/Gemfile.lock
index 9ded39e80..4ed9c801e 100644
--- a/server/Gemfile.lock
+++ b/server/Gemfile.lock
@@ -1,106 +1,121 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.1.7.6)
-      actionpack (= 6.1.7.6)
-      activesupport (= 6.1.7.6)
+    actioncable (7.1.3)
+      actionpack (= 7.1.3)
+      activesupport (= 7.1.3)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.7.6)
-      actionpack (= 6.1.7.6)
-      activejob (= 6.1.7.6)
-      activerecord (= 6.1.7.6)
-      activestorage (= 6.1.7.6)
-      activesupport (= 6.1.7.6)
+      zeitwerk (~> 2.6)
+    actionmailbox (7.1.3)
+      actionpack (= 7.1.3)
+      activejob (= 7.1.3)
+      activerecord (= 7.1.3)
+      activestorage (= 7.1.3)
+      activesupport (= 7.1.3)
       mail (>= 2.7.1)
-    actionmailer (6.1.7.6)
-      actionpack (= 6.1.7.6)
-      actionview (= 6.1.7.6)
-      activejob (= 6.1.7.6)
-      activesupport (= 6.1.7.6)
+      net-imap
+      net-pop
+      net-smtp
+    actionmailer (7.1.3)
+      actionpack (= 7.1.3)
+      actionview (= 7.1.3)
+      activejob (= 7.1.3)
+      activesupport (= 7.1.3)
       mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (6.1.7.6)
-      actionview (= 6.1.7.6)
-      activesupport (= 6.1.7.6)
-      rack (~> 2.0, >= 2.0.9)
+      net-imap
+      net-pop
+      net-smtp
+      rails-dom-testing (~> 2.2)
+    actionpack (7.1.3)
+      actionview (= 7.1.3)
+      activesupport (= 7.1.3)
+      nokogiri (>= 1.8.5)
+      racc
+      rack (>= 2.2.4)
+      rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.7.6)
-      actionpack (= 6.1.7.6)
-      activerecord (= 6.1.7.6)
-      activestorage (= 6.1.7.6)
-      activesupport (= 6.1.7.6)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    actiontext (7.1.3)
+      actionpack (= 7.1.3)
+      activerecord (= 7.1.3)
+      activestorage (= 7.1.3)
+      activesupport (= 7.1.3)
+      globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (6.1.7.6)
-      activesupport (= 6.1.7.6)
+    actionview (7.1.3)
+      activesupport (= 7.1.3)
       builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+      erubi (~> 1.11)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
     active_storage_validations (0.9.8)
       activejob (>= 5.2.0)
       activemodel (>= 5.2.0)
       activestorage (>= 5.2.0)
       activesupport (>= 5.2.0)
-    activejob (6.1.7.6)
-      activesupport (= 6.1.7.6)
+    activejob (7.1.3)
+      activesupport (= 7.1.3)
       globalid (>= 0.3.6)
     activejob-null (0.0.1)
-    activemodel (6.1.7.6)
-      activesupport (= 6.1.7.6)
-    activerecord (6.1.7.6)
-      activemodel (= 6.1.7.6)
-      activesupport (= 6.1.7.6)
-    activestorage (6.1.7.6)
-      actionpack (= 6.1.7.6)
-      activejob (= 6.1.7.6)
-      activerecord (= 6.1.7.6)
-      activesupport (= 6.1.7.6)
+    activemodel (7.1.3)
+      activesupport (= 7.1.3)
+    activerecord (7.1.3)
+      activemodel (= 7.1.3)
+      activesupport (= 7.1.3)
+      timeout (>= 0.4.0)
+    activestorage (7.1.3)
+      actionpack (= 7.1.3)
+      activejob (= 7.1.3)
+      activerecord (= 7.1.3)
+      activesupport (= 7.1.3)
       marcel (~> 1.0)
-      mini_mime (>= 1.1.0)
-    activesupport (6.1.7.6)
+    activesupport (7.1.3)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    addressable (2.8.5)
+    addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
-    airbrussh (1.4.2)
+    airbrussh (1.5.1)
       sshkit (>= 1.6.1, != 1.7.0)
     angular_rails_csrf (5.0.0)
       railties (>= 3, < 8)
     ast (2.4.2)
-    audited (5.3.3)
-      activerecord (>= 5.0, < 7.1)
+    audited (5.4.3)
+      activerecord (>= 5.0, < 7.2)
       request_store (~> 1.2)
-    awesome_nested_set (3.3.1)
-      activerecord (>= 4.0.0, < 7.0)
-    aws-eventstream (1.2.0)
-    aws-partitions (1.824.0)
-    aws-sdk-core (3.181.1)
-      aws-eventstream (~> 1, >= 1.0.2)
+    awesome_nested_set (3.6.0)
+      activerecord (>= 4.0.0, < 7.2)
+    aws-eventstream (1.3.0)
+    aws-partitions (1.881.0)
+    aws-sdk-core (3.190.3)
+      aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
-      aws-sigv4 (~> 1.5)
+      aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.71.0)
-      aws-sdk-core (~> 3, >= 3.177.0)
+    aws-sdk-kms (1.76.0)
+      aws-sdk-core (~> 3, >= 3.188.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-s3 (1.94.1)
       aws-sdk-core (~> 3, >= 3.112.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.6.0)
+    aws-sigv4 (1.8.0)
       aws-eventstream (~> 1, >= 1.0.2)
     backport (1.2.0)
-    base64 (0.1.1)
+    base64 (0.2.0)
     bcrypt_pbkdf (1.1.0)
-    benchmark (0.2.1)
-    bigdecimal (3.1.5)
+    benchmark (0.3.0)
+    bigdecimal (3.1.6)
     bindex (0.8.1)
-    bootsnap (1.16.0)
+    bootsnap (1.17.1)
       msgpack (~> 1.2)
     builder (3.2.4)
     byebug (11.1.3)
@@ -127,15 +142,17 @@ GEM
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
     coderay (1.1.3)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.2.3)
     connection_pool (2.4.1)
     crass (1.0.6)
-    date (3.3.3)
+    date (3.3.4)
     diff-lcs (1.5.0)
     diffy (3.4.2)
     docile (1.4.0)
-    dockerfile-rails (1.5.7)
-      rails
+    dockerfile-rails (1.6.3)
+      rails (>= 3.0.0)
+    drb (2.2.0)
+      ruby2_keywords
     e2mmap (0.1.0)
     ed25519 (1.3.0)
     elasticsearch (7.13.3)
@@ -174,8 +191,8 @@ GEM
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
     faraday-retry (1.0.3)
-    ffi (1.15.5)
-    fugit (1.8.1)
+    ffi (1.16.3)
+    fugit (1.9.0)
       et-orbi (~> 1, >= 1.2.7)
       raabro (~> 1.4)
     globalid (1.2.1)
@@ -195,9 +212,13 @@ GEM
     image_processing (1.12.2)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
+    io-console (0.7.2)
+    irb (1.11.1)
+      rdoc
+      reline (>= 0.4.2)
     jaro_winkler (1.5.6)
     jmespath (1.6.2)
-    json (2.6.3)
+    json (2.7.1)
     jwt (2.7.1)
     kaminari (1.2.2)
       activesupport (>= 4.1.0)
@@ -219,7 +240,7 @@ GEM
     listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.21.3)
+    loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.8.1)
@@ -232,27 +253,38 @@ 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)
+    minitest (5.21.2)
     msgpack (1.7.2)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.3.0)
-    net-imap (0.3.7)
+    mutex_m (0.2.0)
+    net-imap (0.4.9.1)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
-    net-protocol (0.2.1)
+    net-protocol (0.2.2)
       timeout
     net-scp (4.0.0)
       net-ssh (>= 2.6.5, < 8.0.0)
-    net-smtp (0.3.3)
+    net-sftp (4.0.0)
+      net-ssh (>= 5.0.0, < 8.0.0)
+    net-smtp (0.4.0.1)
       net-protocol
-    net-ssh (7.2.0)
+    net-ssh (7.2.1)
     nio4r (2.7.0)
-    nokogiri (1.15.4)
-      mini_portile2 (~> 2.8.2)
+    nokogiri (1.16.0-aarch64-linux)
+      racc (~> 1.4)
+    nokogiri (1.16.0-arm-linux)
+      racc (~> 1.4)
+    nokogiri (1.16.0-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.16.0-x86-linux)
+      racc (~> 1.4)
+    nokogiri (1.16.0-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.16.0-x86_64-linux)
       racc (~> 1.4)
     oauth2 (1.4.11)
       faraday (>= 0.17.3, < 3.0)
@@ -284,8 +316,8 @@ GEM
     omniauth-rails_csrf_protection (1.0.1)
       actionpack (>= 4.2)
       omniauth (~> 2.0)
-    parallel (1.23.0)
-    parser (3.2.2.3)
+    parallel (1.24.0)
+    parser (3.3.0.4)
       ast (~> 2.4.1)
       racc
     pg (1.5.4)
@@ -295,37 +327,44 @@ GEM
       method_source (~> 1.0)
     pry-rails (0.3.9)
       pry (>= 0.10.4)
-    public_suffix (5.0.3)
+    psych (5.1.2)
+      stringio
+    public_suffix (5.0.4)
     puma (5.6.8)
       nio4r (~> 2.0)
     raabro (1.4.0)
-    racc (1.7.1)
+    racc (1.7.3)
     rack (2.2.8)
     rack-cors (1.1.1)
       rack (>= 2.0.0)
     rack-mini-profiler (2.3.4)
       rack (>= 1.2.0)
-    rack-protection (3.1.0)
+    rack-protection (3.2.0)
+      base64 (>= 0.1.0)
       rack (~> 2.2, >= 2.2.4)
     rack-proxy (0.7.7)
       rack
+    rack-session (1.0.2)
+      rack (< 3)
     rack-test (2.1.0)
       rack (>= 1.3)
-    rails (6.1.7.6)
-      actioncable (= 6.1.7.6)
-      actionmailbox (= 6.1.7.6)
-      actionmailer (= 6.1.7.6)
-      actionpack (= 6.1.7.6)
-      actiontext (= 6.1.7.6)
-      actionview (= 6.1.7.6)
-      activejob (= 6.1.7.6)
-      activemodel (= 6.1.7.6)
-      activerecord (= 6.1.7.6)
-      activestorage (= 6.1.7.6)
-      activesupport (= 6.1.7.6)
+    rackup (1.0.0)
+      rack (< 3)
+      webrick
+    rails (7.1.3)
+      actioncable (= 7.1.3)
+      actionmailbox (= 7.1.3)
+      actionmailer (= 7.1.3)
+      actionpack (= 7.1.3)
+      actiontext (= 7.1.3)
+      actionview (= 7.1.3)
+      activejob (= 7.1.3)
+      activemodel (= 7.1.3)
+      activerecord (= 7.1.3)
+      activestorage (= 7.1.3)
+      activesupport (= 7.1.3)
       bundler (>= 1.15.0)
-      railties (= 6.1.7.6)
-      sprockets-rails (>= 2.0.0)
+      railties (= 7.1.3)
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
@@ -333,43 +372,48 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    railties (6.1.7.6)
-      actionpack (= 6.1.7.6)
-      activesupport (= 6.1.7.6)
-      method_source
+    railties (7.1.3)
+      actionpack (= 7.1.3)
+      activesupport (= 7.1.3)
+      irb
+      rackup (>= 1.0.0)
       rake (>= 12.2)
-      thor (~> 1.0)
+      thor (~> 1.0, >= 1.2.2)
+      zeitwerk (~> 2.6)
     rainbow (3.1.1)
-    rake (13.0.6)
+    rake (13.1.0)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rbs (2.8.4)
-    redis-client (0.17.0)
+    rdoc (6.6.2)
+      psych (>= 4.0.0)
+    redis-client (0.19.1)
       connection_pool
-    regexp_parser (2.8.1)
+    regexp_parser (2.9.0)
+    reline (0.4.2)
+      io-console (~> 0.5)
     request_store (1.5.1)
       rack (>= 1.4)
     reverse_markdown (2.1.1)
       nokogiri
     rexml (3.2.6)
     rinku (2.0.6)
-    rubocop (1.56.3)
-      base64 (~> 0.1.1)
+    rubocop (1.60.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.2.3)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.1, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.29.0)
+    rubocop-ast (1.30.0)
       parser (>= 3.2.1.0)
     ruby-progressbar (1.13.0)
-    ruby-vips (2.1.4)
+    ruby-vips (2.2.0)
       ffi (~> 1.12)
     ruby2_keywords (0.0.5)
     ruby_dig (0.0.2)
@@ -398,7 +442,7 @@ GEM
       elasticsearch (>= 6)
       hashie
     semantic_range (3.0.0)
-    sidekiq (7.1.4)
+    sidekiq (7.2.0)
       concurrent-ruby (< 2)
       connection_pool (>= 2.3.0)
       rack (>= 2.2.4)
@@ -414,7 +458,7 @@ GEM
     simplecov-html (0.12.3)
     simplecov-lcov (0.8.0)
     simplecov_json_formatter (0.1.4)
-    solargraph (0.49.0)
+    solargraph (0.50.0)
       backport (~> 1.2)
       benchmark
       bundler (~> 2.0)
@@ -440,12 +484,15 @@ GEM
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    sshkit (1.21.5)
+    sshkit (1.22.0)
+      mutex_m
       net-scp (>= 1.1.2)
+      net-sftp (>= 2.1.2)
       net-ssh (>= 2.8.0)
-    thor (1.2.2)
+    stringio (3.1.0)
+    thor (1.3.0)
     tilt (2.3.0)
-    timeout (0.4.0)
+    timeout (0.4.1)
     trestle (0.9.8)
       activemodel (>= 4.2.0)
       kaminari (>= 1.1.0)
@@ -453,11 +500,11 @@ GEM
       sprockets-rails (>= 2.0.0)
     trestle-search (0.4.3)
       trestle (~> 0.9.0, >= 0.9.3)
-    typhoeus (1.4.0)
+    typhoeus (1.4.1)
       ethon (>= 0.9.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.4.2)
+    unicode-display_width (2.5.0)
     web-console (4.2.1)
       actionview (>= 6.0.0)
       activemodel (>= 6.0.0)
@@ -468,19 +515,21 @@ GEM
       rack-proxy (>= 0.6.1)
       railties (>= 5.2)
       semantic_range (>= 2.3.0)
+    webrick (1.8.1)
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
     yard (0.9.34)
-    zeitwerk (2.6.11)
+    zeitwerk (2.6.12)
 
 PLATFORMS
-  arm64-darwin-21
-  arm64-darwin-22
-  arm64-darwin-23
-  x86_64-darwin-22
+  aarch64-linux
+  arm-linux
+  arm64-darwin
+  x86-linux
+  x86_64-darwin
   x86_64-linux
 
 DEPENDENCIES
@@ -488,7 +537,7 @@ DEPENDENCIES
   activejob-null (~> 0.0.1)
   angular_rails_csrf (~> 5.0.0)
   audited (~> 5.3)
-  awesome_nested_set (~> 3.3.0)
+  awesome_nested_set (~> 3.6.0)
   aws-sdk-s3 (~> 1.94.0)
   bcrypt_pbkdf
   bootsnap (>= 1.4.4)
@@ -520,7 +569,7 @@ DEPENDENCIES
   puma (= 5.6.8)
   rack-cors (~> 1.1.1)
   rack-mini-profiler (~> 2.0)
-  rails (~> 6.1, >= 6.1.3.1)
+  rails (~> 7.1)
   rinku (~> 2.0.6)
   sanitize (~> 6.0.2)
   sass-rails (>= 6)
@@ -540,7 +589,7 @@ DEPENDENCIES
   webpacker (~> 5.0)
 
 RUBY VERSION
-   ruby 3.2.0p0
+   ruby 3.3.0p0
 
 BUNDLED WITH
-   2.4.10
+   2.5.3
diff --git a/server/bin/rails b/server/bin/rails
index 21d3e02d8..efc037749 100755
--- a/server/bin/rails
+++ b/server/bin/rails
@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-load File.expand_path("spring", __dir__)
-APP_PATH = File.expand_path('../config/application', __dir__)
+APP_PATH = File.expand_path("../config/application", __dir__)
 require_relative "../config/boot"
 require "rails/commands"
diff --git a/server/bin/rake b/server/bin/rake
index 7327f471e..4fbf10b96 100755
--- a/server/bin/rake
+++ b/server/bin/rake
@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-load File.expand_path("spring", __dir__)
 require_relative "../config/boot"
 require "rake"
 Rake.application.run
diff --git a/server/bin/setup b/server/bin/setup
index 90700ac4f..3cd5a9d78 100755
--- a/server/bin/setup
+++ b/server/bin/setup
@@ -2,10 +2,10 @@
 require "fileutils"
 
 # path to your application root.
-APP_ROOT = File.expand_path('..', __dir__)
+APP_ROOT = File.expand_path("..", __dir__)
 
 def system!(*args)
-  system(*args) || abort("\n== Command #{args} failed ==")
+  system(*args, exception: true)
 end
 
 FileUtils.chdir APP_ROOT do
@@ -13,24 +13,21 @@ FileUtils.chdir APP_ROOT do
   # This script is idempotent, so that you can run it at any time and get an expectable outcome.
   # Add necessary setup steps to this file.
 
-  puts '== Installing dependencies =='
-  system! 'gem install bundler --conservative'
-  system('bundle check') || system!('bundle install')
-
-  # Install JavaScript dependencies
-  system! 'bin/yarn'
+  puts "== Installing dependencies =="
+  system! "gem install bundler --conservative"
+  system("bundle check") || system!("bundle install")
 
   # puts "\n== Copying sample files =="
-  # unless File.exist?('config/database.yml')
-  #   FileUtils.cp 'config/database.yml.sample', 'config/database.yml'
+  # unless File.exist?("config/database.yml")
+  #   FileUtils.cp "config/database.yml.sample", "config/database.yml"
   # end
 
   puts "\n== Preparing database =="
-  system! 'bin/rails db:prepare'
+  system! "bin/rails db:prepare"
 
   puts "\n== Removing old logs and tempfiles =="
-  system! 'bin/rails log:clear tmp:clear'
+  system! "bin/rails log:clear tmp:clear"
 
   puts "\n== Restarting application server =="
-  system! 'bin/rails restart'
+  system! "bin/rails restart"
 end
diff --git a/server/config/application.rb b/server/config/application.rb
index b4db94338..0fcdaac30 100644
--- a/server/config/application.rb
+++ b/server/config/application.rb
@@ -12,7 +12,6 @@
 # require "action_text/engine"
 require "action_view/railtie"
 # require "action_cable/engine"
-require "sprockets/railtie"
 require "rails/test_unit/railtie"
 
 # Require the gems listed in Gemfile, including any gems
@@ -24,6 +23,13 @@ class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
     config.load_defaults 6.1
 
+    config.active_support.cache_format_version = 7.1
+
+    # Please, add to the `ignore` list any other `lib` subdirectories that do
+    # not contain `.rb` files, or that should not be reloaded or eager loaded.
+    # Common ones are `templates`, `generators`, or `middleware`, for example.
+    config.autoload_lib(ignore: %w(assets tasks))
+
     # Configuration for the application, engines, and railties goes here.
     #
     # These settings can be overridden in specific environments using the files
diff --git a/server/config/boot.rb b/server/config/boot.rb
index 3cda23b4d..988a5ddc4 100644
--- a/server/config/boot.rb
+++ b/server/config/boot.rb
@@ -1,4 +1,4 @@
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
 
 require "bundler/setup" # Set up gems listed in the Gemfile.
 require "bootsnap/setup" # Speed up boot time by caching expensive operations.
diff --git a/server/config/environments/development.rb b/server/config/environments/development.rb
index 3ef381dd2..c129b5ff8 100644
--- a/server/config/environments/development.rb
+++ b/server/config/environments/development.rb
@@ -6,7 +6,7 @@
   # In the development environment your application's code is reloaded any time
   # it changes. This slows down response time but is perfect for development
   # since you don't have to restart the web server when you make code changes.
-  config.cache_classes = false
+  config.enable_reloading = true
 
   # Do not eager load code on boot.
   config.eager_load = false
@@ -14,15 +14,18 @@
   # Show full error reports.
   config.consider_all_requests_local = true
 
+  # Enable server timing
+  config.server_timing = true
+
   # Enable/disable caching. By default caching is disabled.
   # Run rails dev:cache to toggle caching.
-  if Rails.root.join('tmp', 'caching-dev.txt').exist?
+  if Rails.root.join("tmp/caching-dev.txt").exist?
     config.action_controller.perform_caching = true
     config.action_controller.enable_fragment_cache_logging = true
 
     config.cache_store = :memory_store
     config.public_file_server.headers = {
-      'Cache-Control' => "public, max-age=#{2.days.to_i}"
+      "Cache-Control" => "public, max-age=#{2.days.to_i}"
     }
   else
     config.action_controller.perform_caching = false
@@ -30,8 +33,6 @@
     config.cache_store = :null_store
   end
 
-  config.active_job.queue_adapter = :inline
-
   # Store uploaded files on the local file system (see config/storage.yml for options).
   config.active_storage.service = :local
 
@@ -55,10 +56,8 @@
   # Highlight code that triggered database queries in logs.
   config.active_record.verbose_query_logs = true
 
-  # Debug mode disables concatenation and preprocessing of assets.
-  # This option may cause significant delays in view rendering with a large
-  # number of complex assets.
-  config.assets.debug = true
+  # Highlight code that enqueued background job in logs.
+  config.active_job.verbose_enqueue_logs = true
 
   # Suppress logger output for asset requests.
   config.assets.quiet = true
@@ -69,10 +68,6 @@
   # Annotate rendered view with file names.
   # config.action_view.annotate_rendered_view_with_filenames = true
 
-  # Use an evented file watcher to asynchronously detect changes in source code,
-  # routes, locales, etc. This feature depends on the listen gem.
-  config.file_watcher = ActiveSupport::EventedFileUpdateChecker
-
-  # Uncomment if you wish to allow Action Cable access from any origin.
-  # config.action_cable.disable_request_forgery_protection = true
+  # Raise error when a before_action's only/except options reference missing actions
+  config.action_controller.raise_on_missing_callback_actions = true
 end
diff --git a/server/config/initializers/assets.rb b/server/config/initializers/assets.rb
index 4b828e80c..2eeef966f 100644
--- a/server/config/initializers/assets.rb
+++ b/server/config/initializers/assets.rb
@@ -1,12 +1,10 @@
 # Be sure to restart your server when you modify this file.
 
 # Version of your assets, change this if you want to expire all your assets.
-Rails.application.config.assets.version = '1.0'
+Rails.application.config.assets.version = "1.0"
 
 # Add additional assets to the asset load path.
 # Rails.application.config.assets.paths << Emoji.images_path
-# Add Yarn node_modules folder to the asset load path.
-Rails.application.config.assets.paths << Rails.root.join('node_modules')
 
 # Precompile additional assets.
 # application.js, application.css, and all non-JS/CSS in the app/assets
diff --git a/server/config/initializers/content_security_policy.rb b/server/config/initializers/content_security_policy.rb
index 35d0f26fc..b3076b38f 100644
--- a/server/config/initializers/content_security_policy.rb
+++ b/server/config/initializers/content_security_policy.rb
@@ -1,30 +1,25 @@
 # Be sure to restart your server when you modify this file.
 
-# Define an application-wide content security policy
-# For further information see the following documentation
-# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy
+# Define an application-wide content security policy.
+# See the Securing Rails Applications Guide for more information:
+# https://guides.rubyonrails.org/security.html#content-security-policy-header
 
-# Rails.application.config.content_security_policy do |policy|
-#   policy.default_src :self, :https
-#   policy.font_src    :self, :https, :data
-#   policy.img_src     :self, :https, :data
-#   policy.object_src  :none
-#   policy.script_src  :self, :https
-#   policy.style_src   :self, :https
-#   # If you are using webpack-dev-server then specify webpack-dev-server host
-#   policy.connect_src :self, :https, "http://localhost:3035", "ws://localhost:3035" if Rails.env.development?
-
-#   # Specify URI for violation reports
-#   # policy.report_uri "/csp-violation-report-endpoint"
+# Rails.application.configure do
+#   config.content_security_policy do |policy|
+#     policy.default_src :self, :https
+#     policy.font_src    :self, :https, :data
+#     policy.img_src     :self, :https, :data
+#     policy.object_src  :none
+#     policy.script_src  :self, :https
+#     policy.style_src   :self, :https
+#     # Specify URI for violation reports
+#     # policy.report_uri "/csp-violation-report-endpoint"
+#   end
+#
+#   # Generate session nonces for permitted importmap, inline scripts, and inline styles.
+#   config.content_security_policy_nonce_generator = ->(request) { request.session.id.to_s }
+#   config.content_security_policy_nonce_directives = %w(script-src style-src)
+#
+#   # Report violations without enforcing the policy.
+#   # config.content_security_policy_report_only = true
 # end
-
-# If you are using UJS then enable automatic nonce generation
-# Rails.application.config.content_security_policy_nonce_generator = -> request { SecureRandom.base64(16) }
-
-# Set the nonce only to specific directives
-# Rails.application.config.content_security_policy_nonce_directives = %w(script-src)
-
-# Report CSP violations to a specified URI
-# For further information see the following documentation:
-# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only
-# Rails.application.config.content_security_policy_report_only = true
diff --git a/server/config/initializers/filter_parameter_logging.rb b/server/config/initializers/filter_parameter_logging.rb
index 4b34a0366..c2d89e28a 100644
--- a/server/config/initializers/filter_parameter_logging.rb
+++ b/server/config/initializers/filter_parameter_logging.rb
@@ -1,6 +1,8 @@
 # Be sure to restart your server when you modify this file.
 
-# Configure sensitive parameters which will be filtered from the log file.
+# Configure parameters to be partially matched (e.g. passw matches password) and filtered from the log file.
+# Use this to limit dissemination of sensitive information.
+# See the ActiveSupport::ParameterFilter documentation for supported notations and behaviors.
 Rails.application.config.filter_parameters += [
   :passw, :secret, :token, :_key, :crypt, :salt, :certificate, :otp, :ssn
 ]
diff --git a/server/config/initializers/inflections.rb b/server/config/initializers/inflections.rb
index ac033bf9d..3860f659e 100644
--- a/server/config/initializers/inflections.rb
+++ b/server/config/initializers/inflections.rb
@@ -4,13 +4,13 @@
 # are locale specific, and you may define rules for as many different
 # locales as you wish. All of these examples are active by default:
 # ActiveSupport::Inflector.inflections(:en) do |inflect|
-#   inflect.plural /^(ox)$/i, '\1en'
-#   inflect.singular /^(ox)en/i, '\1'
-#   inflect.irregular 'person', 'people'
+#   inflect.plural /^(ox)$/i, "\\1en"
+#   inflect.singular /^(ox)en/i, "\\1"
+#   inflect.irregular "person", "people"
 #   inflect.uncountable %w( fish sheep )
 # end
 
 # These inflection rules are supported but not enabled by default:
 # ActiveSupport::Inflector.inflections(:en) do |inflect|
-#   inflect.acronym 'RESTful'
+#   inflect.acronym "RESTful"
 # end
diff --git a/server/config/initializers/new_framework_defaults_7_1.rb b/server/config/initializers/new_framework_defaults_7_1.rb
new file mode 100644
index 000000000..e925a6f75
--- /dev/null
+++ b/server/config/initializers/new_framework_defaults_7_1.rb
@@ -0,0 +1,268 @@
+# Be sure to restart your server when you modify this file.
+#
+# This file eases your Rails 7.1 framework defaults upgrade.
+#
+# Uncomment each configuration one by one to switch to the new default.
+# Once your application is ready to run with all new defaults, you can remove
+# this file and set the `config.load_defaults` to `7.1`.
+#
+# Read the Guide for Upgrading Ruby on Rails for more info on each option.
+# https://guides.rubyonrails.org/upgrading_ruby_on_rails.html
+
+###
+# No longer add autoloaded paths into `$LOAD_PATH`. This means that you won't be able
+# to manually require files that are managed by the autoloader, which you shouldn't do anyway.
+#
+# This will reduce the size of the load path, making `require` faster if you don't use bootsnap, or reduce the size
+# of the bootsnap cache if you use it.
+#
+# To set this configuration, add the following line to `config/application.rb` (NOT this file):
+#   config.add_autoload_paths_to_load_path = false
+
+###
+# Remove the default X-Download-Options headers since it is used only by Internet Explorer.
+# If you need to support Internet Explorer, add back `"X-Download-Options" => "noopen"`.
+#++
+# Rails.application.config.action_dispatch.default_headers = {
+#   "X-Frame-Options" => "SAMEORIGIN",
+#   "X-XSS-Protection" => "0",
+#   "X-Content-Type-Options" => "nosniff",
+#   "X-Permitted-Cross-Domain-Policies" => "none",
+#   "Referrer-Policy" => "strict-origin-when-cross-origin"
+# }
+
+###
+# Do not treat an `ActionController::Parameters` instance
+# as equal to an equivalent `Hash` by default.
+#++
+# Rails.application.config.action_controller.allow_deprecated_parameters_hash_equality = false
+
+###
+# Active Record Encryption now uses SHA-256 as its hash digest algorithm.
+#
+# There are 3 scenarios to consider.
+#
+# 1. If you have data encrypted with previous Rails versions, and you have
+# +config.active_support.key_generator_hash_digest_class+ configured as SHA1 (the default
+# before Rails 7.0), you need to configure SHA-1 for Active Record Encryption too:
+#++
+# Rails.application.config.active_record.encryption.hash_digest_class = OpenSSL::Digest::SHA1
+#
+# 2. If you have +config.active_support.key_generator_hash_digest_class+ configured as SHA256 (the new default
+# in 7.0), then you need to configure SHA-256 for Active Record Encryption:
+#++
+# Rails.application.config.active_record.encryption.hash_digest_class = OpenSSL::Digest::SHA256
+#
+# 3. If you don't currently have data encrypted with Active Record encryption, you can disable this setting to
+# configure the default behavior starting 7.1+:
+#++
+# Rails.application.config.active_record.encryption.support_sha1_for_non_deterministic_encryption = false
+
+###
+# No longer run after_commit callbacks on the first of multiple Active Record
+# instances to save changes to the same database row within a transaction.
+# Instead, run these callbacks on the instance most likely to have internal
+# state which matches what was committed to the database, typically the last
+# instance to save.
+#++
+# Rails.application.config.active_record.run_commit_callbacks_on_first_saved_instances_in_transaction = false
+
+###
+# Configures SQLite with a strict strings mode, which disables double-quoted string literals.
+#
+# SQLite has some quirks around double-quoted string literals.
+# It first tries to consider double-quoted strings as identifier names, but if they don't exist
+# it then considers them as string literals. Because of this, typos can silently go unnoticed.
+# For example, it is possible to create an index for a non existing column.
+# See https://www.sqlite.org/quirks.html#double_quoted_string_literals_are_accepted for more details.
+#++
+# Rails.application.config.active_record.sqlite3_adapter_strict_strings_by_default = true
+
+###
+# Disable deprecated singular associations names.
+#++
+# Rails.application.config.active_record.allow_deprecated_singular_associations_name = false
+
+###
+# Enable the Active Job `BigDecimal` argument serializer, which guarantees
+# roundtripping. Without this serializer, some queue adapters may serialize
+# `BigDecimal` arguments as simple (non-roundtrippable) strings.
+#
+# When deploying an application with multiple replicas, old (pre-Rails 7.1)
+# replicas will not be able to deserialize `BigDecimal` arguments from this
+# serializer. Therefore, this setting should only be enabled after all replicas
+# have been successfully upgraded to Rails 7.1.
+#++
+# Rails.application.config.active_job.use_big_decimal_serializer = true
+
+###
+# Specify if an `ArgumentError` should be raised if `Rails.cache` `fetch` or
+# `write` are given an invalid `expires_at` or `expires_in` time.
+# Options are `true`, and `false`. If `false`, the exception will be reported
+# as `handled` and logged instead.
+#++
+# Rails.application.config.active_support.raise_on_invalid_cache_expiration_time = true
+
+###
+# Specify whether Query Logs will format tags using the SQLCommenter format
+# (https://open-telemetry.github.io/opentelemetry-sqlcommenter/), or using the legacy format.
+# Options are `:legacy` and `:sqlcommenter`.
+#++
+# Rails.application.config.active_record.query_log_tags_format = :sqlcommenter
+
+###
+# Specify the default serializer used by `MessageEncryptor` and `MessageVerifier`
+# instances.
+#
+# The legacy default is `:marshal`, which is a potential vector for
+# deserialization attacks in cases where a message signing secret has been
+# leaked.
+#
+# In Rails 7.1, the new default is `:json_allow_marshal` which serializes and
+# deserializes with `ActiveSupport::JSON`, but can fall back to deserializing
+# with `Marshal` so that legacy messages can still be read.
+#
+# In Rails 7.2, the default will become `:json` which serializes and
+# deserializes with `ActiveSupport::JSON` only.
+#
+# Alternatively, you can choose `:message_pack` or `:message_pack_allow_marshal`,
+# which serialize with `ActiveSupport::MessagePack`. `ActiveSupport::MessagePack`
+# can roundtrip some Ruby types that are not supported by JSON, and may provide
+# improved performance, but it requires the `msgpack` gem.
+#
+# For more information, see
+# https://guides.rubyonrails.org/v7.1/configuring.html#config-active-support-message-serializer
+#
+# If you are performing a rolling deploy of a Rails 7.1 upgrade, wherein servers
+# that have not yet been upgraded must be able to read messages from upgraded
+# servers, first deploy without changing the serializer, then set the serializer
+# in a subsequent deploy.
+#++
+# Rails.application.config.active_support.message_serializer = :json_allow_marshal
+
+###
+# Enable a performance optimization that serializes message data and metadata
+# together. This changes the message format, so messages serialized this way
+# cannot be read by older versions of Rails. However, messages that use the old
+# format can still be read, regardless of whether this optimization is enabled.
+#
+# To perform a rolling deploy of a Rails 7.1 upgrade, wherein servers that have
+# not yet been upgraded must be able to read messages from upgraded servers,
+# leave this optimization off on the first deploy, then enable it on a
+# subsequent deploy.
+#++
+# Rails.application.config.active_support.use_message_serializer_for_metadata = true
+
+###
+# Set the maximum size for Rails log files.
+#
+# `config.load_defaults 7.1` does not set this value for environments other than
+# development and test.
+#++
+# if Rails.env.local?
+#   Rails.application.config.log_file_size = 100 * 1024 * 1024
+# end
+
+###
+# Enable raising on assignment to attr_readonly attributes. The previous
+# behavior would allow assignment but silently not persist changes to the
+# database.
+#++
+# Rails.application.config.active_record.raise_on_assign_to_attr_readonly = true
+
+###
+# Enable validating only parent-related columns for presence when the parent is mandatory.
+# The previous behavior was to validate the presence of the parent record, which performed an extra query
+# to get the parent every time the child record was updated, even when parent has not changed.
+#++
+# Rails.application.config.active_record.belongs_to_required_validates_foreign_key = false
+
+###
+# Enable precompilation of `config.filter_parameters`. Precompilation can
+# improve filtering performance, depending on the quantity and types of filters.
+#++
+# Rails.application.config.precompile_filter_parameters = true
+
+###
+# Enable before_committed! callbacks on all enrolled records in a transaction.
+# The previous behavior was to only run the callbacks on the first copy of a record
+# if there were multiple copies of the same record enrolled in the transaction.
+#++
+# Rails.application.config.active_record.before_committed_on_all_records = true
+
+###
+# Disable automatic column serialization into YAML.
+# To keep the historic behavior, you can set it to `YAML`, however it is
+# recommended to explicitly define the serialization method for each column
+# rather than to rely on a global default.
+#++
+# Rails.application.config.active_record.default_column_serializer = nil
+
+###
+# Enable a performance optimization that serializes Active Record models
+# in a faster and more compact way.
+#
+# To perform a rolling deploy of a Rails 7.1 upgrade, wherein servers that have
+# not yet been upgraded must be able to read caches from upgraded servers,
+# leave this optimization off on the first deploy, then enable it on a
+# subsequent deploy.
+#++
+# Rails.application.config.active_record.marshalling_format_version = 7.1
+
+###
+# Run `after_commit` and `after_*_commit` callbacks in the order they are defined in a model.
+# This matches the behaviour of all other callbacks.
+# In previous versions of Rails, they ran in the inverse order.
+#++
+# Rails.application.config.active_record.run_after_transaction_callbacks_in_order_defined = true
+
+###
+# Whether a `transaction` block is committed or rolled back when exited via `return`, `break` or `throw`.
+#++
+# Rails.application.config.active_record.commit_transaction_on_non_local_return = true
+
+###
+# Controls when to generate a value for <tt>has_secure_token</tt> declarations.
+#++
+# Rails.application.config.active_record.generate_secure_token_on = :initialize
+
+###
+# Configure Action View to use HTML5 standards-compliant sanitizers when they are supported on your
+# platform.
+#
+# `Rails::HTML::Sanitizer.best_supported_vendor` will cause Action View to use HTML5-compliant
+# sanitizers if they are supported, else fall back to HTML4 sanitizers.
+#
+# In previous versions of Rails, Action View always used `Rails::HTML4::Sanitizer` as its vendor.
+#++
+# Rails.application.config.action_view.sanitizer_vendor = Rails::HTML::Sanitizer.best_supported_vendor
+
+
+###
+# Configure Action Text to use an HTML5 standards-compliant sanitizer when it is supported on your
+# platform.
+#
+# `Rails::HTML::Sanitizer.best_supported_vendor` will cause Action Text to use HTML5-compliant
+# sanitizers if they are supported, else fall back to HTML4 sanitizers.
+#
+# In previous versions of Rails, Action Text always used `Rails::HTML4::Sanitizer` as its vendor.
+#++
+# Rails.application.config.action_text.sanitizer_vendor = Rails::HTML::Sanitizer.best_supported_vendor
+
+
+###
+# Configure the log level used by the DebugExceptions middleware when logging
+# uncaught exceptions during requests.
+#++
+# Rails.application.config.action_dispatch.debug_exception_log_level = :error
+
+
+###
+# Configure the test helpers in Action View, Action Dispatch, and rails-dom-testing to use HTML5
+# parsers.
+#
+# Nokogiri::HTML5 isn't supported on JRuby, so JRuby applications must set this to :html4.
+#
+# In previous versions of Rails, these test helpers always used an HTML4 parser.
+#++
+# Rails.application.config.dom_testing_default_html_version = :html5
diff --git a/server/config/initializers/permissions_policy.rb b/server/config/initializers/permissions_policy.rb
index 00f64d71b..7db3b9577 100644
--- a/server/config/initializers/permissions_policy.rb
+++ b/server/config/initializers/permissions_policy.rb
@@ -1,11 +1,13 @@
+# Be sure to restart your server when you modify this file.
+
 # Define an application-wide HTTP permissions policy. For further
-# information see https://developers.google.com/web/updates/2018/06/feature-policy
-#
-# Rails.application.config.permissions_policy do |f|
-#   f.camera      :none
-#   f.gyroscope   :none
-#   f.microphone  :none
-#   f.usb         :none
-#   f.fullscreen  :self
-#   f.payment     :self, "https://secure.example.com"
+# information see: https://developers.google.com/web/updates/2018/06/feature-policy
+
+# Rails.application.config.permissions_policy do |policy|
+#   policy.camera      :none
+#   policy.gyroscope   :none
+#   policy.microphone  :none
+#   policy.usb         :none
+#   policy.fullscreen  :self
+#   policy.payment     :self, "https://secure.example.com"
 # end
diff --git a/server/db/migrate/20240118184728_add_service_name_to_active_storage_blobs.active_storage.rb b/server/db/migrate/20240118184728_add_service_name_to_active_storage_blobs.active_storage.rb
new file mode 100644
index 000000000..a15c6ce8e
--- /dev/null
+++ b/server/db/migrate/20240118184728_add_service_name_to_active_storage_blobs.active_storage.rb
@@ -0,0 +1,22 @@
+# This migration comes from active_storage (originally 20190112182829)
+class AddServiceNameToActiveStorageBlobs < ActiveRecord::Migration[6.0]
+  def up
+    return unless table_exists?(:active_storage_blobs)
+
+    unless column_exists?(:active_storage_blobs, :service_name)
+      add_column :active_storage_blobs, :service_name, :string
+
+      if configured_service = ActiveStorage::Blob.service.name
+        ActiveStorage::Blob.unscoped.update_all(service_name: configured_service)
+      end
+
+      change_column :active_storage_blobs, :service_name, :string, null: false
+    end
+  end
+
+  def down
+    return unless table_exists?(:active_storage_blobs)
+
+    remove_column :active_storage_blobs, :service_name
+  end
+end
diff --git a/server/db/migrate/20240118184729_create_active_storage_variant_records.active_storage.rb b/server/db/migrate/20240118184729_create_active_storage_variant_records.active_storage.rb
new file mode 100644
index 000000000..94ac83af0
--- /dev/null
+++ b/server/db/migrate/20240118184729_create_active_storage_variant_records.active_storage.rb
@@ -0,0 +1,27 @@
+# This migration comes from active_storage (originally 20191206030411)
+class CreateActiveStorageVariantRecords < ActiveRecord::Migration[6.0]
+  def change
+    return unless table_exists?(:active_storage_blobs)
+
+    # Use Active Record's configured type for primary key
+    create_table :active_storage_variant_records, id: primary_key_type, if_not_exists: true do |t|
+      t.belongs_to :blob, null: false, index: false, type: blobs_primary_key_type
+      t.string :variation_digest, null: false
+
+      t.index %i[ blob_id variation_digest ], name: "index_active_storage_variant_records_uniqueness", unique: true
+      t.foreign_key :active_storage_blobs, column: :blob_id
+    end
+  end
+
+  private
+    def primary_key_type
+      config = Rails.configuration.generators
+      config.options[config.orm][:primary_key_type] || :primary_key
+    end
+
+    def blobs_primary_key_type
+      pkey_name = connection.primary_key(:active_storage_blobs)
+      pkey_column = connection.columns(:active_storage_blobs).find { |c| c.name == pkey_name }
+      pkey_column.bigint? ? :bigint : pkey_column.type
+    end
+end
diff --git a/server/db/migrate/20240118184730_remove_not_null_on_active_storage_blobs_checksum.active_storage.rb b/server/db/migrate/20240118184730_remove_not_null_on_active_storage_blobs_checksum.active_storage.rb
new file mode 100644
index 000000000..93c8b85ad
--- /dev/null
+++ b/server/db/migrate/20240118184730_remove_not_null_on_active_storage_blobs_checksum.active_storage.rb
@@ -0,0 +1,8 @@
+# This migration comes from active_storage (originally 20211119233751)
+class RemoveNotNullOnActiveStorageBlobsChecksum < ActiveRecord::Migration[6.0]
+  def change
+    return unless table_exists?(:active_storage_blobs)
+
+    change_column_null(:active_storage_blobs, :checksum, true)
+  end
+end
diff --git a/server/db/schema.rb b/server/db/schema.rb
index fdeef1290..798ffb0e3 100644
--- a/server/db/schema.rb
+++ b/server/db/schema.rb
@@ -10,8 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2024_01_10_000025) do
-
+ActiveRecord::Schema[7.1].define(version: 2024_01_18_184730) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -33,7 +32,7 @@
     t.string "record_type", null: false
     t.bigint "record_id", null: false
     t.bigint "blob_id", null: false
-    t.datetime "created_at", null: false
+    t.datetime "created_at", precision: nil, null: false
     t.index ["blob_id"], name: "index_active_storage_attachments_on_blob_id"
     t.index ["record_type", "record_id", "name", "blob_id"], name: "index_active_storage_attachments_uniqueness", unique: true
   end
@@ -45,8 +44,8 @@
     t.text "metadata"
     t.string "service_name", null: false
     t.bigint "byte_size", null: false
-    t.string "checksum", null: false
-    t.datetime "created_at", null: false
+    t.string "checksum"
+    t.datetime "created_at", precision: nil, null: false
     t.index ["key"], name: "index_active_storage_blobs_on_key", unique: true
   end
 
@@ -62,8 +61,8 @@
     t.bigint "organization_id"
     t.string "subject_type", null: false
     t.bigint "subject_id", null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.text "verbiage"
     t.text "note"
     t.index ["organization_id"], name: "index_activities_on_organization_id"
@@ -76,15 +75,15 @@
     t.string "entity_type", null: false
     t.bigint "entity_id", null: false
     t.bigint "activity_id", null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["activity_id"], name: "index_activity_linked_entities_on_activity_id"
     t.index ["entity_type", "entity_id"], name: "index_activity_linked_entities_on_entity"
   end
 
   create_table "advanced_searches", id: :serial, force: :cascade do |t|
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.text "params"
     t.text "search_type"
     t.text "token"
@@ -94,16 +93,16 @@
   create_table "affiliations", id: false, force: :cascade do |t|
     t.bigint "user_id"
     t.bigint "organization_id"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.index ["organization_id"], name: "index_affiliations_on_organization_id"
     t.index ["user_id"], name: "index_affiliations_on_user_id"
   end
 
   create_table "assertions", id: :serial, force: :cascade do |t|
     t.text "description"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.boolean "deleted", default: false
     t.text "status", default: "submitted", null: false
     t.integer "nccn_guideline_old"
@@ -133,8 +132,8 @@
   create_table "assertions_clingen_codes", id: false, force: :cascade do |t|
     t.bigint "assertion_id", null: false
     t.bigint "clingen_code_id", null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["assertion_id"], name: "index_assertions_clingen_codes_on_assertion_id"
     t.index ["clingen_code_id", "assertion_id"], name: "idx_clingencodes_assertions"
   end
@@ -180,7 +179,7 @@
     t.string "comment"
     t.string "remote_address"
     t.string "request_uuid"
-    t.datetime "created_at"
+    t.datetime "created_at", precision: nil
     t.index ["action"], name: "index_audits_on_action"
     t.index ["associated_id", "associated_type"], name: "associated_index"
     t.index ["auditable_id", "auditable_type"], name: "auditable_index"
@@ -193,24 +192,24 @@
     t.integer "user_id", null: false
     t.string "provider", null: false
     t.string "uid", null: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.index ["user_id"], name: "index_authorizations_on_user_id"
   end
 
   create_table "authors", id: :serial, force: :cascade do |t|
     t.text "last_name"
     t.text "fore_name"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
   end
 
   create_table "authors_sources", id: false, force: :cascade do |t|
     t.integer "source_id"
     t.integer "author_id"
     t.integer "author_position"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.index ["author_id", "source_id"], name: "index_authors_sources_on_author_id_and_source_id"
     t.index ["source_id", "author_id"], name: "idx_author_source_id"
     t.index ["source_id"], name: "index_authors_sources_on_source_id"
@@ -221,8 +220,8 @@
     t.integer "user_id"
     t.text "tier"
     t.text "message"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.index ["badge_id", "user_id"], name: "index_badge_awards_on_badge_id_and_user_id"
     t.index ["user_id", "badge_id"], name: "index_badge_awards_on_user_id_and_badge_id"
   end
@@ -231,8 +230,8 @@
     t.integer "user_id"
     t.integer "badge_id"
     t.string "redemption_code"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.index ["badge_id"], name: "index_badge_claims_on_badge_id"
     t.index ["user_id"], name: "index_badge_claims_on_user_id"
   end
@@ -241,8 +240,8 @@
     t.text "name", null: false
     t.text "description", null: false
     t.text "additional_fields"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.text "display_name"
     t.index ["name"], name: "index_badges_on_name"
   end
@@ -258,8 +257,8 @@
     t.text "nct_id"
     t.text "name"
     t.text "description"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.index ["nct_id"], name: "index_clinical_trials_on_nct_id"
   end
 
@@ -274,8 +273,8 @@
 
   create_table "clinvar_entries", id: :serial, force: :cascade do |t|
     t.string "clinvar_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.index ["clinvar_id"], name: "index_clinvar_entries_on_clinvar_id"
   end
 
@@ -295,8 +294,8 @@
     t.integer "commentable_id"
     t.integer "user_id"
     t.string "role", default: "comments"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.index ["commentable_id"], name: "index_comments_on_commentable_id"
     t.index ["commentable_type"], name: "index_comments_on_commentable_type"
     t.index ["user_id"], name: "index_comments_on_user_id"
@@ -306,8 +305,8 @@
     t.integer "user_id", null: false
     t.boolean "coi_present", null: false
     t.text "coi_statement"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
   end
 
   create_table "countries", id: :serial, force: :cascade do |t|
@@ -322,8 +321,8 @@
   create_table "definitions", id: :serial, force: :cascade do |t|
     t.string "term", null: false
     t.text "text", null: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.index ["term"], name: "index_definitions_on_term"
   end
 
@@ -342,8 +341,8 @@
   create_table "diseases", id: :serial, force: :cascade do |t|
     t.text "doid"
     t.string "display_name", null: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.string "name"
     t.boolean "deprecated", default: false, null: false
     t.index ["name"], name: "index_diseases_on_name"
@@ -351,8 +350,8 @@
 
   create_table "domain_expert_tags", id: :serial, force: :cascade do |t|
     t.text "description"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.string "domain_of_expertise_type"
     t.integer "domain_of_expertise_id"
     t.integer "user_id"
@@ -362,8 +361,8 @@
   end
 
   create_table "entity_mentions", force: :cascade do |t|
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.string "entity_type"
     t.bigint "entity_id"
     t.bigint "comment_id"
@@ -372,8 +371,8 @@
   end
 
   create_table "events", id: :serial, force: :cascade do |t|
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.text "action"
     t.text "description"
     t.integer "originating_user_id"
@@ -400,8 +399,8 @@
     t.text "description", null: false
     t.integer "disease_id"
     t.integer "source_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.integer "rating"
     t.string "status"
     t.string "variant_hgvs"
@@ -411,7 +410,7 @@
     t.integer "evidence_direction"
     t.integer "significance"
     t.boolean "deleted", default: false
-    t.datetime "deleted_at"
+    t.datetime "deleted_at", precision: nil
     t.integer "therapy_interaction_type"
     t.boolean "flagged", default: false, null: false
     t.bigint "molecular_profile_id"
@@ -444,8 +443,8 @@
 
   create_table "feature_aliases", force: :cascade do |t|
     t.text "name", null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["name"], name: "index_feature_aliases_on_name"
   end
 
@@ -460,8 +459,8 @@
   create_table "features", force: :cascade do |t|
     t.text "name", null: false
     t.text "description"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.string "feature_instance_type", null: false
     t.bigint "feature_instance_id", null: false
     t.boolean "flagged", default: false, null: false
@@ -482,8 +481,8 @@
     t.string "flaggable_type"
     t.integer "flaggable_id"
     t.text "state"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.index ["flaggable_type", "flaggable_id"], name: "index_flags_on_flaggable_type_and_flaggable_id"
     t.index ["flagging_user_id"], name: "index_flags_on_flagging_user_id"
     t.index ["resolving_user_id"], name: "index_flags_on_resolving_user_id"
@@ -507,11 +506,11 @@
     t.string "name", null: false
     t.text "description", null: false
     t.text "official_name", null: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.text "clinical_description"
     t.boolean "deleted", default: false
-    t.datetime "deleted_at"
+    t.datetime "deleted_at", precision: nil
     t.boolean "flagged", default: false, null: false
     t.index "char_length((name)::text)", name: "gene_name_size_idx"
     t.index ["deleted"], name: "index_genes_on_deleted"
@@ -521,15 +520,15 @@
   create_table "genes_sources", id: false, force: :cascade do |t|
     t.integer "gene_id", null: false
     t.integer "source_id", null: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.index ["gene_id", "source_id"], name: "index_genes_sources_on_gene_id_and_source_id"
   end
 
   create_table "hgvs_descriptions", id: :serial, force: :cascade do |t|
     t.text "description"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.index ["description"], name: "index_hgvs_descriptions_on_description"
   end
 
@@ -556,8 +555,8 @@
 
   create_table "molecular_profiles", force: :cascade do |t|
     t.string "name"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.text "description"
     t.boolean "flagged", default: false, null: false
     t.float "evidence_score", null: false
@@ -570,8 +569,8 @@
   create_table "molecular_profiles_sources", id: false, force: :cascade do |t|
     t.bigint "molecular_profile_id", null: false
     t.bigint "source_id", null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["molecular_profile_id", "source_id"], name: "idx_mp_source_id"
   end
 
@@ -593,8 +592,8 @@
     t.boolean "seen", default: false
     t.integer "type"
     t.text "description"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.index ["created_at"], name: "index_notifications_on_created_at"
     t.index ["notified_user_id"], name: "index_notifications_on_notified_user_id"
   end
@@ -602,7 +601,7 @@
   create_table "ontologies", id: :serial, force: :cascade do |t|
     t.string "name"
     t.string "version"
-    t.datetime "import_date"
+    t.datetime "import_date", precision: nil
     t.string "permalink_format"
     t.string "civic_class"
     t.string "id_name"
@@ -613,9 +612,9 @@
     t.text "url"
     t.text "description"
     t.integer "parent_id"
-    t.datetime "created_at", precision: 6
-    t.datetime "updated_at", precision: 6
-    t.datetime "most_recent_activity_timestamp"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.datetime "most_recent_activity_timestamp", precision: nil
     t.index ["most_recent_activity_timestamp"], name: "index_organizations_on_most_recent_activity_timestamp"
   end
 
@@ -628,8 +627,8 @@
 
   create_table "pipeline_types", id: :serial, force: :cascade do |t|
     t.text "name", null: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.index ["name"], name: "index_pipeline_types_on_name"
   end
 
@@ -650,8 +649,8 @@
   end
 
   create_table "revision_sets", force: :cascade do |t|
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
   create_table "revisions", force: :cascade do |t|
@@ -661,8 +660,8 @@
     t.text "field_name", null: false
     t.jsonb "current_value"
     t.jsonb "suggested_value"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.uuid "revisionset_id"
     t.integer "revision_set_id"
     t.index ["created_at"], name: "index_revisions_on_created_at"
@@ -676,8 +675,8 @@
 
   create_table "role_mentions", force: :cascade do |t|
     t.integer "role", null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.bigint "comment_id"
     t.index ["comment_id"], name: "index_role_mentions_on_comment_id"
   end
@@ -687,8 +686,8 @@
     t.integer "user_id"
     t.text "initial_comment"
     t.text "status"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.text "reason"
     t.integer "disease_id"
     t.bigint "molecular_profile_id"
@@ -699,8 +698,8 @@
     t.string "citation_id", null: false
     t.string "study_type"
     t.text "citation"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.text "abstract"
     t.boolean "open_access"
     t.text "pmc_id"
@@ -723,8 +722,8 @@
   create_table "sources_variant_groups", id: false, force: :cascade do |t|
     t.integer "variant_group_id", null: false
     t.integer "source_id", null: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
   end
 
   create_table "subscriptions", id: :serial, force: :cascade do |t|
@@ -732,8 +731,8 @@
     t.string "subscribable_type"
     t.integer "subscribable_id"
     t.string "type"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.text "action_type"
     t.text "action_class"
     t.index ["action_type", "action_class"], name: "index_subscriptions_on_action_type_and_action_class"
@@ -747,8 +746,8 @@
     t.integer "moderated_id"
     t.integer "user_id", null: false
     t.string "status", default: "new", null: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.index ["created_at"], name: "index_suggested_changes_on_created_at"
     t.index ["moderated_id", "moderated_type"], name: "index_suggested_changes_on_moderated_id_and_moderated_type"
     t.index ["status"], name: "index_suggested_changes_on_status"
@@ -757,8 +756,8 @@
 
   create_table "therapies", id: :serial, force: :cascade do |t|
     t.string "name", null: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.text "ncit_id"
     t.boolean "deprecated", default: false, null: false
     t.index ["name"], name: "index_therapies_on_name"
@@ -779,13 +778,13 @@
 
   create_table "tsv_releases", id: :serial, force: :cascade do |t|
     t.text "path", null: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
   end
 
   create_table "user_mentions", force: :cascade do |t|
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.bigint "user_id"
     t.bigint "comment_id"
     t.index ["comment_id"], name: "index_user_mentions_on_comment_id"
@@ -797,14 +796,14 @@
     t.string "name"
     t.string "url"
     t.string "username"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.string "orcid"
     t.integer "area_of_expertise"
     t.boolean "deleted", default: false
-    t.datetime "deleted_at"
+    t.datetime "deleted_at", precision: nil
     t.integer "role", default: 0
-    t.datetime "last_seen_at"
+    t.datetime "last_seen_at", precision: nil
     t.text "twitter_handle"
     t.text "facebook_profile"
     t.text "linkedin_profile"
@@ -814,7 +813,7 @@
     t.boolean "signup_complete"
     t.integer "country_id"
     t.integer "most_recent_organization_id"
-    t.datetime "most_recent_activity_timestamp"
+    t.datetime "most_recent_activity_timestamp", precision: nil
     t.index ["country_id"], name: "index_users_on_country_id"
     t.index ["deleted"], name: "index_users_on_deleted"
     t.index ["last_seen_at"], name: "index_users_on_last_seen_at"
@@ -837,18 +836,18 @@
   create_table "variant_group_variants", id: false, force: :cascade do |t|
     t.integer "variant_id", null: false
     t.integer "variant_group_id", null: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.index ["variant_id", "variant_group_id"], name: "index_variant_group_variants_on_variant_id_and_variant_group_id"
   end
 
   create_table "variant_groups", id: :serial, force: :cascade do |t|
     t.string "name", null: false
     t.text "description"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.boolean "deleted", default: false
-    t.datetime "deleted_at"
+    t.datetime "deleted_at", precision: nil
     t.boolean "flagged", default: false, null: false
     t.index ["deleted"], name: "index_variant_groups_on_deleted"
   end
@@ -858,8 +857,8 @@
     t.text "display_name", null: false
     t.text "description", null: false
     t.text "soid", null: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.integer "parent_id"
     t.integer "lft"
     t.integer "rgt"
@@ -871,18 +870,18 @@
   create_table "variant_types_variants", id: false, force: :cascade do |t|
     t.integer "variant_id", null: false
     t.integer "variant_type_id", null: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.index ["variant_id", "variant_type_id"], name: "index_variant_types_variants_on_variant_id_and_variant_type_id"
   end
 
   create_table "variants", id: :serial, force: :cascade do |t|
     t.integer "gene_id", null: false
     t.string "name", null: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.boolean "deleted", default: false
-    t.datetime "deleted_at"
+    t.datetime "deleted_at", precision: nil
     t.text "genome_build"
     t.text "chromosome"
     t.integer "start"
@@ -925,8 +924,8 @@
 
   create_table "view_last_updated_timestamps", force: :cascade do |t|
     t.text "view_name", null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["view_name"], name: "index_view_last_updated_timestamps_on_view_name"
   end
 
@@ -1221,47 +1220,6 @@
   SQL
   add_index "disease_browse_table_rows", ["id"], name: "index_disease_browse_table_rows_on_id", unique: true
 
-  create_view "molecular_profile_browse_table_rows", materialized: true, sql_definition: <<-SQL
-      SELECT outer_mps.id,
-      outer_mps.name,
-      count(DISTINCT evidence_items.id) AS evidence_item_count,
-      array_agg(DISTINCT molecular_profile_aliases.name ORDER BY molecular_profile_aliases.name) AS alias_names,
-      json_agg(DISTINCT jsonb_build_object('name', features.name, 'id', features.id)) FILTER (WHERE (features.name IS NOT NULL)) AS features,
-      json_agg(DISTINCT jsonb_build_object('name', variants.name, 'id', variants.id)) FILTER (WHERE (variants.name IS NOT NULL)) AS variants,
-      json_agg(DISTINCT jsonb_build_object('name', diseases.name, 'id', diseases.id, 'total', disease_count.total)) FILTER (WHERE (diseases.name IS NOT NULL)) AS diseases,
-      json_agg(DISTINCT jsonb_build_object('name', therapies.name, 'id', therapies.id, 'total', therapy_count.total)) FILTER (WHERE (therapies.name IS NOT NULL)) AS therapies,
-      count(DISTINCT assertions.id) AS assertion_count,
-      count(DISTINCT variants.id) AS variant_count,
-      outer_mps.evidence_score
-     FROM ((((((((((((molecular_profiles outer_mps
-       LEFT JOIN evidence_items ON ((evidence_items.molecular_profile_id = outer_mps.id)))
-       JOIN molecular_profiles_variants ON ((outer_mps.id = molecular_profiles_variants.molecular_profile_id)))
-       JOIN variants ON ((molecular_profiles_variants.variant_id = variants.id)))
-       JOIN features ON ((features.id = variants.feature_id)))
-       LEFT JOIN diseases ON ((diseases.id = evidence_items.disease_id)))
-       LEFT JOIN evidence_items_therapies ON ((evidence_items_therapies.evidence_item_id = evidence_items.id)))
-       LEFT JOIN therapies ON ((therapies.id = evidence_items_therapies.therapy_id)))
-       LEFT JOIN assertions ON ((assertions.molecular_profile_id = outer_mps.id)))
-       LEFT JOIN molecular_profile_aliases_molecular_profiles ON ((molecular_profile_aliases_molecular_profiles.molecular_profile_id = outer_mps.id)))
-       LEFT JOIN molecular_profile_aliases ON ((molecular_profile_aliases.id = molecular_profile_aliases_molecular_profiles.molecular_profile_alias_id)))
-       LEFT JOIN LATERAL ( SELECT therapies_1.id AS therapy_id,
-              count(DISTINCT evidence_items_1.id) AS total
-             FROM ((evidence_items evidence_items_1
-               JOIN evidence_items_therapies evidence_items_therapies_1 ON ((evidence_items_therapies_1.evidence_item_id = evidence_items_1.id)))
-               JOIN therapies therapies_1 ON ((therapies_1.id = evidence_items_therapies_1.therapy_id)))
-            WHERE (evidence_items_1.molecular_profile_id = outer_mps.id)
-            GROUP BY therapies_1.id) therapy_count ON ((therapies.id = therapy_count.therapy_id)))
-       LEFT JOIN LATERAL ( SELECT diseases_1.id AS disease_id,
-              count(DISTINCT evidence_items_1.id) AS total
-             FROM (evidence_items evidence_items_1
-               JOIN diseases diseases_1 ON ((diseases_1.id = evidence_items_1.disease_id)))
-            WHERE (evidence_items_1.molecular_profile_id = outer_mps.id)
-            GROUP BY diseases_1.id) disease_count ON ((diseases.id = disease_count.disease_id)))
-    WHERE (outer_mps.deprecated = false)
-    GROUP BY outer_mps.id, outer_mps.name, outer_mps.evidence_score;
-  SQL
-  add_index "molecular_profile_browse_table_rows", ["id"], name: "index_molecular_profile_browse_table_rows_on_id", unique: true
-
   create_view "variant_browse_table_rows", materialized: true, sql_definition: <<-SQL
       SELECT outer_variants.id,
       outer_variants.name,
@@ -1310,4 +1268,45 @@
   SQL
   add_index "variant_browse_table_rows", ["id"], name: "index_variant_browse_table_rows_on_id", unique: true
 
+  create_view "molecular_profile_browse_table_rows", materialized: true, sql_definition: <<-SQL
+      SELECT outer_mps.id,
+      outer_mps.name,
+      count(DISTINCT evidence_items.id) AS evidence_item_count,
+      array_agg(DISTINCT molecular_profile_aliases.name ORDER BY molecular_profile_aliases.name) AS alias_names,
+      json_agg(DISTINCT jsonb_build_object('name', features.name, 'id', features.id)) FILTER (WHERE (features.name IS NOT NULL)) AS features,
+      json_agg(DISTINCT jsonb_build_object('name', variants.name, 'id', variants.id, 'feature_id', variants.feature_id)) FILTER (WHERE (variants.name IS NOT NULL)) AS variants,
+      json_agg(DISTINCT jsonb_build_object('name', diseases.name, 'id', diseases.id, 'total', disease_count.total)) FILTER (WHERE (diseases.name IS NOT NULL)) AS diseases,
+      json_agg(DISTINCT jsonb_build_object('name', therapies.name, 'id', therapies.id, 'total', therapy_count.total)) FILTER (WHERE (therapies.name IS NOT NULL)) AS therapies,
+      count(DISTINCT assertions.id) AS assertion_count,
+      count(DISTINCT variants.id) AS variant_count,
+      outer_mps.evidence_score
+     FROM ((((((((((((molecular_profiles outer_mps
+       LEFT JOIN evidence_items ON ((evidence_items.molecular_profile_id = outer_mps.id)))
+       JOIN molecular_profiles_variants ON ((outer_mps.id = molecular_profiles_variants.molecular_profile_id)))
+       JOIN variants ON ((molecular_profiles_variants.variant_id = variants.id)))
+       JOIN features ON ((features.id = variants.feature_id)))
+       LEFT JOIN diseases ON ((diseases.id = evidence_items.disease_id)))
+       LEFT JOIN evidence_items_therapies ON ((evidence_items_therapies.evidence_item_id = evidence_items.id)))
+       LEFT JOIN therapies ON ((therapies.id = evidence_items_therapies.therapy_id)))
+       LEFT JOIN assertions ON ((assertions.molecular_profile_id = outer_mps.id)))
+       LEFT JOIN molecular_profile_aliases_molecular_profiles ON ((molecular_profile_aliases_molecular_profiles.molecular_profile_id = outer_mps.id)))
+       LEFT JOIN molecular_profile_aliases ON ((molecular_profile_aliases.id = molecular_profile_aliases_molecular_profiles.molecular_profile_alias_id)))
+       LEFT JOIN LATERAL ( SELECT therapies_1.id AS therapy_id,
+              count(DISTINCT evidence_items_1.id) AS total
+             FROM ((evidence_items evidence_items_1
+               JOIN evidence_items_therapies evidence_items_therapies_1 ON ((evidence_items_therapies_1.evidence_item_id = evidence_items_1.id)))
+               JOIN therapies therapies_1 ON ((therapies_1.id = evidence_items_therapies_1.therapy_id)))
+            WHERE (evidence_items_1.molecular_profile_id = outer_mps.id)
+            GROUP BY therapies_1.id) therapy_count ON ((therapies.id = therapy_count.therapy_id)))
+       LEFT JOIN LATERAL ( SELECT diseases_1.id AS disease_id,
+              count(DISTINCT evidence_items_1.id) AS total
+             FROM (evidence_items evidence_items_1
+               JOIN diseases diseases_1 ON ((diseases_1.id = evidence_items_1.disease_id)))
+            WHERE (evidence_items_1.molecular_profile_id = outer_mps.id)
+            GROUP BY diseases_1.id) disease_count ON ((diseases.id = disease_count.disease_id)))
+    WHERE (outer_mps.deprecated = false)
+    GROUP BY outer_mps.id, outer_mps.name, outer_mps.evidence_score;
+  SQL
+  add_index "molecular_profile_browse_table_rows", ["id"], name: "index_molecular_profile_browse_table_rows_on_id", unique: true
+
 end
diff --git a/server/test/test_helper.rb b/server/test/test_helper.rb
index 47b598dee..e9f0b367c 100644
--- a/server/test/test_helper.rb
+++ b/server/test/test_helper.rb
@@ -3,9 +3,6 @@
 require "rails/test_help"
 
 class ActiveSupport::TestCase
-  # Run tests in parallel with specified workers
-  parallelize(workers: :number_of_processors)
-
   # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order.
   fixtures :all
 

From 767863bfdc56591b6c50d30fff54961bcdad65fa Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Thu, 18 Jan 2024 12:57:22 -0600
Subject: [PATCH 063/125] add cookie rotator advised by docs

---
 server/config/initializers/cookie_rotator.rb | 21 ++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 server/config/initializers/cookie_rotator.rb

diff --git a/server/config/initializers/cookie_rotator.rb b/server/config/initializers/cookie_rotator.rb
new file mode 100644
index 000000000..731aa8067
--- /dev/null
+++ b/server/config/initializers/cookie_rotator.rb
@@ -0,0 +1,21 @@
+#Rotate cookies to use new digest algorithm
+#https://guides.rubyonrails.org/v7.0/upgrading_ruby_on_rails.html#key-generator-digest-class-changing-to-use-sha256
+Rails.application.config.after_initialize do
+  Rails.application.config.action_dispatch.cookies_rotations.tap do |cookies|
+    authenticated_encrypted_cookie_salt = Rails.application.config.action_dispatch.authenticated_encrypted_cookie_salt
+    signed_cookie_salt = Rails.application.config.action_dispatch.signed_cookie_salt
+
+    secret_key_base = Rails.application.secret_key_base
+
+    key_generator = ActiveSupport::KeyGenerator.new(
+      secret_key_base, iterations: 1000, hash_digest_class: OpenSSL::Digest::SHA1
+    )
+    key_len = ActiveSupport::MessageEncryptor.key_len
+
+    old_encrypted_secret = key_generator.generate_key(authenticated_encrypted_cookie_salt, key_len)
+    old_signed_secret = key_generator.generate_key(signed_cookie_salt)
+
+    cookies.rotate :encrypted, old_encrypted_secret
+    cookies.rotate :signed, old_signed_secret
+  end
+end

From 3488827333c880fdbe50ef526fb33e463b68c29b Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Thu, 18 Jan 2024 14:34:40 -0600
Subject: [PATCH 064/125] update asset deps

---
 server/babel.config.js     |   75 +-
 server/lib/tasks/yarn.rake |    1 +
 server/package.json        |    8 +-
 server/yarn.lock           | 3565 +++++++++++++++---------------------
 4 files changed, 1497 insertions(+), 2152 deletions(-)
 create mode 100644 server/lib/tasks/yarn.rake

diff --git a/server/babel.config.js b/server/babel.config.js
index 4df194934..98b9ecfec 100644
--- a/server/babel.config.js
+++ b/server/babel.config.js
@@ -1,70 +1,65 @@
-module.exports = function(api) {
-  var validEnv = ['development', 'test', 'production']
-  var currentEnv = api.env()
-  var isDevelopmentEnv = api.env('development')
-  var isProductionEnv = api.env('production')
-  var isTestEnv = api.env('test')
+module.exports = function (api) {
+  var validEnv = ["development", "test", "production"];
+  var currentEnv = api.env();
+  var isDevelopmentEnv = api.env("development");
+  var isProductionEnv = api.env("production");
+  var isTestEnv = api.env("test");
 
   if (!validEnv.includes(currentEnv)) {
     throw new Error(
-      'Please specify a valid `NODE_ENV` or ' +
+      "Please specify a valid `NODE_ENV` or " +
         '`BABEL_ENV` environment variables. Valid values are "development", ' +
         '"test", and "production". Instead, received: ' +
         JSON.stringify(currentEnv) +
-        '.'
-    )
+        ".",
+    );
   }
 
   return {
     presets: [
       isTestEnv && [
-        '@babel/preset-env',
+        "@babel/preset-env",
         {
           targets: {
-            node: 'current'
-          }
-        }
+            node: "current",
+          },
+        },
       ],
       (isProductionEnv || isDevelopmentEnv) && [
-        '@babel/preset-env',
+        "@babel/preset-env",
         {
           forceAllTransforms: true,
-          useBuiltIns: 'entry',
+          useBuiltIns: "entry",
           corejs: 3,
           modules: false,
-          exclude: ['transform-typeof-symbol']
-        }
-      ]
+          exclude: ["transform-typeof-symbol"],
+        },
+      ],
     ].filter(Boolean),
     plugins: [
-      'babel-plugin-macros',
-      '@babel/plugin-syntax-dynamic-import',
-      isTestEnv && 'babel-plugin-dynamic-import-node',
-      '@babel/plugin-transform-destructuring',
+      "babel-plugin-macros",
+      "@babel/plugin-syntax-dynamic-import",
+      isTestEnv && "babel-plugin-dynamic-import-node",
+      "@babel/plugin-transform-destructuring",
+      ["@babel/plugin-proposal-class-properties"],
       [
-        '@babel/plugin-proposal-class-properties',
+        "@babel/plugin-proposal-object-rest-spread",
         {
-          loose: true
-        }
+          useBuiltIns: true,
+        },
       ],
       [
-        '@babel/plugin-proposal-object-rest-spread',
+        "@babel/plugin-transform-runtime",
         {
-          useBuiltIns: true
-        }
+          helpers: false,
+        },
       ],
       [
-        '@babel/plugin-transform-runtime',
+        "@babel/plugin-transform-regenerator",
         {
-          helpers: false
-        }
+          async: false,
+        },
       ],
-      [
-        '@babel/plugin-transform-regenerator',
-        {
-          async: false
-        }
-      ]
-    ].filter(Boolean)
-  }
-}
+    ].filter(Boolean),
+  };
+};
diff --git a/server/lib/tasks/yarn.rake b/server/lib/tasks/yarn.rake
new file mode 100644
index 000000000..52cfcaae4
--- /dev/null
+++ b/server/lib/tasks/yarn.rake
@@ -0,0 +1 @@
+Rake::Task["assets:precompile"].enhance ["yarn:install"]
diff --git a/server/package.json b/server/package.json
index 5aa316b88..d3f527ff8 100644
--- a/server/package.json
+++ b/server/package.json
@@ -2,12 +2,12 @@
   "name": "civic2",
   "private": true,
   "dependencies": {
-    "@rails/activestorage": "^6.0.0",
-    "@rails/ujs": "^6.0.0",
-    "@rails/webpacker": "5.2.1"
+    "@rails/activestorage": "7.1.3",
+    "@rails/ujs": "7.1.3",
+    "@rails/webpacker": "5.4.4"
   },
   "version": "0.1.0",
   "devDependencies": {
-    "webpack-dev-server": "^3.11.2"
+    "webpack-dev-server": "4.15.1"
   }
 }
diff --git a/server/yarn.lock b/server/yarn.lock
index 97154a3ec..b4c8fa2b3 100644
--- a/server/yarn.lock
+++ b/server/yarn.lock
@@ -2,7 +2,15 @@
 # yarn lockfile v1
 
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.16.0":
+"@ampproject/remapping@^2.2.0":
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.1.tgz#99e8e11851128b8702cd57c33684f1d0f260b630"
+  integrity sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==
+  dependencies:
+    "@jridgewell/gen-mapping" "^0.3.0"
+    "@jridgewell/trace-mapping" "^0.3.9"
+
+"@babel/code-frame@^7.0.0":
   version "7.16.0"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.0.tgz#0dfc80309beec8411e65e706461c408b0bb9b431"
   integrity sha512-IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA==
@@ -17,140 +25,127 @@
     "@babel/highlight" "^7.22.13"
     chalk "^2.4.2"
 
-"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.16.0", "@babel/compat-data@^7.16.4":
-  version "7.16.4"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.16.4.tgz#081d6bbc336ec5c2435c6346b2ae1fb98b5ac68e"
-  integrity sha512-1o/jo7D+kC9ZjHX5v+EHrdjl3PhxMrLSOTGsOdHJ+KL8HCaEK6ehrVL2RS6oHDZp+L7xLirLrPmQtEng769J/Q==
+"@babel/code-frame@^7.23.5":
+  version "7.23.5"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.23.5.tgz#9009b69a8c602293476ad598ff53e4562e15c244"
+  integrity sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==
+  dependencies:
+    "@babel/highlight" "^7.23.4"
+    chalk "^2.4.2"
 
-"@babel/core@^7.11.1":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.16.5.tgz#924aa9e1ae56e1e55f7184c8bf073a50d8677f5c"
-  integrity sha512-wUcenlLzuWMZ9Zt8S0KmFwGlH6QKRh3vsm/dhDA3CHkiTA45YuG1XkHRcNRl73EFPXDp/d5kVOU0/y7x2w6OaQ==
-  dependencies:
-    "@babel/code-frame" "^7.16.0"
-    "@babel/generator" "^7.16.5"
-    "@babel/helper-compilation-targets" "^7.16.3"
-    "@babel/helper-module-transforms" "^7.16.5"
-    "@babel/helpers" "^7.16.5"
-    "@babel/parser" "^7.16.5"
-    "@babel/template" "^7.16.0"
-    "@babel/traverse" "^7.16.5"
-    "@babel/types" "^7.16.0"
-    convert-source-map "^1.7.0"
+"@babel/compat-data@^7.20.5", "@babel/compat-data@^7.22.6", "@babel/compat-data@^7.23.3", "@babel/compat-data@^7.23.5":
+  version "7.23.5"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.23.5.tgz#ffb878728bb6bdcb6f4510aa51b1be9afb8cfd98"
+  integrity sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==
+
+"@babel/core@^7.15.0":
+  version "7.23.7"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.7.tgz#4d8016e06a14b5f92530a13ed0561730b5c6483f"
+  integrity sha512-+UpDgowcmqe36d4NwqvKsyPMlOLNGMsfMmQ5WGCu+siCe3t3dfe9njrzGfdN4qq+bcNUt0+Vw6haRxBOycs4dw==
+  dependencies:
+    "@ampproject/remapping" "^2.2.0"
+    "@babel/code-frame" "^7.23.5"
+    "@babel/generator" "^7.23.6"
+    "@babel/helper-compilation-targets" "^7.23.6"
+    "@babel/helper-module-transforms" "^7.23.3"
+    "@babel/helpers" "^7.23.7"
+    "@babel/parser" "^7.23.6"
+    "@babel/template" "^7.22.15"
+    "@babel/traverse" "^7.23.7"
+    "@babel/types" "^7.23.6"
+    convert-source-map "^2.0.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
-    json5 "^2.1.2"
-    semver "^6.3.0"
-    source-map "^0.5.0"
+    json5 "^2.2.3"
+    semver "^6.3.1"
 
-"@babel/generator@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.16.5.tgz#26e1192eb8f78e0a3acaf3eede3c6fc96d22bedf"
-  integrity sha512-kIvCdjZqcdKqoDbVVdt5R99icaRtrtYhYK/xux5qiWCBmfdvEYMFZ68QCrpE5cbFM1JsuArUNs1ZkuKtTtUcZA==
+"@babel/generator@^7.23.6":
+  version "7.23.6"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.6.tgz#9e1fca4811c77a10580d17d26b57b036133f3c2e"
+  integrity sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==
   dependencies:
-    "@babel/types" "^7.16.0"
-    jsesc "^2.5.1"
-    source-map "^0.5.0"
-
-"@babel/generator@^7.23.0":
-  version "7.23.0"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.0.tgz#df5c386e2218be505b34837acbcb874d7a983420"
-  integrity sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==
-  dependencies:
-    "@babel/types" "^7.23.0"
+    "@babel/types" "^7.23.6"
     "@jridgewell/gen-mapping" "^0.3.2"
     "@jridgewell/trace-mapping" "^0.3.17"
     jsesc "^2.5.1"
 
-"@babel/helper-annotate-as-pure@^7.16.0":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.0.tgz#9a1f0ebcda53d9a2d00108c4ceace6a5d5f1f08d"
-  integrity sha512-ItmYF9vR4zA8cByDocY05o0LGUkp1zhbTQOH1NFyl5xXEqlTJQCEJjieriw+aFpxo16swMxUnUiKS7a/r4vtHg==
+"@babel/helper-annotate-as-pure@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz#e7f06737b197d580a01edf75d97e2c8be99d3882"
+  integrity sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==
   dependencies:
-    "@babel/types" "^7.16.0"
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.5.tgz#a8429d064dce8207194b8bf05a70a9ea828746af"
-  integrity sha512-3JEA9G5dmmnIWdzaT9d0NmFRgYnWUThLsDaL7982H0XqqWr56lRrsmwheXFMjR+TMl7QMBb6mzy9kvgr1lRLUA==
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.22.15":
+  version "7.22.15"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.15.tgz#5426b109cf3ad47b91120f8328d8ab1be8b0b956"
+  integrity sha512-QkBXwGgaoC2GtGZRoma6kv7Szfv06khvhFav67ZExau2RaXzy8MpHSMO2PNoP2XtmQphJQRHFfg77Bq731Yizw==
   dependencies:
-    "@babel/helper-explode-assignable-expression" "^7.16.0"
-    "@babel/types" "^7.16.0"
+    "@babel/types" "^7.22.15"
 
-"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.16.3":
-  version "7.16.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.3.tgz#5b480cd13f68363df6ec4dc8ac8e2da11363cbf0"
-  integrity sha512-vKsoSQAyBmxS35JUOOt+07cLc6Nk/2ljLIHwmq2/NM6hdioUaqEXq/S+nXvbvXbZkNDlWOymPanJGOc4CBjSJA==
+"@babel/helper-compilation-targets@^7.20.7", "@babel/helper-compilation-targets@^7.22.15", "@babel/helper-compilation-targets@^7.22.6", "@babel/helper-compilation-targets@^7.23.6":
+  version "7.23.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz#4d79069b16cbcf1461289eccfbbd81501ae39991"
+  integrity sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==
   dependencies:
-    "@babel/compat-data" "^7.16.0"
-    "@babel/helper-validator-option" "^7.14.5"
-    browserslist "^4.17.5"
-    semver "^6.3.0"
+    "@babel/compat-data" "^7.23.5"
+    "@babel/helper-validator-option" "^7.23.5"
+    browserslist "^4.22.2"
+    lru-cache "^5.1.1"
+    semver "^6.3.1"
 
-"@babel/helper-create-class-features-plugin@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.16.5.tgz#5d1bcd096792c1ebec6249eebc6358eec55d0cad"
-  integrity sha512-NEohnYA7mkB8L5JhU7BLwcBdU3j83IziR9aseMueWGeAjblbul3zzb8UvJ3a1zuBiqCMObzCJHFqKIQE6hTVmg==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.0"
-    "@babel/helper-environment-visitor" "^7.16.5"
-    "@babel/helper-function-name" "^7.16.0"
-    "@babel/helper-member-expression-to-functions" "^7.16.5"
-    "@babel/helper-optimise-call-expression" "^7.16.0"
-    "@babel/helper-replace-supers" "^7.16.5"
-    "@babel/helper-split-export-declaration" "^7.16.0"
-
-"@babel/helper-create-regexp-features-plugin@^7.16.0":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.16.0.tgz#06b2348ce37fccc4f5e18dcd8d75053f2a7c44ff"
-  integrity sha512-3DyG0zAFAZKcOp7aVr33ddwkxJ0Z0Jr5V99y3I690eYLpukJsJvAbzTy1ewoCqsML8SbIrjH14Jc/nSQ4TvNPA==
+"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.22.15":
+  version "7.23.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.23.7.tgz#b2e6826e0e20d337143655198b79d58fdc9bd43d"
+  integrity sha512-xCoqR/8+BoNnXOY7RVSgv6X+o7pmT5q1d+gGcRlXYkI+9B31glE4jeejhKVpA04O1AtzOt7OSQ6VYKP5FcRl9g==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-function-name" "^7.23.0"
+    "@babel/helper-member-expression-to-functions" "^7.23.0"
+    "@babel/helper-optimise-call-expression" "^7.22.5"
+    "@babel/helper-replace-supers" "^7.22.20"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.6"
+    semver "^6.3.1"
+
+"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.22.15", "@babel/helper-create-regexp-features-plugin@^7.22.5":
+  version "7.22.15"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.15.tgz#5ee90093914ea09639b01c711db0d6775e558be1"
+  integrity sha512-29FkPLFjn4TPEa3RE7GpW+qbE8tlsu3jntNYNfcGsc49LphF1PQIiD+vMZ1z1xVOKt+93khA9tc2JBs3kBjA7w==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.0"
-    regexpu-core "^4.7.1"
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    regexpu-core "^5.3.1"
+    semver "^6.3.1"
 
-"@babel/helper-define-polyfill-provider@^0.3.0":
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.0.tgz#c5b10cf4b324ff840140bb07e05b8564af2ae971"
-  integrity sha512-7hfT8lUljl/tM3h+izTX/pO3W3frz2ok6Pk+gzys8iJqDfZrZy2pXjRTZAvG2YmfHun1X4q8/UZRLatMfqc5Tg==
+"@babel/helper-define-polyfill-provider@^0.4.4":
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.4.tgz#64df615451cb30e94b59a9696022cffac9a10088"
+  integrity sha512-QcJMILQCu2jm5TFPGA3lCpJJTeEP+mqeXooG/NZbg/h5FTFi6V0+99ahlRsW8/kRLyb24LZVCCiclDedhLKcBA==
   dependencies:
-    "@babel/helper-compilation-targets" "^7.13.0"
-    "@babel/helper-module-imports" "^7.12.13"
-    "@babel/helper-plugin-utils" "^7.13.0"
-    "@babel/traverse" "^7.13.0"
+    "@babel/helper-compilation-targets" "^7.22.6"
+    "@babel/helper-plugin-utils" "^7.22.5"
     debug "^4.1.1"
     lodash.debounce "^4.0.8"
     resolve "^1.14.2"
-    semver "^6.1.2"
 
-"@babel/helper-environment-visitor@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.5.tgz#f6a7f38b3c6d8b07c88faea083c46c09ef5451b8"
-  integrity sha512-ODQyc5AnxmZWm/R2W7fzhamOk1ey8gSguo5SGvF0zcB3uUzRpTRmM/jmLSm9bDMyPlvbyJ+PwPEK0BWIoZ9wjg==
+"@babel/helper-define-polyfill-provider@^0.5.0":
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.5.0.tgz#465805b7361f461e86c680f1de21eaf88c25901b"
+  integrity sha512-NovQquuQLAQ5HuyjCz7WQP9MjRj7dx++yspwiyUiGl9ZyadHRSql1HZh5ogRd8W8w6YM6EQ/NTB8rgjLt5W65Q==
   dependencies:
-    "@babel/types" "^7.16.0"
+    "@babel/helper-compilation-targets" "^7.22.6"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    debug "^4.1.1"
+    lodash.debounce "^4.0.8"
+    resolve "^1.14.2"
 
 "@babel/helper-environment-visitor@^7.22.20":
   version "7.22.20"
   resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz#96159db61d34a29dba454c959f5ae4a649ba9167"
   integrity sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==
 
-"@babel/helper-explode-assignable-expression@^7.16.0":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.0.tgz#753017337a15f46f9c09f674cff10cee9b9d7778"
-  integrity sha512-Hk2SLxC9ZbcOhLpg/yMznzJ11W++lg5GMbxt1ev6TXUiJB0N42KPC+7w8a+eWGuqDnUYuwStJoZHM7RgmIOaGQ==
-  dependencies:
-    "@babel/types" "^7.16.0"
-
-"@babel/helper-function-name@^7.16.0":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.16.0.tgz#b7dd0797d00bbfee4f07e9c4ea5b0e30c8bb1481"
-  integrity sha512-BZh4mEk1xi2h4HFjWUXRQX5AEx4rvaZxHgax9gcjdLWdkjsY7MKt5p0otjsg5noXw+pB+clMCjw+aEVYADMjog==
-  dependencies:
-    "@babel/helper-get-function-arity" "^7.16.0"
-    "@babel/template" "^7.16.0"
-    "@babel/types" "^7.16.0"
-
-"@babel/helper-function-name@^7.23.0":
+"@babel/helper-function-name@^7.22.5", "@babel/helper-function-name@^7.23.0":
   version "7.23.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz#1f9a3cdbd5b2698a670c30d2735f9af95ed52759"
   integrity sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==
@@ -158,20 +153,6 @@
     "@babel/template" "^7.22.15"
     "@babel/types" "^7.23.0"
 
-"@babel/helper-get-function-arity@^7.16.0":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.0.tgz#0088c7486b29a9cb5d948b1a1de46db66e089cfa"
-  integrity sha512-ASCquNcywC1NkYh/z7Cgp3w31YW8aojjYIlNg4VeJiHkqyP4AzIvr4qx7pYDb4/s8YcsZWqqOSxgkvjUz1kpDQ==
-  dependencies:
-    "@babel/types" "^7.16.0"
-
-"@babel/helper-hoist-variables@^7.16.0":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.0.tgz#4c9023c2f1def7e28ff46fc1dbcd36a39beaa81a"
-  integrity sha512-1AZlpazjUR0EQZQv3sgRNfM9mEVWPK3M6vlalczA+EECcPz3XPh6VplbErL5UoMpChhSck5wAJHthlj1bYpcmg==
-  dependencies:
-    "@babel/types" "^7.16.0"
-
 "@babel/helper-hoist-variables@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz#c01a007dac05c085914e8fb652b339db50d823bb"
@@ -179,86 +160,79 @@
   dependencies:
     "@babel/types" "^7.22.5"
 
-"@babel/helper-member-expression-to-functions@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.5.tgz#1bc9f7e87354e86f8879c67b316cb03d3dc2caab"
-  integrity sha512-7fecSXq7ZrLE+TWshbGT+HyCLkxloWNhTbU2QM1NTI/tDqyf0oZiMcEfYtDuUDCo528EOlt39G1rftea4bRZIw==
+"@babel/helper-member-expression-to-functions@^7.22.15", "@babel/helper-member-expression-to-functions@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz#9263e88cc5e41d39ec18c9a3e0eced59a3e7d366"
+  integrity sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==
   dependencies:
-    "@babel/types" "^7.16.0"
+    "@babel/types" "^7.23.0"
 
-"@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.16.0":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.0.tgz#90538e60b672ecf1b448f5f4f5433d37e79a3ec3"
-  integrity sha512-kkH7sWzKPq0xt3H1n+ghb4xEMP8k0U7XV3kkB+ZGy69kDk2ySFW1qPi06sjKzFY3t1j6XbJSqr4mF9L7CYVyhg==
+"@babel/helper-module-imports@^7.22.15":
+  version "7.22.15"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz#16146307acdc40cc00c3b2c647713076464bdbf0"
+  integrity sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==
   dependencies:
-    "@babel/types" "^7.16.0"
+    "@babel/types" "^7.22.15"
 
-"@babel/helper-module-transforms@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.16.5.tgz#530ebf6ea87b500f60840578515adda2af470a29"
-  integrity sha512-CkvMxgV4ZyyioElFwcuWnDCcNIeyqTkCm9BxXZi73RR1ozqlpboqsbGUNvRTflgZtFbbJ1v5Emvm+lkjMYY/LQ==
+"@babel/helper-module-transforms@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz#d7d12c3c5d30af5b3c0fcab2a6d5217773e2d0f1"
+  integrity sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==
   dependencies:
-    "@babel/helper-environment-visitor" "^7.16.5"
-    "@babel/helper-module-imports" "^7.16.0"
-    "@babel/helper-simple-access" "^7.16.0"
-    "@babel/helper-split-export-declaration" "^7.16.0"
-    "@babel/helper-validator-identifier" "^7.15.7"
-    "@babel/template" "^7.16.0"
-    "@babel/traverse" "^7.16.5"
-    "@babel/types" "^7.16.0"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-module-imports" "^7.22.15"
+    "@babel/helper-simple-access" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.6"
+    "@babel/helper-validator-identifier" "^7.22.20"
 
-"@babel/helper-optimise-call-expression@^7.16.0":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.0.tgz#cecdb145d70c54096b1564f8e9f10cd7d193b338"
-  integrity sha512-SuI467Gi2V8fkofm2JPnZzB/SUuXoJA5zXe/xzyPP2M04686RzFKFHPK6HDVN6JvWBIEW8tt9hPR7fXdn2Lgpw==
+"@babel/helper-optimise-call-expression@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz#f21531a9ccbff644fdd156b4077c16ff0c3f609e"
+  integrity sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==
   dependencies:
-    "@babel/types" "^7.16.0"
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
   version "7.16.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.5.tgz#afe37a45f39fce44a3d50a7958129ea5b1a5c074"
   integrity sha512-59KHWHXxVA9K4HNF4sbHCf+eJeFe0Te/ZFGqBT4OjXhrwvA04sGfaEGsVTdsjoszq0YTP49RC9UKe5g8uN2RwQ==
 
-"@babel/helper-remap-async-to-generator@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.5.tgz#e706646dc4018942acb4b29f7e185bc246d65ac3"
-  integrity sha512-X+aAJldyxrOmN9v3FKp+Hu1NO69VWgYgDGq6YDykwRPzxs5f2N+X988CBXS7EQahDU+Vpet5QYMqLk+nsp+Qxw==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.0"
-    "@babel/helper-wrap-function" "^7.16.5"
-    "@babel/types" "^7.16.0"
+"@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz#dd7ee3735e8a313b9f7b05a773d892e88e6d7295"
+  integrity sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==
 
-"@babel/helper-replace-supers@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.16.5.tgz#96d3988bd0ab0a2d22c88c6198c3d3234ca25326"
-  integrity sha512-ao3seGVa/FZCMCCNDuBcqnBFSbdr8N2EW35mzojx3TwfIbdPmNK+JV6+2d5bR0Z71W5ocLnQp9en/cTF7pBJiQ==
+"@babel/helper-remap-async-to-generator@^7.22.20":
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.20.tgz#7b68e1cb4fa964d2996fd063723fb48eca8498e0"
+  integrity sha512-pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw==
   dependencies:
-    "@babel/helper-environment-visitor" "^7.16.5"
-    "@babel/helper-member-expression-to-functions" "^7.16.5"
-    "@babel/helper-optimise-call-expression" "^7.16.0"
-    "@babel/traverse" "^7.16.5"
-    "@babel/types" "^7.16.0"
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-wrap-function" "^7.22.20"
 
-"@babel/helper-simple-access@^7.16.0":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.16.0.tgz#21d6a27620e383e37534cf6c10bba019a6f90517"
-  integrity sha512-o1rjBT/gppAqKsYfUdfHq5Rk03lMQrkPHG1OWzHWpLgVXRH4HnMM9Et9CVdIqwkCQlobnGHEJMsgWP/jE1zUiw==
+"@babel/helper-replace-supers@^7.22.20":
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.22.20.tgz#e37d367123ca98fe455a9887734ed2e16eb7a793"
+  integrity sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw==
   dependencies:
-    "@babel/types" "^7.16.0"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-member-expression-to-functions" "^7.22.15"
+    "@babel/helper-optimise-call-expression" "^7.22.5"
 
-"@babel/helper-skip-transparent-expression-wrappers@^7.16.0":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz#0ee3388070147c3ae051e487eca3ebb0e2e8bb09"
-  integrity sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw==
+"@babel/helper-simple-access@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz#4938357dc7d782b80ed6dbb03a0fba3d22b1d5de"
+  integrity sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==
   dependencies:
-    "@babel/types" "^7.16.0"
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-split-export-declaration@^7.16.0":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.0.tgz#29672f43663e936df370aaeb22beddb3baec7438"
-  integrity sha512-0YMMRpuDFNGTHNRiiqJX19GjNXA4H0E8jZ2ibccfSxaCogbm3am5WN/2nQNj0YnQwGWM1J06GOcQ2qnh3+0paw==
+"@babel/helper-skip-transparent-expression-wrappers@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz#007f15240b5751c537c40e77abb4e89eeaaa8847"
+  integrity sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==
   dependencies:
-    "@babel/types" "^7.16.0"
+    "@babel/types" "^7.22.5"
 
 "@babel/helper-split-export-declaration@^7.22.6":
   version "7.22.6"
@@ -272,6 +246,11 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz#533f36457a25814cf1df6488523ad547d784a99f"
   integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==
 
+"@babel/helper-string-parser@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz#9478c707febcbbe1ddb38a3d91a2e054ae622d83"
+  integrity sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==
+
 "@babel/helper-validator-identifier@^7.15.7":
   version "7.15.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz#220df993bfe904a4a6b02ab4f3385a5ebf6e2389"
@@ -282,29 +261,28 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0"
   integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==
 
-"@babel/helper-validator-option@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz#6e72a1fff18d5dfcb878e1e62f1a021c4b72d5a3"
-  integrity sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==
+"@babel/helper-validator-option@^7.23.5":
+  version "7.23.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz#907a3fbd4523426285365d1206c423c4c5520307"
+  integrity sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==
 
-"@babel/helper-wrap-function@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.16.5.tgz#0158fca6f6d0889c3fee8a6ed6e5e07b9b54e41f"
-  integrity sha512-2J2pmLBqUqVdJw78U0KPNdeE2qeuIyKoG4mKV7wAq3mc4jJG282UgjZw4ZYDnqiWQuS3Y3IYdF/AQ6CpyBV3VA==
+"@babel/helper-wrap-function@^7.22.20":
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.22.20.tgz#15352b0b9bfb10fc9c76f79f6342c00e3411a569"
+  integrity sha512-pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw==
   dependencies:
-    "@babel/helper-function-name" "^7.16.0"
-    "@babel/template" "^7.16.0"
-    "@babel/traverse" "^7.16.5"
-    "@babel/types" "^7.16.0"
+    "@babel/helper-function-name" "^7.22.5"
+    "@babel/template" "^7.22.15"
+    "@babel/types" "^7.22.19"
 
-"@babel/helpers@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.16.5.tgz#29a052d4b827846dd76ece16f565b9634c554ebd"
-  integrity sha512-TLgi6Lh71vvMZGEkFuIxzaPsyeYCHQ5jJOOX1f0xXn0uciFuE8cEk0wyBquMcCxBXZ5BJhE2aUB7pnWTD150Tw==
+"@babel/helpers@^7.23.7":
+  version "7.23.8"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.23.8.tgz#fc6b2d65b16847fd50adddbd4232c76378959e34"
+  integrity sha512-KDqYz4PiOWvDFrdHLPhKtCThtIcKVy6avWD2oG4GEvyQ+XDZwHD4YQd+H2vNMnq2rkdxsDkU82T+Vk8U/WXHRQ==
   dependencies:
-    "@babel/template" "^7.16.0"
-    "@babel/traverse" "^7.16.5"
-    "@babel/types" "^7.16.0"
+    "@babel/template" "^7.22.15"
+    "@babel/traverse" "^7.23.7"
+    "@babel/types" "^7.23.6"
 
 "@babel/highlight@^7.16.0":
   version "7.16.0"
@@ -324,159 +302,72 @@
     chalk "^2.4.2"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.16.0", "@babel/parser@^7.16.5":
-  version "7.16.6"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.6.tgz#8f194828193e8fa79166f34a4b4e52f3e769a314"
-  integrity sha512-Gr86ujcNuPDnNOY8mi383Hvi8IYrJVJYuf3XcuBM/Dgd+bINn/7tHqsj+tKkoreMbmGsFLsltI/JJd8fOFWGDQ==
+"@babel/highlight@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.23.4.tgz#edaadf4d8232e1a961432db785091207ead0621b"
+  integrity sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.22.20"
+    chalk "^2.4.2"
+    js-tokens "^4.0.0"
 
-"@babel/parser@^7.22.15", "@babel/parser@^7.23.0":
+"@babel/parser@^7.22.15":
   version "7.23.0"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.0.tgz#da950e622420bf96ca0d0f2909cdddac3acd8719"
   integrity sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==
 
-"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.2":
-  version "7.16.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.2.tgz#2977fca9b212db153c195674e57cfab807733183"
-  integrity sha512-h37CvpLSf8gb2lIJ2CgC3t+EjFbi0t8qS7LCS1xcJIlEXE4czlofwaW7W1HA8zpgOCzI9C1nmoqNR1zWkk0pQg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
-
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.16.0":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.0.tgz#358972eaab006f5eb0826183b0c93cbcaf13e1e2"
-  integrity sha512-4tcFwwicpWTrpl9qjf7UsoosaArgImF85AxqCRZlgc3IQDvkUHjJpruXAL58Wmj+T6fypWTC/BakfEkwIL/pwA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
-    "@babel/plugin-proposal-optional-chaining" "^7.16.0"
-
-"@babel/plugin-proposal-async-generator-functions@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.5.tgz#fd3bd7e0d98404a3d4cbca15a72d533f8c9a2f67"
-  integrity sha512-C/FX+3HNLV6sz7AqbTQqEo1L9/kfrKjxcVtgyBCmvIgOjvuBVUWooDoi7trsLxOzCEo5FccjRvKHkfDsJFZlfA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.16.5"
-    "@babel/helper-remap-async-to-generator" "^7.16.5"
-    "@babel/plugin-syntax-async-generators" "^7.8.4"
-
-"@babel/plugin-proposal-class-properties@^7.10.4", "@babel/plugin-proposal-class-properties@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.5.tgz#3269f44b89122110f6339806e05d43d84106468a"
-  integrity sha512-pJD3HjgRv83s5dv1sTnDbZOaTjghKEz8KUn1Kbh2eAIRhGuyQ1XSeI4xVXU3UlIEVA3DAyIdxqT1eRn7Wcn55A==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.16.5"
-    "@babel/helper-plugin-utils" "^7.16.5"
-
-"@babel/plugin-proposal-class-static-block@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.16.5.tgz#df58ab015a7d3b0963aafc8f20792dcd834952a9"
-  integrity sha512-EEFzuLZcm/rNJ8Q5krK+FRKdVkd6FjfzT9tuSZql9sQn64K0hHA2KLJ0DqVot9/iV6+SsuadC5yI39zWnm+nmQ==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.16.5"
-    "@babel/helper-plugin-utils" "^7.16.5"
-    "@babel/plugin-syntax-class-static-block" "^7.14.5"
-
-"@babel/plugin-proposal-dynamic-import@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.5.tgz#2e0d19d5702db4dcb9bc846200ca02f2e9d60e9e"
-  integrity sha512-P05/SJZTTvHz79LNYTF8ff5xXge0kk5sIIWAypcWgX4BTRUgyHc8wRxJ/Hk+mU0KXldgOOslKaeqnhthcDJCJQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.16.5"
-    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
-
-"@babel/plugin-proposal-export-namespace-from@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.5.tgz#3b4dd28378d1da2fea33e97b9f25d1c2f5bf1ac9"
-  integrity sha512-i+sltzEShH1vsVydvNaTRsgvq2vZsfyrd7K7vPLUU/KgS0D5yZMe6uipM0+izminnkKrEfdUnz7CxMRb6oHZWw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.16.5"
-    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
+"@babel/parser@^7.23.6":
+  version "7.23.6"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.6.tgz#ba1c9e512bda72a47e285ae42aff9d2a635a9e3b"
+  integrity sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ==
 
-"@babel/plugin-proposal-json-strings@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.5.tgz#1e726930fca139caab6b084d232a9270d9d16f9c"
-  integrity sha512-QQJueTFa0y9E4qHANqIvMsuxM/qcLQmKttBACtPCQzGUEizsXDACGonlPiSwynHfOa3vNw0FPMVvQzbuXwh4SQ==
+"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.23.3.tgz#5cd1c87ba9380d0afb78469292c954fee5d2411a"
+  integrity sha512-iRkKcCqb7iGnq9+3G6rZ+Ciz5VywC4XNRHe57lKM+jOeYAoR0lVqdeeDRfh0tQcTfw/+vBhHn926FmQhLtlFLQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.5"
-    "@babel/plugin-syntax-json-strings" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-proposal-logical-assignment-operators@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.5.tgz#df1f2e4b5a0ec07abf061d2c18e53abc237d3ef5"
-  integrity sha512-xqibl7ISO2vjuQM+MzR3rkd0zfNWltk7n9QhaD8ghMmMceVguYrNDt7MikRyj4J4v3QehpnrU8RYLnC7z/gZLA==
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.23.3.tgz#f6652bb16b94f8f9c20c50941e16e9756898dc5d"
+  integrity sha512-WwlxbfMNdVEpQjZmK5mhm7oSwD3dS6eU+Iwsi4Knl9wAletWem7kaRsGOG+8UEbRyqxY4SS5zvtfXwX+jMxUwQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.5"
-    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
+    "@babel/plugin-transform-optional-chaining" "^7.23.3"
 
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.5.tgz#652555bfeeeee2d2104058c6225dc6f75e2d0f07"
-  integrity sha512-YwMsTp/oOviSBhrjwi0vzCUycseCYwoXnLiXIL3YNjHSMBHicGTz7GjVU/IGgz4DtOEXBdCNG72pvCX22ehfqg==
+"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@^7.23.7":
+  version "7.23.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.23.7.tgz#516462a95d10a9618f197d39ad291a9b47ae1d7b"
+  integrity sha512-LlRT7HgaifEpQA1ZgLVOIJZZFVPWN5iReq/7/JixwBtwcoeVGDBD53ZV28rrsLYOZs1Y/EHhA8N/Z6aazHR8cw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.5"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-proposal-numeric-separator@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.5.tgz#edcb6379b6cf4570be64c45965d8da7a2debf039"
-  integrity sha512-DvB9l/TcsCRvsIV9v4jxR/jVP45cslTVC0PMVHvaJhhNuhn2Y1SOhCSFlPK777qLB5wb8rVDaNoqMTyOqtY5Iw==
+"@babel/plugin-proposal-class-properties@^7.14.5":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz#b110f59741895f7ec21a6fff696ec46265c446a3"
+  integrity sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.5"
-    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
+    "@babel/helper-create-class-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-proposal-object-rest-spread@^7.10.1", "@babel/plugin-proposal-object-rest-spread@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.16.5.tgz#f30f80dacf7bc1404bf67f99c8d9c01665e830ad"
-  integrity sha512-UEd6KpChoyPhCoE840KRHOlGhEZFutdPDMGj+0I56yuTTOaT51GzmnEl/0uT41fB/vD2nT+Pci2KjezyE3HmUw==
+"@babel/plugin-proposal-object-rest-spread@^7.14.7":
+  version "7.20.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz#aa662940ef425779c75534a5c41e9d936edc390a"
+  integrity sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==
   dependencies:
-    "@babel/compat-data" "^7.16.4"
-    "@babel/helper-compilation-targets" "^7.16.3"
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/compat-data" "^7.20.5"
+    "@babel/helper-compilation-targets" "^7.20.7"
+    "@babel/helper-plugin-utils" "^7.20.2"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.16.5"
-
-"@babel/plugin-proposal-optional-catch-binding@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.5.tgz#1a5405765cf589a11a33a1fd75b2baef7d48b74e"
-  integrity sha512-ihCMxY1Iljmx4bWy/PIMJGXN4NS4oUj1MKynwO07kiKms23pNvIn1DMB92DNB2R0EA882sw0VXIelYGdtF7xEQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.16.5"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
-
-"@babel/plugin-proposal-optional-chaining@^7.16.0", "@babel/plugin-proposal-optional-chaining@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.5.tgz#a5fa61056194d5059366c0009cb9a9e66ed75c1f"
-  integrity sha512-kzdHgnaXRonttiTfKYnSVafbWngPPr2qKw9BWYBESl91W54e+9R5pP70LtWxV56g0f05f/SQrwHYkfvbwcdQ/A==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.16.5"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
-    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
-
-"@babel/plugin-proposal-private-methods@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.5.tgz#2086f7d78c1b0c712d49b5c3fbc2d1ca21a7ee12"
-  integrity sha512-+yFMO4BGT3sgzXo+lrq7orX5mAZt57DwUK6seqII6AcJnJOIhBJ8pzKH47/ql/d426uQ7YhN8DpUFirQzqYSUA==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.16.5"
-    "@babel/helper-plugin-utils" "^7.16.5"
-
-"@babel/plugin-proposal-private-property-in-object@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.5.tgz#a42d4b56005db3d405b12841309dbca647e7a21b"
-  integrity sha512-+YGh5Wbw0NH3y/E5YMu6ci5qTDmAEVNoZ3I54aB6nVEOZ5BQ7QJlwKq5pYVucQilMByGn/bvX0af+uNaPRCabA==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.0"
-    "@babel/helper-create-class-features-plugin" "^7.16.5"
-    "@babel/helper-plugin-utils" "^7.16.5"
-    "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
+    "@babel/plugin-transform-parameters" "^7.20.7"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.16.5", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.5.tgz#35fe753afa7c572f322bd068ff3377bde0f37080"
-  integrity sha512-s5sKtlKQyFSatt781HQwv1hoM5BQ9qRH30r+dK56OLDsHmV74mzwJNX7R1yMuE7VZKG5O6q/gmOGSAO6ikTudg==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.16.0"
-    "@babel/helper-plugin-utils" "^7.16.5"
+"@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2":
+  version "7.21.0-placeholder-for-preset-env.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz#7844f9289546efa9febac2de4cfe358a050bd703"
+  integrity sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==
 
 "@babel/plugin-syntax-async-generators@^7.8.4":
   version "7.8.4"
@@ -513,6 +404,27 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
+"@babel/plugin-syntax-import-assertions@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.23.3.tgz#9c05a7f592982aff1a2768260ad84bcd3f0c77fc"
+  integrity sha512-lPgDSU+SJLK3xmFDTV2ZRQAiM7UuUjGidwBywFavObCiZc1BeAAcMtHJKUya92hPHO+at63JJPLygilZard8jw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-syntax-import-attributes@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.23.3.tgz#992aee922cf04512461d7dae3ff6951b90a2dc06"
+  integrity sha512-pawnE0P9g10xgoP7yKr6CK63K2FMsTE+FZidZO/1PwRdzmAPVs+HS1mAURUsgaoxammTJvULUdIkEK0gOcU2tA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-syntax-import-meta@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51"
+  integrity sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+
 "@babel/plugin-syntax-json-strings@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a"
@@ -576,298 +488,435 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-arrow-functions@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.5.tgz#04c18944dd55397b521d9d7511e791acea7acf2d"
-  integrity sha512-8bTHiiZyMOyfZFULjsCnYOWG059FVMes0iljEHSfARhNgFfpsqE92OrCffv3veSw9rwMkYcFe9bj0ZoXU2IGtQ==
+"@babel/plugin-syntax-unicode-sets-regex@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz#d49a3b3e6b52e5be6740022317580234a6a47357"
+  integrity sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-async-to-generator@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.5.tgz#89c9b501e65bb14c4579a6ce9563f859de9b34e4"
-  integrity sha512-TMXgfioJnkXU+XRoj7P2ED7rUm5jbnDWwlCuFVTpQboMfbSya5WrmubNBAMlk7KXvywpo8rd8WuYZkis1o2H8w==
+"@babel/plugin-transform-arrow-functions@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.23.3.tgz#94c6dcfd731af90f27a79509f9ab7fb2120fc38b"
+  integrity sha512-NzQcQrzaQPkaEwoTm4Mhyl8jI1huEL/WWIEvudjTCMJ9aBZNpsJbMASx7EQECtQQPS/DcnFpo0FIh3LvEO9cxQ==
   dependencies:
-    "@babel/helper-module-imports" "^7.16.0"
-    "@babel/helper-plugin-utils" "^7.16.5"
-    "@babel/helper-remap-async-to-generator" "^7.16.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-block-scoped-functions@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.5.tgz#af087494e1c387574260b7ee9b58cdb5a4e9b0b0"
-  integrity sha512-BxmIyKLjUGksJ99+hJyL/HIxLIGnLKtw772zYDER7UuycDZ+Xvzs98ZQw6NGgM2ss4/hlFAaGiZmMNKvValEjw==
+"@babel/plugin-transform-async-generator-functions@^7.23.7":
+  version "7.23.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.7.tgz#3aa0b4f2fa3788b5226ef9346cf6d16ec61f99cd"
+  integrity sha512-PdxEpL71bJp1byMG0va5gwQcXHxuEYC/BgI/e88mGTtohbZN28O5Yit0Plkkm/dBzCF/BxmbNcses1RH1T+urA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-remap-async-to-generator" "^7.22.20"
+    "@babel/plugin-syntax-async-generators" "^7.8.4"
 
-"@babel/plugin-transform-block-scoping@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.5.tgz#b91f254fe53e210eabe4dd0c40f71c0ed253c5e7"
-  integrity sha512-JxjSPNZSiOtmxjX7PBRBeRJTUKTyJ607YUYeT0QJCNdsedOe+/rXITjP08eG8xUpsLfPirgzdCFN+h0w6RI+pQ==
+"@babel/plugin-transform-async-to-generator@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.23.3.tgz#d1f513c7a8a506d43f47df2bf25f9254b0b051fa"
+  integrity sha512-A7LFsKi4U4fomjqXJlZg/u0ft/n8/7n7lpffUP/ZULx/DtV9SGlNKZolHH6PE8Xl1ngCc0M11OaeZptXVkfKSw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-module-imports" "^7.22.15"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-remap-async-to-generator" "^7.22.20"
 
-"@babel/plugin-transform-classes@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.5.tgz#6acf2ec7adb50fb2f3194dcd2909dbd056dcf216"
-  integrity sha512-DzJ1vYf/7TaCYy57J3SJ9rV+JEuvmlnvvyvYKFbk5u46oQbBvuB9/0w+YsVsxkOv8zVWKpDmUoj4T5ILHoXevA==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.0"
-    "@babel/helper-environment-visitor" "^7.16.5"
-    "@babel/helper-function-name" "^7.16.0"
-    "@babel/helper-optimise-call-expression" "^7.16.0"
-    "@babel/helper-plugin-utils" "^7.16.5"
-    "@babel/helper-replace-supers" "^7.16.5"
-    "@babel/helper-split-export-declaration" "^7.16.0"
+"@babel/plugin-transform-block-scoped-functions@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.23.3.tgz#fe1177d715fb569663095e04f3598525d98e8c77"
+  integrity sha512-vI+0sIaPIO6CNuM9Kk5VmXcMVRiOpDh7w2zZt9GXzmE/9KD70CUEVhvPR/etAeNK/FAEkhxQtXOzVF3EuRL41A==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-block-scoping@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.4.tgz#b2d38589531c6c80fbe25e6b58e763622d2d3cf5"
+  integrity sha512-0QqbP6B6HOh7/8iNR4CQU2Th/bbRtBp4KS9vcaZd1fZ0wSh5Fyssg0UCIHwxh+ka+pNDREbVLQnHCMHKZfPwfw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-class-properties@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.23.3.tgz#35c377db11ca92a785a718b6aa4e3ed1eb65dc48"
+  integrity sha512-uM+AN8yCIjDPccsKGlw271xjJtGii+xQIF/uMPS8H15L12jZTsLfF4o5vNO7d/oUguOyfdikHGc/yi9ge4SGIg==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.22.15"
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-class-static-block@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.23.4.tgz#2a202c8787a8964dd11dfcedf994d36bfc844ab5"
+  integrity sha512-nsWu/1M+ggti1SOALj3hfx5FXzAY06fwPJsUZD4/A5e1bWi46VUIWtD+kOX6/IdhXGsXBWllLFDSnqSCdUNydQ==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.22.15"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-class-static-block" "^7.14.5"
+
+"@babel/plugin-transform-classes@^7.23.8":
+  version "7.23.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.23.8.tgz#d08ae096c240347badd68cdf1b6d1624a6435d92"
+  integrity sha512-yAYslGsY1bX6Knmg46RjiCiNSwJKv2IUC8qOdYKqMMr0491SXFhcHqOdRDeCRohOOIzwN/90C6mQ9qAKgrP7dg==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    "@babel/helper-compilation-targets" "^7.23.6"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-function-name" "^7.23.0"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-replace-supers" "^7.22.20"
+    "@babel/helper-split-export-declaration" "^7.22.6"
     globals "^11.1.0"
 
-"@babel/plugin-transform-computed-properties@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.5.tgz#2af91ebf0cceccfcc701281ada7cfba40a9b322a"
-  integrity sha512-n1+O7xtU5lSLraRzX88CNcpl7vtGdPakKzww74bVwpAIRgz9JVLJJpOLb0uYqcOaXVM0TL6X0RVeIJGD2CnCkg==
+"@babel/plugin-transform-computed-properties@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.23.3.tgz#652e69561fcc9d2b50ba4f7ac7f60dcf65e86474"
+  integrity sha512-dTj83UVTLw/+nbiHqQSFdwO9CbTtwq1DsDqm3CUEtDrZNET5rT5E6bIdTlOftDTDLMYxvxHNEYO4B9SLl8SLZw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/template" "^7.22.15"
 
-"@babel/plugin-transform-destructuring@^7.10.1", "@babel/plugin-transform-destructuring@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.16.5.tgz#89ebc87499ac4a81b897af53bb5d3eed261bd568"
-  integrity sha512-GuRVAsjq+c9YPK6NeTkRLWyQskDC099XkBSVO+6QzbnOnH2d/4mBVXYStaPrZD3dFRfg00I6BFJ9Atsjfs8mlg==
+"@babel/plugin-transform-destructuring@^7.14.7", "@babel/plugin-transform-destructuring@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.3.tgz#8c9ee68228b12ae3dff986e56ed1ba4f3c446311"
+  integrity sha512-n225npDqjDIr967cMScVKHXJs7rout1q+tt50inyBCPkyZ8KxeI6d+GIbSBTT/w/9WdlWDOej3V9HE5Lgk57gw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-dotall-regex@^7.16.5", "@babel/plugin-transform-dotall-regex@^7.4.4":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.5.tgz#b40739c00b6686820653536d6d143e311de67936"
-  integrity sha512-iQiEMt8Q4/5aRGHpGVK2Zc7a6mx7qEAO7qehgSug3SDImnuMzgmm/wtJALXaz25zUj1PmnNHtShjFgk4PDx4nw==
+"@babel/plugin-transform-dotall-regex@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.23.3.tgz#3f7af6054882ede89c378d0cf889b854a993da50"
+  integrity sha512-vgnFYDHAKzFaTVp+mneDsIEbnJ2Np/9ng9iviHw3P/KVcgONxpNULEW/51Z/BaFojG2GI2GwwXck5uV1+1NOYQ==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.16.0"
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-create-regexp-features-plugin" "^7.22.15"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-duplicate-keys@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.5.tgz#2450f2742325412b746d7d005227f5e8973b512a"
-  integrity sha512-81tijpDg2a6I1Yhj4aWY1l3O1J4Cg/Pd7LfvuaH2VVInAkXtzibz9+zSPdUM1WvuUi128ksstAP0hM5w48vQgg==
+"@babel/plugin-transform-duplicate-keys@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.23.3.tgz#664706ca0a5dfe8d066537f99032fc1dc8b720ce"
+  integrity sha512-RrqQ+BQmU3Oyav3J+7/myfvRCq7Tbz+kKLLshUmMwNlDHExbGL7ARhajvoBJEvc+fCguPPu887N+3RRXBVKZUA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-exponentiation-operator@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.5.tgz#36e261fa1ab643cfaf30eeab38e00ed1a76081e2"
-  integrity sha512-12rba2HwemQPa7BLIKCzm1pT2/RuQHtSFHdNl41cFiC6oi4tcrp7gjB07pxQvFpcADojQywSjblQth6gJyE6CA==
+"@babel/plugin-transform-dynamic-import@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.23.4.tgz#c7629e7254011ac3630d47d7f34ddd40ca535143"
+  integrity sha512-V6jIbLhdJK86MaLh4Jpghi8ho5fGzt3imHOBu/x0jlBaPYqDoWz4RDXjmMOfnh+JWNaQleEAByZLV0QzBT4YQQ==
   dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.16.5"
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
 
-"@babel/plugin-transform-for-of@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.5.tgz#9b544059c6ca11d565457c0ff1f08e13ce225261"
-  integrity sha512-+DpCAJFPAvViR17PIMi9x2AE34dll5wNlXO43wagAX2YcRGgEVHCNFC4azG85b4YyyFarvkc/iD5NPrz4Oneqw==
+"@babel/plugin-transform-exponentiation-operator@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.23.3.tgz#ea0d978f6b9232ba4722f3dbecdd18f450babd18"
+  integrity sha512-5fhCsl1odX96u7ILKHBj4/Y8vipoqwsJMh4csSA8qFfxrZDEA4Ssku2DyNvMJSmZNOEBT750LfFPbtrnTP90BQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.22.15"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-function-name@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.5.tgz#6896ebb6a5538a75d6a4086a277752f655a7bd15"
-  integrity sha512-Fuec/KPSpVLbGo6z1RPw4EE1X+z9gZk1uQmnYy7v4xr4TO9p41v1AoUuXEtyqAI7H+xNJYSICzRqZBhDEkd3kQ==
+"@babel/plugin-transform-export-namespace-from@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.23.4.tgz#084c7b25e9a5c8271e987a08cf85807b80283191"
+  integrity sha512-GzuSBcKkx62dGzZI1WVgTWvkkz84FZO5TC5T8dl/Tht/rAla6Dg/Mz9Yhypg+ezVACf/rgDuQt3kbWEv7LdUDQ==
   dependencies:
-    "@babel/helper-function-name" "^7.16.0"
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
 
-"@babel/plugin-transform-literals@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.5.tgz#af392b90e3edb2bd6dc316844cbfd6b9e009d320"
-  integrity sha512-B1j9C/IfvshnPcklsc93AVLTrNVa69iSqztylZH6qnmiAsDDOmmjEYqOm3Ts2lGSgTSywnBNiqC949VdD0/gfw==
+"@babel/plugin-transform-for-of@^7.23.6":
+  version "7.23.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.23.6.tgz#81c37e24171b37b370ba6aaffa7ac86bcb46f94e"
+  integrity sha512-aYH4ytZ0qSuBbpfhuofbg/e96oQ7U2w1Aw/UQmKT+1l39uEhUPoFS3fHevDc1G0OvewyDudfMKY1OulczHzWIw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
 
-"@babel/plugin-transform-member-expression-literals@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.5.tgz#4bd6ecdc11932361631097b779ca5c7570146dd5"
-  integrity sha512-d57i3vPHWgIde/9Y8W/xSFUndhvhZN5Wu2TjRrN1MVz5KzdUihKnfDVlfP1U7mS5DNj/WHHhaE4/tTi4hIyHwQ==
+"@babel/plugin-transform-function-name@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.23.3.tgz#8f424fcd862bf84cb9a1a6b42bc2f47ed630f8dc"
+  integrity sha512-I1QXp1LxIvt8yLaib49dRW5Okt7Q4oaxao6tFVKS/anCdEOMtYwWVKoiOA1p34GOWIZjUK0E+zCp7+l1pfQyiw==
+  dependencies:
+    "@babel/helper-compilation-targets" "^7.22.15"
+    "@babel/helper-function-name" "^7.23.0"
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-json-strings@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.23.4.tgz#a871d9b6bd171976efad2e43e694c961ffa3714d"
+  integrity sha512-81nTOqM1dMwZ/aRXQ59zVubN9wHGqk6UtqRK+/q+ciXmRy8fSolhGVvG09HHRGo4l6fr/c4ZhXUQH0uFW7PZbg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-json-strings" "^7.8.3"
 
-"@babel/plugin-transform-modules-amd@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.5.tgz#92c0a3e83f642cb7e75fada9ab497c12c2616527"
-  integrity sha512-oHI15S/hdJuSCfnwIz+4lm6wu/wBn7oJ8+QrkzPPwSFGXk8kgdI/AIKcbR/XnD1nQVMg/i6eNaXpszbGuwYDRQ==
+"@babel/plugin-transform-literals@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.23.3.tgz#8214665f00506ead73de157eba233e7381f3beb4"
+  integrity sha512-wZ0PIXRxnwZvl9AYpqNUxpZ5BiTGrYt7kueGQ+N5FiQ7RCOD4cm8iShd6S6ggfVIWaJf2EMk8eRzAh52RfP4rQ==
   dependencies:
-    "@babel/helper-module-transforms" "^7.16.5"
-    "@babel/helper-plugin-utils" "^7.16.5"
-    babel-plugin-dynamic-import-node "^2.3.3"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-modules-commonjs@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.16.5.tgz#4ee03b089536f076b2773196529d27c32b9d7bde"
-  integrity sha512-ABhUkxvoQyqhCWyb8xXtfwqNMJD7tx+irIRnUh6lmyFud7Jln1WzONXKlax1fg/ey178EXbs4bSGNd6PngO+SQ==
+"@babel/plugin-transform-logical-assignment-operators@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.23.4.tgz#e599f82c51d55fac725f62ce55d3a0886279ecb5"
+  integrity sha512-Mc/ALf1rmZTP4JKKEhUwiORU+vcfarFVLfcFiolKUo6sewoxSEgl36ak5t+4WamRsNr6nzjZXQjM35WsU+9vbg==
   dependencies:
-    "@babel/helper-module-transforms" "^7.16.5"
-    "@babel/helper-plugin-utils" "^7.16.5"
-    "@babel/helper-simple-access" "^7.16.0"
-    babel-plugin-dynamic-import-node "^2.3.3"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
 
-"@babel/plugin-transform-modules-systemjs@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.16.5.tgz#07078ba2e3cc94fbdd06836e355c246e98ad006b"
-  integrity sha512-53gmLdScNN28XpjEVIm7LbWnD/b/TpbwKbLk6KV4KqC9WyU6rq1jnNmVG6UgAdQZVVGZVoik3DqHNxk4/EvrjA==
+"@babel/plugin-transform-member-expression-literals@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.23.3.tgz#e37b3f0502289f477ac0e776b05a833d853cabcc"
+  integrity sha512-sC3LdDBDi5x96LA+Ytekz2ZPk8i/Ck+DEuDbRAll5rknJ5XRTSaPKEYwomLcs1AA8wg9b3KjIQRsnApj+q51Ag==
   dependencies:
-    "@babel/helper-hoist-variables" "^7.16.0"
-    "@babel/helper-module-transforms" "^7.16.5"
-    "@babel/helper-plugin-utils" "^7.16.5"
-    "@babel/helper-validator-identifier" "^7.15.7"
-    babel-plugin-dynamic-import-node "^2.3.3"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-modules-umd@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.5.tgz#caa9c53d636fb4e3c99fd35a4c9ba5e5cd7e002e"
-  integrity sha512-qTFnpxHMoenNHkS3VoWRdwrcJ3FhX567GvDA3hRZKF0Dj8Fmg0UzySZp3AP2mShl/bzcywb/UWAMQIjA1bhXvw==
+"@babel/plugin-transform-modules-amd@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.3.tgz#e19b55436a1416829df0a1afc495deedfae17f7d"
+  integrity sha512-vJYQGxeKM4t8hYCKVBlZX/gtIY2I7mRGFNcm85sgXGMTBcoV3QdVtdpbcWEbzbfUIUZKwvgFT82mRvaQIebZzw==
   dependencies:
-    "@babel/helper-module-transforms" "^7.16.5"
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-module-transforms" "^7.23.3"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.5.tgz#4afd8cdee377ce3568f4e8a9ee67539b69886a3c"
-  integrity sha512-/wqGDgvFUeKELW6ex6QB7dLVRkd5ehjw34tpXu1nhKC0sFfmaLabIswnpf8JgDyV2NeDmZiwoOb0rAmxciNfjA==
+"@babel/plugin-transform-modules-commonjs@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.3.tgz#661ae831b9577e52be57dd8356b734f9700b53b4"
+  integrity sha512-aVS0F65LKsdNOtcz6FRCpE4OgsP2OFnW46qNxNIX9h3wuzaNcSQsJysuMwqSibC98HPrf2vCgtxKNwS0DAlgcA==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.16.0"
+    "@babel/helper-module-transforms" "^7.23.3"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-simple-access" "^7.22.5"
 
-"@babel/plugin-transform-new-target@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.5.tgz#759ea9d6fbbc20796056a5d89d13977626384416"
-  integrity sha512-ZaIrnXF08ZC8jnKR4/5g7YakGVL6go6V9ql6Jl3ecO8PQaQqFE74CuM384kezju7Z9nGCCA20BqZaR1tJ/WvHg==
+"@babel/plugin-transform-modules-systemjs@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.3.tgz#fa7e62248931cb15b9404f8052581c302dd9de81"
+  integrity sha512-ZxyKGTkF9xT9YJuKQRo19ewf3pXpopuYQd8cDXqNzc3mUNbOME0RKMoZxviQk74hwzfQsEe66dE92MaZbdHKNQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-hoist-variables" "^7.22.5"
+    "@babel/helper-module-transforms" "^7.23.3"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-validator-identifier" "^7.22.20"
 
-"@babel/plugin-transform-object-super@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.5.tgz#8ccd9a1bcd3e7732ff8aa1702d067d8cd70ce380"
-  integrity sha512-tded+yZEXuxt9Jdtkc1RraW1zMF/GalVxaVVxh41IYwirdRgyAxxxCKZ9XB7LxZqmsjfjALxupNE1MIz9KH+Zg==
+"@babel/plugin-transform-modules-umd@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.23.3.tgz#5d4395fccd071dfefe6585a4411aa7d6b7d769e9"
+  integrity sha512-zHsy9iXX2nIsCBFPud3jKn1IRPWg3Ing1qOZgeKV39m1ZgIdpJqvlWVeiHBZC6ITRG0MfskhYe9cLgntfSFPIg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.5"
-    "@babel/helper-replace-supers" "^7.16.5"
+    "@babel/helper-module-transforms" "^7.23.3"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-parameters@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.5.tgz#4fc74b18a89638bd90aeec44a11793ecbe031dde"
-  integrity sha512-B3O6AL5oPop1jAVg8CV+haeUte9oFuY85zu0jwnRNZZi3tVAbJriu5tag/oaO2kGaQM/7q7aGPBlTI5/sr9enA==
+"@babel/plugin-transform-named-capturing-groups-regex@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz#67fe18ee8ce02d57c855185e27e3dc959b2e991f"
+  integrity sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-create-regexp-features-plugin" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-property-literals@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.5.tgz#58f1465a7202a2bb2e6b003905212dd7a79abe3f"
-  integrity sha512-+IRcVW71VdF9pEH/2R/Apab4a19LVvdVsr/gEeotH00vSDVlKD+XgfSIw+cgGWsjDB/ziqGv/pGoQZBIiQVXHg==
+"@babel/plugin-transform-new-target@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.23.3.tgz#5491bb78ed6ac87e990957cea367eab781c4d980"
+  integrity sha512-YJ3xKqtJMAT5/TIZnpAR3I+K+WaDowYbN3xyxI8zxx/Gsypwf9B9h0VB+1Nh6ACAAPRS5NSRje0uVv5i79HYGQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-regenerator@^7.10.1", "@babel/plugin-transform-regenerator@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.5.tgz#704cc6d8dd3dd4758267621ab7b36375238cef13"
-  integrity sha512-2z+it2eVWU8TtQQRauvGUqZwLy4+7rTfo6wO4npr+fvvN1SW30ZF3O/ZRCNmTuu4F5MIP8OJhXAhRV5QMJOuYg==
+"@babel/plugin-transform-nullish-coalescing-operator@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.23.4.tgz#45556aad123fc6e52189ea749e33ce090637346e"
+  integrity sha512-jHE9EVVqHKAQx+VePv5LLGHjmHSJR76vawFPTdlxR/LVJPfOEGxREQwQfjuZEOPTwG92X3LINSh3M40Rv4zpVA==
   dependencies:
-    regenerator-transform "^0.14.2"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
 
-"@babel/plugin-transform-reserved-words@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.5.tgz#db95e98799675e193dc2b47d3e72a7c0651d0c30"
-  integrity sha512-aIB16u8lNcf7drkhXJRoggOxSTUAuihTSTfAcpynowGJOZiGf+Yvi7RuTwFzVYSYPmWyARsPqUGoZWWWxLiknw==
+"@babel/plugin-transform-numeric-separator@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.23.4.tgz#03d08e3691e405804ecdd19dd278a40cca531f29"
+  integrity sha512-mps6auzgwjRrwKEZA05cOwuDc9FAzoyFS4ZsG/8F43bTLf/TgkJg7QXOrPO1JO599iA3qgK9MXdMGOEC8O1h6Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
-"@babel/plugin-transform-runtime@^7.11.0":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.16.5.tgz#0cc3f01d69f299d5a42cd9ec43b92ea7a777b8db"
-  integrity sha512-gxpfS8XQWDbQ8oP5NcmpXxtEgCJkbO+W9VhZlOhr0xPyVaRjAQPOv7ZDj9fg0d5s9+NiVvMCE6gbkEkcsxwGRw==
-  dependencies:
-    "@babel/helper-module-imports" "^7.16.0"
-    "@babel/helper-plugin-utils" "^7.16.5"
-    babel-plugin-polyfill-corejs2 "^0.3.0"
-    babel-plugin-polyfill-corejs3 "^0.4.0"
-    babel-plugin-polyfill-regenerator "^0.3.0"
-    semver "^6.3.0"
+"@babel/plugin-transform-object-rest-spread@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.23.4.tgz#2b9c2d26bf62710460bdc0d1730d4f1048361b83"
+  integrity sha512-9x9K1YyeQVw0iOXJlIzwm8ltobIIv7j2iLyP2jIhEbqPRQ7ScNgwQufU2I0Gq11VjyG4gI4yMXt2VFags+1N3g==
+  dependencies:
+    "@babel/compat-data" "^7.23.3"
+    "@babel/helper-compilation-targets" "^7.22.15"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
+    "@babel/plugin-transform-parameters" "^7.23.3"
 
-"@babel/plugin-transform-shorthand-properties@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.5.tgz#ccb60b1a23b799f5b9a14d97c5bc81025ffd96d7"
-  integrity sha512-ZbuWVcY+MAXJuuW7qDoCwoxDUNClfZxoo7/4swVbOW1s/qYLOMHlm9YRWMsxMFuLs44eXsv4op1vAaBaBaDMVg==
+"@babel/plugin-transform-object-super@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.23.3.tgz#81fdb636dcb306dd2e4e8fd80db5b2362ed2ebcd"
+  integrity sha512-BwQ8q0x2JG+3lxCVFohg+KbQM7plfpBwThdW9A6TMtWwLsbDA01Ek2Zb/AgDN39BiZsExm4qrXxjk+P1/fzGrA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-replace-supers" "^7.22.20"
 
-"@babel/plugin-transform-spread@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.5.tgz#912b06cff482c233025d3e69cf56d3e8fa166c29"
-  integrity sha512-5d6l/cnG7Lw4tGHEoga4xSkYp1euP7LAtrah1h1PgJ3JY7yNsjybsxQAnVK4JbtReZ/8z6ASVmd3QhYYKLaKZw==
+"@babel/plugin-transform-optional-catch-binding@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.23.4.tgz#318066de6dacce7d92fa244ae475aa8d91778017"
+  integrity sha512-XIq8t0rJPHf6Wvmbn9nFxU6ao4c7WhghTR5WyV8SrJfUFzyxhCm4nhC+iAp3HFhbAKLfYpgzhJ6t4XCtVwqO5A==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.5"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
 
-"@babel/plugin-transform-sticky-regex@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.5.tgz#593579bb2b5a8adfbe02cb43823275d9098f75f9"
-  integrity sha512-usYsuO1ID2LXxzuUxifgWtJemP7wL2uZtyrTVM4PKqsmJycdS4U4mGovL5xXkfUheds10Dd2PjoQLXw6zCsCbg==
+"@babel/plugin-transform-optional-chaining@^7.23.3", "@babel/plugin-transform-optional-chaining@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.4.tgz#6acf61203bdfc4de9d4e52e64490aeb3e52bd017"
+  integrity sha512-ZU8y5zWOfjM5vZ+asjgAPwDaBjJzgufjES89Rs4Lpq63O300R/kOz30WCLo6BxxX6QVEilwSlpClnG5cZaikTA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
 
-"@babel/plugin-transform-template-literals@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.5.tgz#343651385fd9923f5aa2275ca352c5d9183e1773"
-  integrity sha512-gnyKy9RyFhkovex4BjKWL3BVYzUDG6zC0gba7VMLbQoDuqMfJ1SDXs8k/XK41Mmt1Hyp4qNAvGFb9hKzdCqBRQ==
+"@babel/plugin-transform-parameters@^7.20.7", "@babel/plugin-transform-parameters@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.23.3.tgz#83ef5d1baf4b1072fa6e54b2b0999a7b2527e2af"
+  integrity sha512-09lMt6UsUb3/34BbECKVbVwrT9bO6lILWln237z7sLaWnMsTi7Yc9fhX5DLpkJzAGfaReXI22wP41SZmnAA3Vw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-typeof-symbol@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.5.tgz#a1d1bf2c71573fe30965d0e4cd6a3291202e20ed"
-  integrity sha512-ldxCkW180qbrvyCVDzAUZqB0TAeF8W/vGJoRcaf75awm6By+PxfJKvuqVAnq8N9wz5Xa6mSpM19OfVKKVmGHSQ==
+"@babel/plugin-transform-private-methods@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.23.3.tgz#b2d7a3c97e278bfe59137a978d53b2c2e038c0e4"
+  integrity sha512-UzqRcRtWsDMTLrRWFvUBDwmw06tCQH9Rl1uAjfh6ijMSmGYQ+fpdB+cnqRC8EMh5tuuxSv0/TejGL+7vyj+50g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-create-class-features-plugin" "^7.22.15"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-unicode-escapes@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.5.tgz#80507c225af49b4f4ee647e2a0ce53d2eeff9e85"
-  integrity sha512-shiCBHTIIChGLdyojsKQjoAyB8MBwat25lKM7MJjbe1hE0bgIppD+LX9afr41lLHOhqceqeWl4FkLp+Bgn9o1Q==
+"@babel/plugin-transform-private-property-in-object@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.23.4.tgz#3ec711d05d6608fd173d9b8de39872d8dbf68bf5"
+  integrity sha512-9G3K1YqTq3F4Vt88Djx1UZ79PDyj+yKRnUy7cZGSMe+a7jkwD259uKKuUzQlPkGam7R+8RJwh5z4xO27fA1o2A==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    "@babel/helper-create-class-features-plugin" "^7.22.15"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
 
-"@babel/plugin-transform-unicode-regex@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.5.tgz#ac84d6a1def947d71ffb832426aa53b83d7ed49e"
-  integrity sha512-GTJ4IW012tiPEMMubd7sD07iU9O/LOo8Q/oU4xNhcaq0Xn8+6TcUQaHtC8YxySo1T+ErQ8RaWogIEeFhKGNPzw==
+"@babel/plugin-transform-property-literals@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.23.3.tgz#54518f14ac4755d22b92162e4a852d308a560875"
+  integrity sha512-jR3Jn3y7cZp4oEWPFAlRsSWjxKe4PZILGBSd4nis1TsC5qeSpb+nrtihJuDhNI7QHiVbUaiXa0X2RZY3/TI6Nw==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.16.0"
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/preset-env@^7.11.0":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.16.5.tgz#2e94d922f4a890979af04ffeb6a6b4e44ba90847"
-  integrity sha512-MiJJW5pwsktG61NDxpZ4oJ1CKxM1ncam9bzRtx9g40/WkLRkxFP6mhpkYV0/DxcciqoiHicx291+eUQrXb/SfQ==
-  dependencies:
-    "@babel/compat-data" "^7.16.4"
-    "@babel/helper-compilation-targets" "^7.16.3"
-    "@babel/helper-plugin-utils" "^7.16.5"
-    "@babel/helper-validator-option" "^7.14.5"
-    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.16.2"
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.16.0"
-    "@babel/plugin-proposal-async-generator-functions" "^7.16.5"
-    "@babel/plugin-proposal-class-properties" "^7.16.5"
-    "@babel/plugin-proposal-class-static-block" "^7.16.5"
-    "@babel/plugin-proposal-dynamic-import" "^7.16.5"
-    "@babel/plugin-proposal-export-namespace-from" "^7.16.5"
-    "@babel/plugin-proposal-json-strings" "^7.16.5"
-    "@babel/plugin-proposal-logical-assignment-operators" "^7.16.5"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.16.5"
-    "@babel/plugin-proposal-numeric-separator" "^7.16.5"
-    "@babel/plugin-proposal-object-rest-spread" "^7.16.5"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.16.5"
-    "@babel/plugin-proposal-optional-chaining" "^7.16.5"
-    "@babel/plugin-proposal-private-methods" "^7.16.5"
-    "@babel/plugin-proposal-private-property-in-object" "^7.16.5"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.16.5"
+"@babel/plugin-transform-regenerator@^7.14.5", "@babel/plugin-transform-regenerator@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.23.3.tgz#141afd4a2057298602069fce7f2dc5173e6c561c"
+  integrity sha512-KP+75h0KghBMcVpuKisx3XTu9Ncut8Q8TuvGO4IhY+9D5DFEckQefOuIsB/gQ2tG71lCke4NMrtIPS8pOj18BQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+    regenerator-transform "^0.15.2"
+
+"@babel/plugin-transform-reserved-words@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.23.3.tgz#4130dcee12bd3dd5705c587947eb715da12efac8"
+  integrity sha512-QnNTazY54YqgGxwIexMZva9gqbPa15t/x9VS+0fsEFWplwVpXYZivtgl43Z1vMpc1bdPP2PP8siFeVcnFvA3Cg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-runtime@^7.15.0":
+  version "7.23.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.23.7.tgz#52bbd20054855beb9deae3bee9ceb05289c343e6"
+  integrity sha512-fa0hnfmiXc9fq/weK34MUV0drz2pOL/vfKWvN7Qw127hiUPabFCUMgAbYWcchRzMJit4o5ARsK/s+5h0249pLw==
+  dependencies:
+    "@babel/helper-module-imports" "^7.22.15"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    babel-plugin-polyfill-corejs2 "^0.4.7"
+    babel-plugin-polyfill-corejs3 "^0.8.7"
+    babel-plugin-polyfill-regenerator "^0.5.4"
+    semver "^6.3.1"
+
+"@babel/plugin-transform-shorthand-properties@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.23.3.tgz#97d82a39b0e0c24f8a981568a8ed851745f59210"
+  integrity sha512-ED2fgqZLmexWiN+YNFX26fx4gh5qHDhn1O2gvEhreLW2iI63Sqm4llRLCXALKrCnbN4Jy0VcMQZl/SAzqug/jg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-spread@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.23.3.tgz#41d17aacb12bde55168403c6f2d6bdca563d362c"
+  integrity sha512-VvfVYlrlBVu+77xVTOAoxQ6mZbnIq5FM0aGBSFEcIh03qHf+zNqA4DC/3XMUozTg7bZV3e3mZQ0i13VB6v5yUg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
+
+"@babel/plugin-transform-sticky-regex@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.23.3.tgz#dec45588ab4a723cb579c609b294a3d1bd22ff04"
+  integrity sha512-HZOyN9g+rtvnOU3Yh7kSxXrKbzgrm5X4GncPY1QOquu7epga5MxKHVpYu2hvQnry/H+JjckSYRb93iNfsioAGg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-template-literals@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.23.3.tgz#5f0f028eb14e50b5d0f76be57f90045757539d07"
+  integrity sha512-Flok06AYNp7GV2oJPZZcP9vZdszev6vPBkHLwxwSpaIqx75wn6mUd3UFWsSsA0l8nXAKkyCmL/sR02m8RYGeHg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-typeof-symbol@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.23.3.tgz#9dfab97acc87495c0c449014eb9c547d8966bca4"
+  integrity sha512-4t15ViVnaFdrPC74be1gXBSMzXk3B4Us9lP7uLRQHTFpV5Dvt33pn+2MyyNxmN3VTTm3oTrZVMUmuw3oBnQ2oQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-unicode-escapes@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.23.3.tgz#1f66d16cab01fab98d784867d24f70c1ca65b925"
+  integrity sha512-OMCUx/bU6ChE3r4+ZdylEqAjaQgHAgipgW8nsCfu5pGqDcFytVd91AwRvUJSBZDz0exPGgnjoqhgRYLRjFZc9Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-unicode-property-regex@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.23.3.tgz#19e234129e5ffa7205010feec0d94c251083d7ad"
+  integrity sha512-KcLIm+pDZkWZQAFJ9pdfmh89EwVfmNovFBcXko8szpBeF8z68kWIPeKlmSOkT9BXJxs2C0uk+5LxoxIv62MROA==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.22.15"
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-unicode-regex@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.23.3.tgz#26897708d8f42654ca4ce1b73e96140fbad879dc"
+  integrity sha512-wMHpNA4x2cIA32b/ci3AfwNgheiva2W0WUKWTK7vBHBhDKfPsc5cFGNWm69WBqpwd86u1qwZ9PWevKqm1A3yAw==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.22.15"
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-unicode-sets-regex@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.23.3.tgz#4fb6f0a719c2c5859d11f6b55a050cc987f3799e"
+  integrity sha512-W7lliA/v9bNR83Qc3q1ip9CQMZ09CcHDbHfbLRDNuAhn1Mvkr1ZNF7hPmztMQvtTGVLJ9m8IZqWsTkXOml8dbw==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.22.15"
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/preset-env@^7.15.0":
+  version "7.23.8"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.23.8.tgz#7d6f8171ea7c221ecd28059e65ad37c20e441e3e"
+  integrity sha512-lFlpmkApLkEP6woIKprO6DO60RImpatTQKtz4sUcDjVcK8M8mQ4sZsuxaTMNOZf0sqAq/ReYW1ZBHnOQwKpLWA==
+  dependencies:
+    "@babel/compat-data" "^7.23.5"
+    "@babel/helper-compilation-targets" "^7.23.6"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-validator-option" "^7.23.5"
+    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.23.3"
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.23.3"
+    "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly" "^7.23.7"
+    "@babel/plugin-proposal-private-property-in-object" "7.21.0-placeholder-for-preset-env.2"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
     "@babel/plugin-syntax-class-properties" "^7.12.13"
     "@babel/plugin-syntax-class-static-block" "^7.14.5"
     "@babel/plugin-syntax-dynamic-import" "^7.8.3"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
+    "@babel/plugin-syntax-import-assertions" "^7.23.3"
+    "@babel/plugin-syntax-import-attributes" "^7.23.3"
+    "@babel/plugin-syntax-import-meta" "^7.10.4"
     "@babel/plugin-syntax-json-strings" "^7.8.3"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
@@ -877,73 +926,90 @@
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
     "@babel/plugin-syntax-top-level-await" "^7.14.5"
-    "@babel/plugin-transform-arrow-functions" "^7.16.5"
-    "@babel/plugin-transform-async-to-generator" "^7.16.5"
-    "@babel/plugin-transform-block-scoped-functions" "^7.16.5"
-    "@babel/plugin-transform-block-scoping" "^7.16.5"
-    "@babel/plugin-transform-classes" "^7.16.5"
-    "@babel/plugin-transform-computed-properties" "^7.16.5"
-    "@babel/plugin-transform-destructuring" "^7.16.5"
-    "@babel/plugin-transform-dotall-regex" "^7.16.5"
-    "@babel/plugin-transform-duplicate-keys" "^7.16.5"
-    "@babel/plugin-transform-exponentiation-operator" "^7.16.5"
-    "@babel/plugin-transform-for-of" "^7.16.5"
-    "@babel/plugin-transform-function-name" "^7.16.5"
-    "@babel/plugin-transform-literals" "^7.16.5"
-    "@babel/plugin-transform-member-expression-literals" "^7.16.5"
-    "@babel/plugin-transform-modules-amd" "^7.16.5"
-    "@babel/plugin-transform-modules-commonjs" "^7.16.5"
-    "@babel/plugin-transform-modules-systemjs" "^7.16.5"
-    "@babel/plugin-transform-modules-umd" "^7.16.5"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.16.5"
-    "@babel/plugin-transform-new-target" "^7.16.5"
-    "@babel/plugin-transform-object-super" "^7.16.5"
-    "@babel/plugin-transform-parameters" "^7.16.5"
-    "@babel/plugin-transform-property-literals" "^7.16.5"
-    "@babel/plugin-transform-regenerator" "^7.16.5"
-    "@babel/plugin-transform-reserved-words" "^7.16.5"
-    "@babel/plugin-transform-shorthand-properties" "^7.16.5"
-    "@babel/plugin-transform-spread" "^7.16.5"
-    "@babel/plugin-transform-sticky-regex" "^7.16.5"
-    "@babel/plugin-transform-template-literals" "^7.16.5"
-    "@babel/plugin-transform-typeof-symbol" "^7.16.5"
-    "@babel/plugin-transform-unicode-escapes" "^7.16.5"
-    "@babel/plugin-transform-unicode-regex" "^7.16.5"
-    "@babel/preset-modules" "^0.1.5"
-    "@babel/types" "^7.16.0"
-    babel-plugin-polyfill-corejs2 "^0.3.0"
-    babel-plugin-polyfill-corejs3 "^0.4.0"
-    babel-plugin-polyfill-regenerator "^0.3.0"
-    core-js-compat "^3.19.1"
-    semver "^6.3.0"
-
-"@babel/preset-modules@^0.1.5":
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.5.tgz#ef939d6e7f268827e1841638dc6ff95515e115d9"
-  integrity sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==
+    "@babel/plugin-syntax-unicode-sets-regex" "^7.18.6"
+    "@babel/plugin-transform-arrow-functions" "^7.23.3"
+    "@babel/plugin-transform-async-generator-functions" "^7.23.7"
+    "@babel/plugin-transform-async-to-generator" "^7.23.3"
+    "@babel/plugin-transform-block-scoped-functions" "^7.23.3"
+    "@babel/plugin-transform-block-scoping" "^7.23.4"
+    "@babel/plugin-transform-class-properties" "^7.23.3"
+    "@babel/plugin-transform-class-static-block" "^7.23.4"
+    "@babel/plugin-transform-classes" "^7.23.8"
+    "@babel/plugin-transform-computed-properties" "^7.23.3"
+    "@babel/plugin-transform-destructuring" "^7.23.3"
+    "@babel/plugin-transform-dotall-regex" "^7.23.3"
+    "@babel/plugin-transform-duplicate-keys" "^7.23.3"
+    "@babel/plugin-transform-dynamic-import" "^7.23.4"
+    "@babel/plugin-transform-exponentiation-operator" "^7.23.3"
+    "@babel/plugin-transform-export-namespace-from" "^7.23.4"
+    "@babel/plugin-transform-for-of" "^7.23.6"
+    "@babel/plugin-transform-function-name" "^7.23.3"
+    "@babel/plugin-transform-json-strings" "^7.23.4"
+    "@babel/plugin-transform-literals" "^7.23.3"
+    "@babel/plugin-transform-logical-assignment-operators" "^7.23.4"
+    "@babel/plugin-transform-member-expression-literals" "^7.23.3"
+    "@babel/plugin-transform-modules-amd" "^7.23.3"
+    "@babel/plugin-transform-modules-commonjs" "^7.23.3"
+    "@babel/plugin-transform-modules-systemjs" "^7.23.3"
+    "@babel/plugin-transform-modules-umd" "^7.23.3"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.22.5"
+    "@babel/plugin-transform-new-target" "^7.23.3"
+    "@babel/plugin-transform-nullish-coalescing-operator" "^7.23.4"
+    "@babel/plugin-transform-numeric-separator" "^7.23.4"
+    "@babel/plugin-transform-object-rest-spread" "^7.23.4"
+    "@babel/plugin-transform-object-super" "^7.23.3"
+    "@babel/plugin-transform-optional-catch-binding" "^7.23.4"
+    "@babel/plugin-transform-optional-chaining" "^7.23.4"
+    "@babel/plugin-transform-parameters" "^7.23.3"
+    "@babel/plugin-transform-private-methods" "^7.23.3"
+    "@babel/plugin-transform-private-property-in-object" "^7.23.4"
+    "@babel/plugin-transform-property-literals" "^7.23.3"
+    "@babel/plugin-transform-regenerator" "^7.23.3"
+    "@babel/plugin-transform-reserved-words" "^7.23.3"
+    "@babel/plugin-transform-shorthand-properties" "^7.23.3"
+    "@babel/plugin-transform-spread" "^7.23.3"
+    "@babel/plugin-transform-sticky-regex" "^7.23.3"
+    "@babel/plugin-transform-template-literals" "^7.23.3"
+    "@babel/plugin-transform-typeof-symbol" "^7.23.3"
+    "@babel/plugin-transform-unicode-escapes" "^7.23.3"
+    "@babel/plugin-transform-unicode-property-regex" "^7.23.3"
+    "@babel/plugin-transform-unicode-regex" "^7.23.3"
+    "@babel/plugin-transform-unicode-sets-regex" "^7.23.3"
+    "@babel/preset-modules" "0.1.6-no-external-plugins"
+    babel-plugin-polyfill-corejs2 "^0.4.7"
+    babel-plugin-polyfill-corejs3 "^0.8.7"
+    babel-plugin-polyfill-regenerator "^0.5.4"
+    core-js-compat "^3.31.0"
+    semver "^6.3.1"
+
+"@babel/preset-modules@0.1.6-no-external-plugins":
+  version "0.1.6-no-external-plugins"
+  resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz#ccb88a2c49c817236861fee7826080573b8a923a"
+  integrity sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.4.4"
-    "@babel/plugin-transform-dotall-regex" "^7.4.4"
     "@babel/types" "^7.4.4"
     esutils "^2.0.2"
 
-"@babel/runtime@^7.11.2", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4":
+"@babel/regjsgen@^0.8.0":
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310"
+  integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==
+
+"@babel/runtime@^7.15.3":
+  version "7.23.8"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.8.tgz#8ee6fe1ac47add7122902f257b8ddf55c898f650"
+  integrity sha512-Y7KbAP984rn1VGMbGqKmBLio9V7y5Je9GvU4rQPCPinCyNfUcToxIXl06d59URp/F3LwinvODxab5N/G6qggkw==
+  dependencies:
+    regenerator-runtime "^0.14.0"
+
+"@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4":
   version "7.16.5"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.16.5.tgz#7f3e34bf8bdbbadf03fbb7b1ea0d929569c9487a"
   integrity sha512-TXWihFIS3Pyv5hzR7j6ihmeLkZfrXGxAr5UfSl8CHf+6q/wpiYDkUau0czckpYG8QmnCIuPpdLtuA9VmuGGyMA==
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/template@^7.16.0":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.0.tgz#d16a35ebf4cd74e202083356fab21dd89363ddd6"
-  integrity sha512-MnZdpFD/ZdYhXwiunMqqgyZyucaYsbL0IrjoGjaVhGilz+x8YB++kRfygSOIj1yOtWKPlx7NBp+9I1RQSgsd5A==
-  dependencies:
-    "@babel/code-frame" "^7.16.0"
-    "@babel/parser" "^7.16.0"
-    "@babel/types" "^7.16.0"
-
 "@babel/template@^7.22.15":
   version "7.22.15"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.15.tgz#09576efc3830f0430f4548ef971dde1350ef2f38"
@@ -953,30 +1019,22 @@
     "@babel/parser" "^7.22.15"
     "@babel/types" "^7.22.15"
 
-"@babel/traverse@^7.13.0", "@babel/traverse@^7.16.5":
-  version "7.23.2"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.2.tgz#329c7a06735e144a506bdb2cad0268b7f46f4ad8"
-  integrity sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==
+"@babel/traverse@^7.23.7":
+  version "7.23.7"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.7.tgz#9a7bf285c928cb99b5ead19c3b1ce5b310c9c305"
+  integrity sha512-tY3mM8rH9jM0YHFGyfC0/xf+SB5eKUu7HPj7/k3fpi9dAlsMc5YbQvDi0Sh2QTPXqMhyaAtzAr807TIyfQrmyg==
   dependencies:
-    "@babel/code-frame" "^7.22.13"
-    "@babel/generator" "^7.23.0"
+    "@babel/code-frame" "^7.23.5"
+    "@babel/generator" "^7.23.6"
     "@babel/helper-environment-visitor" "^7.22.20"
     "@babel/helper-function-name" "^7.23.0"
     "@babel/helper-hoist-variables" "^7.22.5"
     "@babel/helper-split-export-declaration" "^7.22.6"
-    "@babel/parser" "^7.23.0"
-    "@babel/types" "^7.23.0"
-    debug "^4.1.0"
+    "@babel/parser" "^7.23.6"
+    "@babel/types" "^7.23.6"
+    debug "^4.3.1"
     globals "^11.1.0"
 
-"@babel/types@^7.16.0", "@babel/types@^7.4.4":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.16.0.tgz#db3b313804f96aadd0b776c4823e127ad67289ba"
-  integrity sha512-PJgg/k3SdLsGb3hhisFvtLOw5ts113klrpLuIPtCJIU+BB24fqq6lf8RWqKJEjzqXR9AEH1rIb5XTqwBHB+kQg==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.15.7"
-    to-fast-properties "^2.0.0"
-
 "@babel/types@^7.22.15", "@babel/types@^7.22.5", "@babel/types@^7.23.0":
   version "7.23.0"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.0.tgz#8c1f020c9df0e737e4e247c0619f58c68458aaeb"
@@ -986,6 +1044,23 @@
     "@babel/helper-validator-identifier" "^7.22.20"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.22.19", "@babel/types@^7.23.6":
+  version "7.23.6"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.6.tgz#be33fdb151e1f5a56877d704492c240fc71c7ccd"
+  integrity sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg==
+  dependencies:
+    "@babel/helper-string-parser" "^7.23.4"
+    "@babel/helper-validator-identifier" "^7.22.20"
+    to-fast-properties "^2.0.0"
+
+"@babel/types@^7.4.4":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.16.0.tgz#db3b313804f96aadd0b776c4823e127ad67289ba"
+  integrity sha512-PJgg/k3SdLsGb3hhisFvtLOw5ts113klrpLuIPtCJIU+BB24fqq6lf8RWqKJEjzqXR9AEH1rIb5XTqwBHB+kQg==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.15.7"
+    to-fast-properties "^2.0.0"
+
 "@csstools/convert-colors@^1.4.0":
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/@csstools/convert-colors/-/convert-colors-1.4.0.tgz#ad495dc41b12e75d588c6db8b9834f08fa131eb7"
@@ -996,7 +1071,7 @@
   resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.2.tgz#30aa825f11d438671d585bd44e7fd564535fc210"
   integrity sha512-82cpyJyKRoQoRi+14ibCeGPu0CwypgtBAdBhq1WfvagpCZNKqwXbKwXllYSMG91DhmG4jt9gN8eP6lGOtozuaw==
 
-"@jridgewell/gen-mapping@^0.3.2":
+"@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2":
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz#7e02e6eb5df901aaedb08514203b096614024098"
   integrity sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==
@@ -1015,6 +1090,14 @@
   resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72"
   integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==
 
+"@jridgewell/source-map@^0.3.3":
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.5.tgz#a3bb4d5c6825aab0d281268f47f6ad5853431e91"
+  integrity sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==
+  dependencies:
+    "@jridgewell/gen-mapping" "^0.3.0"
+    "@jridgewell/trace-mapping" "^0.3.9"
+
 "@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.14":
   version "1.4.15"
   resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32"
@@ -1028,6 +1111,11 @@
     "@jridgewell/resolve-uri" "^3.1.0"
     "@jridgewell/sourcemap-codec" "^1.4.14"
 
+"@leichtgewicht/ip-codec@^2.0.1":
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz#b2ac626d6cb9c8718ab459166d4bb405b8ffa78b"
+  integrity sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==
+
 "@npmcli/fs@^1.0.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-1.1.0.tgz#bec1d1b89c170d40e1b73ad6c943b0b75e7d2951"
@@ -1044,68 +1132,122 @@
     mkdirp "^1.0.4"
     rimraf "^3.0.2"
 
-"@rails/activestorage@^6.0.0":
-  version "6.1.4"
-  resolved "https://registry.yarnpkg.com/@rails/activestorage/-/activestorage-6.1.4.tgz#7772f539cc846df5f4364fc57ccb48860f9e966e"
-  integrity sha512-1Tm8uaVBhLTDEG4YaFPvqguhjbUGSPVItm0CfkRpIFZIkybWzFAxatIrk4YVOOxB8ZdXS7GdeYa1qVwjdiDkgQ==
+"@rails/activestorage@7.1.3":
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/@rails/activestorage/-/activestorage-7.1.3.tgz#e83ece6c5fd94b3ddf30a8cf3b8f78cad049e596"
+  integrity sha512-B+RFYAU8vdTPFg0IJcRp2ey0Qw9hpcUOqHHcWqftDJ76ZMBi9+m/UUeMJlNsSd0l9eD+1HLlFSo1X//cY4yiDw==
   dependencies:
-    spark-md5 "^3.0.0"
+    spark-md5 "^3.0.1"
 
-"@rails/ujs@^6.0.0":
-  version "6.1.4"
-  resolved "https://registry.yarnpkg.com/@rails/ujs/-/ujs-6.1.4.tgz#093d5341595a02089ed309dec40f3c37da7b1b10"
-  integrity sha512-O3lEzL5DYbxppMdsFSw36e4BHIlfz/xusynwXGv3l2lhSlvah41qviRpsoAlKXxl37nZAqK+UUF5cnGGK45Mfw==
+"@rails/ujs@7.1.3":
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/@rails/ujs/-/ujs-7.1.3.tgz#6d94a68b7da5046147d31716e0c187a4ead4fb93"
+  integrity sha512-FxtgKNvvIonoBE1TK7U10VMf6CYvzq8SIZ1XZ1Q8zcn/BEXzPzid3zC9qFiojuI5WXVwWhO8GFqApq0stD+OqQ==
 
-"@rails/webpacker@5.2.1":
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/@rails/webpacker/-/webpacker-5.2.1.tgz#87cdbd4af2090ae2d74bdc51f6f04717d907c5b3"
-  integrity sha512-rO0kOv0o4ESB8ZnKX+b54ZKogNJGWSMULGmsJacREfm9SahKEQwXBeHNsqSGtS9NAPsU6YUFhGKRd4i/kbMNrQ==
+"@rails/webpacker@5.4.4":
+  version "5.4.4"
+  resolved "https://registry.yarnpkg.com/@rails/webpacker/-/webpacker-5.4.4.tgz#971a41b987c096c908ce4088accd57c1a9a7e2f7"
+  integrity sha512-hp9myb2MChYFPfE5Fd/3gF4q2m4wpxC+WWCkxcg6My3HYCptWuqMVXRwrBZ5EJHYiL/WRyMLvVNWwlFV47xhUw==
   dependencies:
-    "@babel/core" "^7.11.1"
-    "@babel/plugin-proposal-class-properties" "^7.10.4"
-    "@babel/plugin-proposal-object-rest-spread" "^7.10.1"
+    "@babel/core" "^7.15.0"
+    "@babel/plugin-proposal-class-properties" "^7.14.5"
+    "@babel/plugin-proposal-object-rest-spread" "^7.14.7"
     "@babel/plugin-syntax-dynamic-import" "^7.8.3"
-    "@babel/plugin-transform-destructuring" "^7.10.1"
-    "@babel/plugin-transform-regenerator" "^7.10.1"
-    "@babel/plugin-transform-runtime" "^7.11.0"
-    "@babel/preset-env" "^7.11.0"
-    "@babel/runtime" "^7.11.2"
-    babel-loader "^8.1.0"
+    "@babel/plugin-transform-destructuring" "^7.14.7"
+    "@babel/plugin-transform-regenerator" "^7.14.5"
+    "@babel/plugin-transform-runtime" "^7.15.0"
+    "@babel/preset-env" "^7.15.0"
+    "@babel/runtime" "^7.15.3"
+    babel-loader "^8.2.2"
     babel-plugin-dynamic-import-node "^2.3.3"
     babel-plugin-macros "^2.8.0"
-    case-sensitive-paths-webpack-plugin "^2.3.0"
-    compression-webpack-plugin "^4.0.0"
-    core-js "^3.6.5"
-    css-loader "^3.5.3"
-    file-loader "^6.0.0"
-    flatted "^3.0.4"
-    glob "^7.1.6"
-    js-yaml "^3.14.0"
+    case-sensitive-paths-webpack-plugin "^2.4.0"
+    compression-webpack-plugin "^4.0.1"
+    core-js "^3.16.2"
+    css-loader "^3.6.0"
+    file-loader "^6.2.0"
+    flatted "^3.2.2"
+    glob "^7.1.7"
+    js-yaml "^3.14.1"
     mini-css-extract-plugin "^0.9.0"
-    node-sass "^4.14.1"
-    optimize-css-assets-webpack-plugin "^5.0.3"
+    optimize-css-assets-webpack-plugin "^5.0.8"
     path-complete-extname "^1.0.0"
-    pnp-webpack-plugin "^1.6.4"
+    pnp-webpack-plugin "^1.7.0"
     postcss-flexbugs-fixes "^4.2.1"
     postcss-import "^12.0.1"
     postcss-loader "^3.0.0"
     postcss-preset-env "^6.7.0"
     postcss-safe-parser "^4.0.2"
-    regenerator-runtime "^0.13.7"
-    sass-loader "^8.0.2"
-    style-loader "^1.2.1"
-    terser-webpack-plugin "^4.0.0"
-    webpack "^4.44.1"
+    regenerator-runtime "^0.13.9"
+    sass "^1.38.0"
+    sass-loader "10.1.1"
+    style-loader "^1.3.0"
+    terser-webpack-plugin "^4.2.3"
+    webpack "^4.46.0"
     webpack-assets-manifest "^3.1.1"
     webpack-cli "^3.3.12"
     webpack-sources "^1.4.3"
 
-"@types/glob@^7.1.1":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb"
-  integrity sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==
+"@types/body-parser@*":
+  version "1.19.5"
+  resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.5.tgz#04ce9a3b677dc8bd681a17da1ab9835dc9d3ede4"
+  integrity sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==
+  dependencies:
+    "@types/connect" "*"
+    "@types/node" "*"
+
+"@types/bonjour@^3.5.9":
+  version "3.5.13"
+  resolved "https://registry.yarnpkg.com/@types/bonjour/-/bonjour-3.5.13.tgz#adf90ce1a105e81dd1f9c61fdc5afda1bfb92956"
+  integrity sha512-z9fJ5Im06zvUL548KvYNecEVlA7cVDkGUi6kZusb04mpyEFKCIZJvloCcmpmLaIahDpOQGHaHmG6imtPMmPXGQ==
+  dependencies:
+    "@types/node" "*"
+
+"@types/connect-history-api-fallback@^1.3.5":
+  version "1.5.4"
+  resolved "https://registry.yarnpkg.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.4.tgz#7de71645a103056b48ac3ce07b3520b819c1d5b3"
+  integrity sha512-n6Cr2xS1h4uAulPRdlw6Jl6s1oG8KrVilPN2yUITEs+K48EzMJJ3W1xy8K5eWuFvjp3R74AOIGSmp2UfBJ8HFw==
+  dependencies:
+    "@types/express-serve-static-core" "*"
+    "@types/node" "*"
+
+"@types/connect@*":
+  version "3.4.38"
+  resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.38.tgz#5ba7f3bc4fbbdeaff8dded952e5ff2cc53f8d858"
+  integrity sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==
+  dependencies:
+    "@types/node" "*"
+
+"@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.33":
+  version "4.17.41"
+  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.41.tgz#5077defa630c2e8d28aa9ffc2c01c157c305bef6"
+  integrity sha512-OaJ7XLaelTgrvlZD8/aa0vvvxZdUmlCn6MtWeB7TkiKW70BQLc9XEPpDLPdbo52ZhXUCrznlWdCHWxJWtdyajA==
+  dependencies:
+    "@types/node" "*"
+    "@types/qs" "*"
+    "@types/range-parser" "*"
+    "@types/send" "*"
+
+"@types/express@*", "@types/express@^4.17.13":
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.21.tgz#c26d4a151e60efe0084b23dc3369ebc631ed192d"
+  integrity sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==
+  dependencies:
+    "@types/body-parser" "*"
+    "@types/express-serve-static-core" "^4.17.33"
+    "@types/qs" "*"
+    "@types/serve-static" "*"
+
+"@types/http-errors@*":
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@types/http-errors/-/http-errors-2.0.4.tgz#7eb47726c391b7345a6ec35ad7f4de469cf5ba4f"
+  integrity sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==
+
+"@types/http-proxy@^1.17.8":
+  version "1.17.14"
+  resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.14.tgz#57f8ccaa1c1c3780644f8a94f9c6b5000b5e2eec"
+  integrity sha512-SSrD0c1OQzlFX7pGu1eXxSEjemej64aaNPRhhVYUGqXh0BtldAAx37MG8btcumvpgKyZp1F5Gn3JkktdxiFv6w==
   dependencies:
-    "@types/minimatch" "*"
     "@types/node" "*"
 
 "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8":
@@ -1113,10 +1255,27 @@
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d"
   integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==
 
-"@types/minimatch@*":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40"
-  integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==
+"@types/json-schema@^7.0.9":
+  version "7.0.15"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
+  integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
+
+"@types/mime@*":
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/@types/mime/-/mime-3.0.4.tgz#2198ac274de6017b44d941e00261d5bc6a0e0a45"
+  integrity sha512-iJt33IQnVRkqeqC7PzBHPTC6fDlRNRW8vjrgqtScAhrmMwe8c4Eo7+fUGTa+XdWrpEgpyKWMYmi2dIwMAYRzPw==
+
+"@types/mime@^1":
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.5.tgz#1ef302e01cf7d2b5a0fa526790c9123bf1d06690"
+  integrity sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==
+
+"@types/node-forge@^1.3.0":
+  version "1.3.11"
+  resolved "https://registry.yarnpkg.com/@types/node-forge/-/node-forge-1.3.11.tgz#0972ea538ddb0f4d9c2fa0ec5db5724773a604da"
+  integrity sha512-FQx220y22OKNTqaByeBGqHWYz4cl94tpcxeFdvBo3wjG6XPBuZ0BNgNZRV5J5TFmmcsJ4IzsLkmGRiQbnYsBEQ==
+  dependencies:
+    "@types/node" "*"
 
 "@types/node@*":
   version "17.0.0"
@@ -1133,6 +1292,59 @@
   resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.5.tgz#75a2a8e7d8ab4b230414505d92335d1dcb53a6df"
   integrity sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ==
 
+"@types/qs@*":
+  version "6.9.11"
+  resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.11.tgz#208d8a30bc507bd82e03ada29e4732ea46a6bbda"
+  integrity sha512-oGk0gmhnEJK4Yyk+oI7EfXsLayXatCWPHary1MtcmbAifkobT9cM9yutG/hZKIseOU0MqbIwQ/u2nn/Gb+ltuQ==
+
+"@types/range-parser@*":
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.7.tgz#50ae4353eaaddc04044279812f52c8c65857dbcb"
+  integrity sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==
+
+"@types/retry@0.12.0":
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.0.tgz#2b35eccfcee7d38cd72ad99232fbd58bffb3c84d"
+  integrity sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==
+
+"@types/send@*":
+  version "0.17.4"
+  resolved "https://registry.yarnpkg.com/@types/send/-/send-0.17.4.tgz#6619cd24e7270793702e4e6a4b958a9010cfc57a"
+  integrity sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==
+  dependencies:
+    "@types/mime" "^1"
+    "@types/node" "*"
+
+"@types/serve-index@^1.9.1":
+  version "1.9.4"
+  resolved "https://registry.yarnpkg.com/@types/serve-index/-/serve-index-1.9.4.tgz#e6ae13d5053cb06ed36392110b4f9a49ac4ec898"
+  integrity sha512-qLpGZ/c2fhSs5gnYsQxtDEq3Oy8SXPClIXkW5ghvAvsNuVSA8k+gCONcUCS/UjLEYvYps+e8uBtfgXgvhwfNug==
+  dependencies:
+    "@types/express" "*"
+
+"@types/serve-static@*", "@types/serve-static@^1.13.10":
+  version "1.15.5"
+  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.5.tgz#15e67500ec40789a1e8c9defc2d32a896f05b033"
+  integrity sha512-PDRk21MnK70hja/YF8AHfC7yIsiQHn1rcXx7ijCFBX/k+XQJhQT/gw3xekXKJvx+5SXaMMS8oqQy09Mzvz2TuQ==
+  dependencies:
+    "@types/http-errors" "*"
+    "@types/mime" "*"
+    "@types/node" "*"
+
+"@types/sockjs@^0.3.33":
+  version "0.3.36"
+  resolved "https://registry.yarnpkg.com/@types/sockjs/-/sockjs-0.3.36.tgz#ce322cf07bcc119d4cbf7f88954f3a3bd0f67535"
+  integrity sha512-MK9V6NzAS1+Ud7JV9lJLFqW85VbC9dq3LmwZCuBe4wBDgKC0Kj/jd8Xl+nSviU+Qc3+m7umHHyHg//2KSa0a0Q==
+  dependencies:
+    "@types/node" "*"
+
+"@types/ws@^8.5.5":
+  version "8.5.10"
+  resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.10.tgz#4acfb517970853fa6574a3a6886791d04a396787"
+  integrity sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A==
+  dependencies:
+    "@types/node" "*"
+
 "@webassemblyjs/ast@1.9.0":
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.0.tgz#bd850604b4042459a5a41cd7d338cbed695ed964"
@@ -1288,11 +1500,6 @@
   resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
   integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
 
-abbrev@1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
-  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
-
 accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.8:
   version "1.3.8"
   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e"
@@ -1306,6 +1513,11 @@ acorn@^6.4.1:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6"
   integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==
 
+acorn@^8.8.2:
+  version "8.11.3"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.3.tgz#71e0b14e13a4ec160724b38fb7b0f233b1b81d7a"
+  integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==
+
 aggregate-error@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
@@ -1319,12 +1531,26 @@ ajv-errors@^1.0.0:
   resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d"
   integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==
 
+ajv-formats@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520"
+  integrity sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==
+  dependencies:
+    ajv "^8.0.0"
+
 ajv-keywords@^3.1.0, ajv-keywords@^3.4.1, ajv-keywords@^3.5.2:
   version "3.5.2"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
   integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
 
-ajv@^6.1.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5:
+ajv-keywords@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz#69d4d385a4733cdbeab44964a1170a88f87f0e16"
+  integrity sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==
+  dependencies:
+    fast-deep-equal "^3.1.3"
+
+ajv@^6.1.0, ajv@^6.10.2, ajv@^6.12.4, ajv@^6.12.5:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -1334,45 +1560,30 @@ ajv@^6.1.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
+ajv@^8.0.0, ajv@^8.9.0:
+  version "8.12.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1"
+  integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    json-schema-traverse "^1.0.0"
+    require-from-string "^2.0.2"
+    uri-js "^4.2.2"
+
 alphanum-sort@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
   integrity sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=
 
-amdefine@>=0.0.4:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
-  integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
-
-ansi-colors@^3.0.0:
-  version "3.2.4"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf"
-  integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==
-
-ansi-html-community@0.0.8:
+ansi-html-community@^0.0.8:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/ansi-html-community/-/ansi-html-community-0.0.8.tgz#69fbc4d6ccbe383f9736934ae34c3f8290f1bf41"
   integrity sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==
 
-ansi-regex@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
-  integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
-
 ansi-regex@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
-  integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
-
-ansi-regex@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
-  integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
-
-ansi-styles@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
-  integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.1.tgz#164daac87ab2d6f6db3a29875e2d1766582dabed"
+  integrity sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==
 
 ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   version "3.2.1"
@@ -1397,19 +1608,11 @@ anymatch@~3.1.2:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
-aproba@^1.0.3, aproba@^1.1.1:
+aproba@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
   integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
 
-are-we-there-yet@~1.1.2:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz#b15474a932adab4ff8a50d9adfa7e4e926f21146"
-  integrity sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==
-  dependencies:
-    delegates "^1.0.0"
-    readable-stream "^2.0.6"
-
 argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
@@ -1432,32 +1635,10 @@ arr-union@^3.1.0:
   resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
   integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
 
-array-find-index@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
-  integrity sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=
-
 array-flatten@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
-  integrity sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==
-
-array-flatten@^2.1.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099"
-  integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==
-
-array-union@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
-  integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=
-  dependencies:
-    array-uniq "^1.0.1"
-
-array-uniq@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
-  integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
+  integrity sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==
 
 array-unique@^0.3.2:
   version "0.3.2"
@@ -1474,18 +1655,6 @@ asn1.js@^5.2.0:
     minimalistic-assert "^1.0.0"
     safer-buffer "^2.1.0"
 
-asn1@~0.2.3:
-  version "0.2.6"
-  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.6.tgz#0d3a7bb6e64e02a90c0303b31f292868ea09a08d"
-  integrity sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==
-  dependencies:
-    safer-buffer "~2.1.0"
-
-assert-plus@1.0.0, assert-plus@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
-  integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
-
 assert@^1.1.1:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/assert/-/assert-1.5.0.tgz#55c109aaf6e0aefdb3dc4b71240c70bf574b18eb"
@@ -1504,28 +1673,6 @@ async-each@^1.0.1:
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf"
   integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==
 
-async-foreach@^0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542"
-  integrity sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=
-
-async-limiter@~1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd"
-  integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==
-
-async@^2.6.2:
-  version "2.6.4"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221"
-  integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==
-  dependencies:
-    lodash "^4.17.14"
-
-asynckit@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
-  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
-
 atob@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
@@ -1544,23 +1691,13 @@ autoprefixer@^9.6.1:
     postcss "^7.0.32"
     postcss-value-parser "^4.1.0"
 
-aws-sign2@~0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
-  integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
-
-aws4@^1.8.0:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59"
-  integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==
-
-babel-loader@^8.1.0:
-  version "8.2.3"
-  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.3.tgz#8986b40f1a64cacfcb4b8429320085ef68b1342d"
-  integrity sha512-n4Zeta8NC3QAsuyiizu0GkmRcQ6clkV9WFUnUf1iXP//IeSKbWjofW3UHyZVwlOB4y039YQKefawyTn64Zwbuw==
+babel-loader@^8.2.2:
+  version "8.3.0"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.3.0.tgz#124936e841ba4fe8176786d6ff28add1f134d6a8"
+  integrity sha512-H8SvsMF+m9t15HNLMipppzkC+Y2Yq+v3SonZyU70RBL/h1gxPkH08Ot8pEE9Z4Kd+czyWJClmFS8qzIP9OZ04Q==
   dependencies:
     find-cache-dir "^3.3.1"
-    loader-utils "^1.4.0"
+    loader-utils "^2.0.0"
     make-dir "^3.1.0"
     schema-utils "^2.6.5"
 
@@ -1580,29 +1717,29 @@ babel-plugin-macros@^2.8.0:
     cosmiconfig "^6.0.0"
     resolve "^1.12.0"
 
-babel-plugin-polyfill-corejs2@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.0.tgz#407082d0d355ba565af24126fb6cb8e9115251fd"
-  integrity sha512-wMDoBJ6uG4u4PNFh72Ty6t3EgfA91puCuAwKIazbQlci+ENb/UU9A3xG5lutjUIiXCIn1CY5L15r9LimiJyrSA==
+babel-plugin-polyfill-corejs2@^0.4.7:
+  version "0.4.8"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.8.tgz#dbcc3c8ca758a290d47c3c6a490d59429b0d2269"
+  integrity sha512-OtIuQfafSzpo/LhnJaykc0R/MMnuLSSVjVYy9mHArIZ9qTCSZ6TpWCuEKZYVoN//t8HqBNScHrOtCrIK5IaGLg==
   dependencies:
-    "@babel/compat-data" "^7.13.11"
-    "@babel/helper-define-polyfill-provider" "^0.3.0"
-    semver "^6.1.1"
+    "@babel/compat-data" "^7.22.6"
+    "@babel/helper-define-polyfill-provider" "^0.5.0"
+    semver "^6.3.1"
 
-babel-plugin-polyfill-corejs3@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.4.0.tgz#0b571f4cf3d67f911512f5c04842a7b8e8263087"
-  integrity sha512-YxFreYwUfglYKdLUGvIF2nJEsGwj+RhWSX/ije3D2vQPOXuyMLMtg/cCGMDpOA7Nd+MwlNdnGODbd2EwUZPlsw==
+babel-plugin-polyfill-corejs3@^0.8.7:
+  version "0.8.7"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.7.tgz#941855aa7fdaac06ed24c730a93450d2b2b76d04"
+  integrity sha512-KyDvZYxAzkC0Aj2dAPyDzi2Ym15e5JKZSK+maI7NAwSqofvuFglbSsxE7wUOvTg9oFVnHMzVzBKcqEb4PJgtOA==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.3.0"
-    core-js-compat "^3.18.0"
+    "@babel/helper-define-polyfill-provider" "^0.4.4"
+    core-js-compat "^3.33.1"
 
-babel-plugin-polyfill-regenerator@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.0.tgz#9ebbcd7186e1a33e21c5e20cae4e7983949533be"
-  integrity sha512-dhAPTDLGoMW5/84wkgwiLRwMnio2i1fUe53EuvtKMv0pn2p3S8OCoV1xAzfJPl0KOX7IB89s2ib85vbYiea3jg==
+babel-plugin-polyfill-regenerator@^0.5.4:
+  version "0.5.5"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.5.tgz#8b0c8fc6434239e5d7b8a9d1f832bb2b0310f06a"
+  integrity sha512-OJGYZlhLqBh2DDHeqAxWB1XIvr49CxiJ2gIt61/PU55CQK4Z58OzMqjDe1zwQdQk+rBYsRc+1rJmdajM3gimHg==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.3.0"
+    "@babel/helper-define-polyfill-provider" "^0.5.0"
 
 balanced-match@^1.0.0:
   version "1.0.2"
@@ -1632,13 +1769,6 @@ batch@0.6.1:
   resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
   integrity sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=
 
-bcrypt-pbkdf@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
-  integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
-  dependencies:
-    tweetnacl "^0.14.3"
-
 big.js@^5.2.2:
   version "5.2.2"
   resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
@@ -1661,13 +1791,6 @@ bindings@^1.5.0:
   dependencies:
     file-uri-to-path "1.0.0"
 
-block-stream@*:
-  version "0.0.9"
-  resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
-  integrity sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=
-  dependencies:
-    inherits "~2.0.0"
-
 bluebird@^3.5.5:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
@@ -1706,17 +1829,13 @@ body-parser@1.20.1:
     type-is "~1.6.18"
     unpipe "1.0.0"
 
-bonjour@^3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/bonjour/-/bonjour-3.5.0.tgz#8e890a183d8ee9a2393b3844c691a42bcf7bc9f5"
-  integrity sha1-jokKGD2O6aI5OzhExpGkK897yfU=
+bonjour-service@^1.0.11:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/bonjour-service/-/bonjour-service-1.2.1.tgz#eb41b3085183df3321da1264719fbada12478d02"
+  integrity sha512-oSzCS2zV14bh2kji6vNe7vrpJYCHGvcZnlffFQ1MEoX/WOeQ/teD8SYWKR942OI3INjq8OMNJlbPK5LLLUxFDw==
   dependencies:
-    array-flatten "^2.1.0"
-    deep-equal "^1.0.1"
-    dns-equal "^1.0.0"
-    dns-txt "^2.0.2"
-    multicast-dns "^6.0.1"
-    multicast-dns-service-types "^1.1.0"
+    fast-deep-equal "^3.1.3"
+    multicast-dns "^7.2.5"
 
 boolbase@^1.0.0, boolbase@~1.0.0:
   version "1.0.0"
@@ -1747,7 +1866,7 @@ braces@^2.3.1, braces@^2.3.2:
     split-string "^3.0.2"
     to-regex "^3.0.1"
 
-braces@~3.0.2:
+braces@^3.0.2, braces@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
   integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
@@ -1820,7 +1939,7 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
-browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.17.5, browserslist@^4.19.1, browserslist@^4.6.4:
+browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.6.4:
   version "4.19.1"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.19.1.tgz#4ac0435b35ab655896c31d53018b6dd5e9e4c9a3"
   integrity sha512-u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A==
@@ -1831,16 +1950,21 @@ browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.17.5, browserslist@^4
     node-releases "^2.0.1"
     picocolors "^1.0.0"
 
+browserslist@^4.22.2:
+  version "4.22.2"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.22.2.tgz#704c4943072bd81ea18997f3bd2180e89c77874b"
+  integrity sha512-0UgcrvQmBDvZHFGdYUehrCNIazki7/lUP3kkoi/r3YB2amZbFM9J43ZRkJTXBUZK4gmx56+Sqk9+Vs9mwZx9+A==
+  dependencies:
+    caniuse-lite "^1.0.30001565"
+    electron-to-chromium "^1.4.601"
+    node-releases "^2.0.14"
+    update-browserslist-db "^1.0.13"
+
 buffer-from@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
   integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
 
-buffer-indexof@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz#52fabcc6a606d1a00302802648ef68f639da268c"
-  integrity sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==
-
 buffer-xor@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
@@ -1962,19 +2086,6 @@ callsites@^3.0.0:
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
   integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
 
-camelcase-keys@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
-  integrity sha1-MIvur/3ygRkFHvodkyITyRuPkuc=
-  dependencies:
-    camelcase "^2.0.0"
-    map-obj "^1.0.0"
-
-camelcase@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
-  integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=
-
 camelcase@^5.0.0, camelcase@^5.3.1:
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
@@ -1995,27 +2106,16 @@ caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, can
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001287.tgz#5fab6a46ab9e47146d5dd35abfe47beaf8073c71"
   integrity sha512-4udbs9bc0hfNrcje++AxBuc6PfLNHwh3PO9kbwnfCQWyqtlzg3py0YgFu8jyRTTo85VAz4U+VLxSlID09vNtWA==
 
-case-sensitive-paths-webpack-plugin@^2.3.0:
+caniuse-lite@^1.0.30001565:
+  version "1.0.30001579"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001579.tgz#45c065216110f46d6274311a4b3fcf6278e0852a"
+  integrity sha512-u5AUVkixruKHJjw/pj9wISlcMpgFWzSrczLZbrqBSxukQixmg0SJ5sZTpvaFvxU0HoQKd4yoyAogyrAz9pzJnA==
+
+case-sensitive-paths-webpack-plugin@^2.4.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.4.0.tgz#db64066c6422eed2e08cc14b986ca43796dbc6d4"
   integrity sha512-roIFONhcxog0JSSWbvVAh3OocukmSgpqOH6YpMkCvav/ySIV3JKg4Dc8vYtQjYi/UxpNE36r/9v+VqTQqgkYmw==
 
-caseless@~0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
-  integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
-
-chalk@^1.1.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
-  integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
-  dependencies:
-    ansi-styles "^2.2.1"
-    escape-string-regexp "^1.0.2"
-    has-ansi "^2.0.0"
-    strip-ansi "^3.0.0"
-    supports-color "^2.0.0"
-
 chalk@^2.0, chalk@^2.0.0, chalk@^2.4.1, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
@@ -2025,6 +2125,21 @@ chalk@^2.0, chalk@^2.0.0, chalk@^2.4.1, chalk@^2.4.2:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
+"chokidar@>=3.0.0 <4.0.0", chokidar@^3.5.3:
+  version "3.5.3"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
+  integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
+  dependencies:
+    anymatch "~3.1.2"
+    braces "~3.0.2"
+    glob-parent "~5.1.2"
+    is-binary-path "~2.1.0"
+    is-glob "~4.0.1"
+    normalize-path "~3.0.0"
+    readdirp "~3.6.0"
+  optionalDependencies:
+    fsevents "~2.3.2"
+
 chokidar@^2.1.8:
   version "2.1.8"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917"
@@ -2106,15 +2221,6 @@ cliui@^5.0.0:
     strip-ansi "^5.2.0"
     wrap-ansi "^5.1.0"
 
-clone-deep@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"
-  integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==
-  dependencies:
-    is-plain-object "^2.0.4"
-    kind-of "^6.0.2"
-    shallow-clone "^3.0.0"
-
 coa@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/coa/-/coa-2.0.2.tgz#43f6c21151b4ef2bf57187db0d73de229e3e7ec3"
@@ -2124,11 +2230,6 @@ coa@^2.0.2:
     chalk "^2.4.1"
     q "^1.1.2"
 
-code-point-at@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
-  integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
-
 collection-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
@@ -2170,12 +2271,10 @@ color@^3.0.0:
     color-convert "^1.9.3"
     color-string "^1.6.0"
 
-combined-stream@^1.0.6, combined-stream@~1.0.6:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
-  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
-  dependencies:
-    delayed-stream "~1.0.0"
+colorette@^2.0.10:
+  version "2.0.20"
+  resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.20.tgz#9eb793e6833067f7235902fcd3b09917a000a95a"
+  integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==
 
 commander@^2.20.0:
   version "2.20.3"
@@ -2199,7 +2298,7 @@ compressible@~2.0.16:
   dependencies:
     mime-db ">= 1.43.0 < 2"
 
-compression-webpack-plugin@^4.0.0:
+compression-webpack-plugin@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/compression-webpack-plugin/-/compression-webpack-plugin-4.0.1.tgz#33eda97f1170dd38c5556771de10f34245aa0274"
   integrity sha512-0mg6PgwTsUe5LEcUrOu3ob32vraDx2VdbMGAT1PARcOV+UJWDYZFdkSo6RbHoGQ061mmmkC7XpRKOlvwm/gzJQ==
@@ -2238,21 +2337,16 @@ concat-stream@^1.5.0:
     readable-stream "^2.2.2"
     typedarray "^0.0.6"
 
-connect-history-api-fallback@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc"
-  integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==
+connect-history-api-fallback@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz#647264845251a0daf25b97ce87834cace0f5f1c8"
+  integrity sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==
 
 console-browserify@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336"
   integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==
 
-console-control-strings@^1.0.0, console-control-strings@~1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
-  integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
-
 constants-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
@@ -2270,12 +2364,10 @@ content-type@~1.0.4:
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
   integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
 
-convert-source-map@^1.7.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369"
-  integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==
-  dependencies:
-    safe-buffer "~5.1.1"
+convert-source-map@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a"
+  integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==
 
 cookie-signature@1.0.6:
   version "1.0.6"
@@ -2304,23 +2396,17 @@ copy-descriptor@^0.1.0:
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
-core-js-compat@^3.18.0, core-js-compat@^3.19.1:
-  version "3.20.0"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.20.0.tgz#fd704640c5a213816b6d10ec0192756111e2c9d1"
-  integrity sha512-relrah5h+sslXssTTOkvqcC/6RURifB0W5yhYBdBkaPYa5/2KBMiog3XiD+s3TwEHWxInWVv4Jx2/Lw0vng+IQ==
+core-js-compat@^3.31.0, core-js-compat@^3.33.1:
+  version "3.35.0"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.35.0.tgz#c149a3d1ab51e743bc1da61e39cb51f461a41873"
+  integrity sha512-5blwFAddknKeNgsjBzilkdQ0+YK8L1PfqPYq40NOYMYFSS38qj+hpTcLLWwpIwA2A5bje/x5jmVn2tzUMg9IVw==
   dependencies:
-    browserslist "^4.19.1"
-    semver "7.0.0"
-
-core-js@^3.6.5:
-  version "3.20.0"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.20.0.tgz#1c5ac07986b8d15473ab192e45a2e115a4a95b79"
-  integrity sha512-KjbKU7UEfg4YPpskMtMXPhUKn7m/1OdTHTVjy09ScR2LVaoUXe8Jh0UdvN2EKUR6iKTJph52SJP95mAB0MnVLQ==
+    browserslist "^4.22.2"
 
-core-util-is@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
-  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
+core-js@^3.16.2:
+  version "3.35.0"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.35.0.tgz#58e651688484f83c34196ca13f099574ee53d6b4"
+  integrity sha512-ntakECeqg81KqMueeGJ79Q5ZgQNR+6eaE8sxGCx62zMbAIj65q+uYvatToew3m6eAGdU4gNZwpZ34NMe4GYswg==
 
 core-util-is@~1.0.0:
   version "1.0.3"
@@ -2379,15 +2465,7 @@ create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
-cross-spawn@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982"
-  integrity sha1-ElYDfsufDF9549bvE14wdwGEuYI=
-  dependencies:
-    lru-cache "^4.0.1"
-    which "^1.2.9"
-
-cross-spawn@^6.0.0, cross-spawn@^6.0.5:
+cross-spawn@^6.0.5:
   version "6.0.5"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
   integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
@@ -2398,6 +2476,15 @@ cross-spawn@^6.0.0, cross-spawn@^6.0.5:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
+cross-spawn@^7.0.3:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
+  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
+  dependencies:
+    path-key "^3.1.0"
+    shebang-command "^2.0.0"
+    which "^2.0.1"
+
 crypto-browserify@^3.11.0:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
@@ -2443,7 +2530,7 @@ css-has-pseudo@^0.10.0:
     postcss "^7.0.6"
     postcss-selector-parser "^5.0.0-rc.4"
 
-css-loader@^3.5.3:
+css-loader@^3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-3.6.0.tgz#2e4b2c7e6e2d27f8c8f28f61bffcd2e6c91ef645"
   integrity sha512-M5lSukoWi1If8dhQAUCvj4H8vUt3vOnwbQBH9DdTm/s4Ym2B/3dPMtYZeJmq7Q3S3Pa+I94DcZ7pc9bP14cWIQ==
@@ -2595,25 +2682,11 @@ csso@^4.0.2:
   dependencies:
     css-tree "^1.1.2"
 
-currently-unhandled@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
-  integrity sha1-mI3zP+qxke95mmE2nddsF635V+o=
-  dependencies:
-    array-find-index "^1.0.1"
-
 cyclist@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9"
   integrity sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=
 
-dashdash@^1.12.0:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
-  integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=
-  dependencies:
-    assert-plus "^1.0.0"
-
 debug@2.6.9, debug@^2.2.0, debug@^2.3.3:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
@@ -2621,13 +2694,6 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3:
   dependencies:
     ms "2.0.0"
 
-debug@^3.1.1, debug@^3.2.6:
-  version "3.2.7"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
-  integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
-  dependencies:
-    ms "^2.1.1"
-
 debug@^4.1.0, debug@^4.1.1:
   version "4.3.3"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664"
@@ -2635,7 +2701,14 @@ debug@^4.1.0, debug@^4.1.1:
   dependencies:
     ms "2.1.2"
 
-decamelize@^1.1.2, decamelize@^1.2.0:
+debug@^4.3.1:
+  version "4.3.4"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
+  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
+  dependencies:
+    ms "2.1.2"
+
+decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
@@ -2645,25 +2718,17 @@ decode-uri-component@^0.2.0:
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9"
   integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==
 
-deep-equal@^1.0.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a"
-  integrity sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==
+default-gateway@^6.0.3:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-6.0.3.tgz#819494c888053bdb743edbf343d6cdf7f2943a71"
+  integrity sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==
   dependencies:
-    is-arguments "^1.0.4"
-    is-date-object "^1.0.1"
-    is-regex "^1.0.4"
-    object-is "^1.0.1"
-    object-keys "^1.1.1"
-    regexp.prototype.flags "^1.2.0"
+    execa "^5.0.0"
 
-default-gateway@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-4.2.0.tgz#167104c7500c2115f6dd69b0a536bb8ed720552b"
-  integrity sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==
-  dependencies:
-    execa "^1.0.0"
-    ip-regex "^2.1.0"
+define-lazy-prop@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f"
+  integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==
 
 define-properties@^1.1.3:
   version "1.1.3"
@@ -2694,29 +2759,6 @@ define-property@^2.0.2:
     is-descriptor "^1.0.2"
     isobject "^3.0.1"
 
-del@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/del/-/del-4.1.1.tgz#9e8f117222ea44a31ff3a156c049b99052a9f0b4"
-  integrity sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==
-  dependencies:
-    "@types/glob" "^7.1.1"
-    globby "^6.1.0"
-    is-path-cwd "^2.0.0"
-    is-path-in-cwd "^2.0.0"
-    p-map "^2.0.0"
-    pify "^4.0.1"
-    rimraf "^2.6.3"
-
-delayed-stream@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
-  integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
-
-delegates@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
-  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
-
 depd@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
@@ -2759,25 +2801,12 @@ diffie-hellman@^5.0.0:
     miller-rabin "^4.0.0"
     randombytes "^2.0.0"
 
-dns-equal@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d"
-  integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0=
-
-dns-packet@^1.3.1:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.4.tgz#e3455065824a2507ba886c55a89963bb107dec6f"
-  integrity sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA==
+dns-packet@^5.2.2:
+  version "5.6.1"
+  resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-5.6.1.tgz#ae888ad425a9d1478a0674256ab866de1012cf2f"
+  integrity sha512-l4gcSouhcgIKRvyy99RNVOgxXiicE+2jZoNmaNmZ6JXiGajBOJAesk1OBlJuM5k2c+eudGdLxDqXuPCKIj6kpw==
   dependencies:
-    ip "^1.1.0"
-    safe-buffer "^5.0.1"
-
-dns-txt@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/dns-txt/-/dns-txt-2.0.2.tgz#b91d806f5d27188e4ab3e7d107d881a1cc4642b6"
-  integrity sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=
-  dependencies:
-    buffer-indexof "^1.0.0"
+    "@leichtgewicht/ip-codec" "^2.0.1"
 
 dom-serializer@0:
   version "0.2.2"
@@ -2827,14 +2856,6 @@ duplexify@^3.4.2, duplexify@^3.6.0:
     readable-stream "^2.0.0"
     stream-shift "^1.0.0"
 
-ecc-jsbn@~0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
-  integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=
-  dependencies:
-    jsbn "~0.1.0"
-    safer-buffer "^2.1.0"
-
 ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
@@ -2845,6 +2866,11 @@ electron-to-chromium@^1.4.17:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.20.tgz#8fbf9677ccac19b4249c0a6204e0943d9d66ce30"
   integrity sha512-N7ZVNrdzX8NE90OXEFBMsBf3fp8P/vVDUER3WCUZjzC7OkNTXHVoF6W9qVhq8+dA8tGnbDajzUpj2ISNVVyj+Q==
 
+electron-to-chromium@^1.4.601:
+  version "1.4.638"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.638.tgz#5564b750c2ceb64c0d2ef5a22b0748f63b66e0a3"
+  integrity sha512-gpmbAG2LbfPKcDaL5m9IKutKjUx4ZRkvGNkgL/8nKqxkXsBVYykVULboWlqCrHsh3razucgDJDuKoWJmGPdItA==
+
 elliptic@^6.5.3, elliptic@^6.5.4:
   version "6.5.4"
   resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb"
@@ -2863,11 +2889,6 @@ emoji-regex@^7.0.1:
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
   integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
 
-emoji-regex@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
-  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
-
 emojis-list@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
@@ -2906,7 +2927,7 @@ errno@^0.1.3, errno@~0.1.7:
   dependencies:
     prr "~1.0.1"
 
-error-ex@^1.2.0, error-ex@^1.3.1:
+error-ex@^1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
   integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
@@ -2958,7 +2979,7 @@ escape-html@~1.0.3:
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
   integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==
 
-escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
+escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
@@ -3013,13 +3034,6 @@ events@^3.0.0:
   resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
   integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
 
-eventsource@^1.0.7:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.1.1.tgz#4544a35a57d7120fba4fa4c86cb4023b2c09df2f"
-  integrity sha512-qV5ZC0h7jYIAOhArFJgSfdyz6rALJyb270714o7ZtNnw2WSJ+eexhKtE0O8LYPRsHZHf2osHKZBxGPvm3kPkCA==
-  dependencies:
-    original "^1.0.0"
-
 evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02"
@@ -3028,18 +3042,20 @@ evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
     md5.js "^1.3.4"
     safe-buffer "^5.1.1"
 
-execa@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
-  integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==
+execa@^5.0.0:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"
+  integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==
   dependencies:
-    cross-spawn "^6.0.0"
-    get-stream "^4.0.0"
-    is-stream "^1.1.0"
-    npm-run-path "^2.0.0"
-    p-finally "^1.0.0"
-    signal-exit "^3.0.0"
-    strip-eof "^1.0.0"
+    cross-spawn "^7.0.3"
+    get-stream "^6.0.0"
+    human-signals "^2.1.0"
+    is-stream "^2.0.0"
+    merge-stream "^2.0.0"
+    npm-run-path "^4.0.1"
+    onetime "^5.1.2"
+    signal-exit "^3.0.3"
+    strip-final-newline "^2.0.0"
 
 expand-brackets@^2.1.4:
   version "2.1.4"
@@ -3061,7 +3077,7 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2:
   dependencies:
     homedir-polyfill "^1.0.1"
 
-express@^4.17.1:
+express@^4.17.3:
   version "4.18.2"
   resolved "https://registry.yarnpkg.com/express/-/express-4.18.2.tgz#3fabe08296e930c796c19e3c516979386ba9fd59"
   integrity sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==
@@ -3113,11 +3129,6 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
 
-extend@~3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
-  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
-
 extglob@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
@@ -3132,17 +3143,7 @@ extglob@^2.0.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-extsprintf@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
-  integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
-
-extsprintf@^1.2.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.1.tgz#8d172c064867f235c0c84a596806d279bf4bcc07"
-  integrity sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA==
-
-fast-deep-equal@^3.1.1:
+fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
@@ -3164,7 +3165,7 @@ figgy-pudding@^3.5.1:
   resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e"
   integrity sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==
 
-file-loader@^6.0.0:
+file-loader@^6.2.0:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-6.2.0.tgz#baef7cf8e1840df325e4390b4484879480eebe4d"
   integrity sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==
@@ -3225,14 +3226,6 @@ find-cache-dir@^3.3.1:
     make-dir "^3.0.2"
     pkg-dir "^4.1.0"
 
-find-up@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
-  integrity sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=
-  dependencies:
-    path-exists "^2.0.0"
-    pinkie-promise "^2.0.0"
-
 find-up@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
@@ -3258,10 +3251,10 @@ findup-sync@^3.0.0:
     micromatch "^3.0.4"
     resolve-dir "^1.0.1"
 
-flatted@^3.0.4:
-  version "3.2.4"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.4.tgz#28d9969ea90661b5134259f312ab6aa7929ac5e2"
-  integrity sha512-8/sOawo8tJ4QOBX8YlQBMxL8+RLZfxMQOif9o0KUKTNTjMYElWPE0r/m5VNFxTRd0NSw8qSy8dajrwX4RYI1Hw==
+flatted@^3.2.2:
+  version "3.2.9"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.9.tgz#7eb4c67ca1ba34232ca9d2d93e9886e611ad7daf"
+  integrity sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==
 
 flatten@^1.0.2:
   version "1.0.3"
@@ -3286,20 +3279,6 @@ for-in@^1.0.2:
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
   integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
 
-forever-agent@~0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
-  integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
-
-form-data@~2.3.2:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
-  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.6"
-    mime-types "^2.1.12"
-
 forwarded@0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811"
@@ -3332,6 +3311,11 @@ fs-minipass@^2.0.0:
   dependencies:
     minipass "^3.0.0"
 
+fs-monkey@^1.0.4:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.5.tgz#fe450175f0db0d7ea758102e1d84096acb925788"
+  integrity sha512-8uMbBjrhzW76TYgEV27Y5E//W2f/lTFmx78P2w19FZSxarhI/798APGQyuGCwmkNxgwGRhrLfvWyLBvNtuOmew==
+
 fs-write-stream-atomic@^1.0.8:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
@@ -3360,42 +3344,11 @@ fsevents@~2.3.2:
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
   integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
 
-fstream@^1.0.0, fstream@^1.0.12:
-  version "1.0.12"
-  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045"
-  integrity sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==
-  dependencies:
-    graceful-fs "^4.1.2"
-    inherits "~2.0.0"
-    mkdirp ">=0.5 0"
-    rimraf "2"
-
 function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
-gauge@~2.7.3:
-  version "2.7.4"
-  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
-  integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=
-  dependencies:
-    aproba "^1.0.3"
-    console-control-strings "^1.0.0"
-    has-unicode "^2.0.0"
-    object-assign "^4.1.0"
-    signal-exit "^3.0.0"
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
-    wide-align "^1.1.0"
-
-gaze@^1.0.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.3.tgz#c441733e13b927ac8c0ff0b4c3b033f28812924a"
-  integrity sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==
-  dependencies:
-    globule "^1.0.0"
-
 gensync@^1.0.0-beta.2:
   version "1.0.0-beta.2"
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
@@ -3424,17 +3377,10 @@ get-intrinsic@^1.1.0, get-intrinsic@^1.1.1:
     has "^1.0.3"
     has-symbols "^1.0.1"
 
-get-stdin@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
-  integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=
-
-get-stream@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
-  integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
-  dependencies:
-    pump "^3.0.0"
+get-stream@^6.0.0:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
+  integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
 
 get-symbol-description@^1.0.0:
   version "1.0.0"
@@ -3449,13 +3395,6 @@ get-value@^2.0.3, get-value@^2.0.6:
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
   integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
 
-getpass@^0.1.1:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
-  integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=
-  dependencies:
-    assert-plus "^1.0.0"
-
 glob-parent@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
@@ -3471,7 +3410,7 @@ glob-parent@~5.1.2:
   dependencies:
     is-glob "^4.0.1"
 
-glob@^7.0.0, glob@^7.0.3, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
+glob@^7.1.3, glob@^7.1.4:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
   integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
@@ -3483,15 +3422,15 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@~7.1.1:
-  version "7.1.7"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90"
-  integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==
+glob@^7.1.7:
+  version "7.2.3"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
+  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
     inherits "2"
-    minimatch "^3.0.4"
+    minimatch "^3.1.1"
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
@@ -3536,56 +3475,21 @@ globals@^11.1.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
-globby@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
-  integrity sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=
-  dependencies:
-    array-union "^1.0.1"
-    glob "^7.0.3"
-    object-assign "^4.0.1"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-
-globule@^1.0.0:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/globule/-/globule-1.3.3.tgz#811919eeac1ab7344e905f2e3be80a13447973c2"
-  integrity sha512-mb1aYtDbIjTu4ShMB85m3UzjX9BVKe9WCzsnfMSZk+K5GpIbBOexgg4PPCt5eHDEG5/ZQAUX2Kct02zfiPLsKg==
-  dependencies:
-    glob "~7.1.1"
-    lodash "~4.17.10"
-    minimatch "~3.0.2"
-
 graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2:
   version "4.2.8"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a"
   integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==
 
+graceful-fs@^4.2.6:
+  version "4.2.11"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
+  integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
+
 handle-thing@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e"
   integrity sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==
 
-har-schema@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
-  integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
-
-har-validator@~5.1.3:
-  version "5.1.5"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"
-  integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==
-  dependencies:
-    ajv "^6.12.3"
-    har-schema "^2.0.0"
-
-has-ansi@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
-  integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=
-  dependencies:
-    ansi-regex "^2.0.0"
-
 has-bigints@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113"
@@ -3618,11 +3522,6 @@ has-tostringtag@^1.0.0:
   dependencies:
     has-symbols "^1.0.2"
 
-has-unicode@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
-  integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
-
 has-value@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
@@ -3699,11 +3598,6 @@ homedir-polyfill@^1.0.1:
   dependencies:
     parse-passwd "^1.0.0"
 
-hosted-git-info@^2.1.4:
-  version "2.8.9"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
-  integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
-
 hpack.js@^2.1.6:
   version "2.1.6"
   resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2"
@@ -3724,10 +3618,10 @@ hsla-regex@^1.0.0:
   resolved "https://registry.yarnpkg.com/hsla-regex/-/hsla-regex-1.0.0.tgz#c1ce7a3168c8c6614033a4b5f7877f3b225f9c38"
   integrity sha1-wc56MWjIxmFAM6S194d/OyJfnDg=
 
-html-entities@^1.3.1:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.4.0.tgz#cfbd1b01d2afaf9adca1b10ae7dffab98c71d2dc"
-  integrity sha512-8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA==
+html-entities@^2.3.2:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.4.0.tgz#edd0cee70402584c8c76cc2c0556db09d1f45061"
+  integrity sha512-igBTJcNNNhvZFRtm8uA6xMY6xYleeDwn3PeBCkDz7tHttv4F2hsDI2aPgNERWzvRcNYHNT3ymRaQzllmXj4YsQ==
 
 http-deceiver@^1.2.7:
   version "1.2.7"
@@ -3760,17 +3654,18 @@ http-parser-js@>=0.5.1:
   resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.5.tgz#d7c30d5d3c90d865b4a2e870181f9d6f22ac7ac5"
   integrity sha512-x+JVEkO2PoM8qqpbPbOL3cqHPwerep7OwzK7Ay+sMQjKzaKCqWvjoXm5tqMP9tXWWTnTzAjIhXg+J99XYuPhPA==
 
-http-proxy-middleware@0.19.1:
-  version "0.19.1"
-  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz#183c7dc4aa1479150306498c210cdaf96080a43a"
-  integrity sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==
+http-proxy-middleware@^2.0.3:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz#e1a4dd6979572c7ab5a4e4b55095d1f32a74963f"
+  integrity sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==
   dependencies:
-    http-proxy "^1.17.0"
-    is-glob "^4.0.0"
-    lodash "^4.17.11"
-    micromatch "^3.1.10"
+    "@types/http-proxy" "^1.17.8"
+    http-proxy "^1.18.1"
+    is-glob "^4.0.1"
+    is-plain-obj "^3.0.0"
+    micromatch "^4.0.2"
 
-http-proxy@^1.17.0:
+http-proxy@^1.18.1:
   version "1.18.1"
   resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549"
   integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==
@@ -3779,20 +3674,16 @@ http-proxy@^1.17.0:
     follow-redirects "^1.0.0"
     requires-port "^1.0.0"
 
-http-signature@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
-  integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=
-  dependencies:
-    assert-plus "^1.0.0"
-    jsprim "^1.2.2"
-    sshpk "^1.7.0"
-
 https-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
   integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
 
+human-signals@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
+  integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
+
 iconv-lite@0.4.24:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
@@ -3817,6 +3708,11 @@ iferr@^0.1.5:
   resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
   integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
 
+immutable@^4.0.0:
+  version "4.3.4"
+  resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.3.4.tgz#2e07b33837b4bb7662f288c244d1ced1ef65a78f"
+  integrity sha512-fsXeu4J4i6WNWSikpI88v/PcVflZz+6kMhUfIwc5SY+poQRPnaf5V7qds6SUyUN3cVxEzuCab7QIoLOQ+DQ1wA==
+
 import-cwd@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-2.1.0.tgz#aa6cf36e722761285cb371ec6519f53e2435b0a9"
@@ -3860,18 +3756,6 @@ imurmurhash@^0.1.4:
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
   integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
 
-in-publish@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.1.tgz#948b1a535c8030561cea522f73f78f4be357e00c"
-  integrity sha512-oDM0kUSNFC31ShNxHKUyfZKy8ZeXZBWMjMdZHKLOk13uvT27VTL/QzRGfRUcevJhpkZAvlhPYuXkF7eNWrtyxQ==
-
-indent-string@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
-  integrity sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=
-  dependencies:
-    repeating "^2.0.0"
-
 indent-string@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
@@ -3895,7 +3779,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
+inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -3915,14 +3799,6 @@ ini@^1.3.4, ini@^1.3.5:
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
   integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
 
-internal-ip@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.3.0.tgz#845452baad9d2ca3b69c635a137acb9a0dad0907"
-  integrity sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==
-  dependencies:
-    default-gateway "^4.2.0"
-    ipaddr.js "^1.9.0"
-
 internal-slot@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c"
@@ -3937,31 +3813,21 @@ interpret@^1.4.0:
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e"
   integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==
 
-ip-regex@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
-  integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=
-
-ip@^1.1.0, ip@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
-  integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=
-
-ipaddr.js@1.9.1, ipaddr.js@^1.9.0:
+ipaddr.js@1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
   integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==
 
+ipaddr.js@^2.0.1:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.1.0.tgz#2119bc447ff8c257753b196fc5f1ce08a4cdf39f"
+  integrity sha512-LlbxQ7xKzfBusov6UMi4MFpEg0m+mAm9xyNGEduwXMEDuf4WfzB/RZwMVYEd7IKGvh4IUkEXYxtAVu9T3OelJQ==
+
 is-absolute-url@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"
   integrity sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=
 
-is-absolute-url@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-3.0.3.tgz#96c6a22b6a23929b11ea0afb1836c36ad4a5d698"
-  integrity sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==
-
 is-accessor-descriptor@^0.1.6:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
@@ -3976,14 +3842,6 @@ is-accessor-descriptor@^1.0.0:
   dependencies:
     kind-of "^6.0.0"
 
-is-arguments@^1.0.4:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b"
-  integrity sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==
-  dependencies:
-    call-bind "^1.0.2"
-    has-tostringtag "^1.0.0"
-
 is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
@@ -4096,6 +3954,11 @@ is-directory@^0.3.1:
   resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
   integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=
 
+is-docker@^2.0.0, is-docker@^2.1.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa"
+  integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==
+
 is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
@@ -4113,28 +3976,11 @@ is-extglob@^2.1.0, is-extglob@^2.1.1:
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
   integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
 
-is-finite@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.1.0.tgz#904135c77fb42c0641d6aa1bcdbc4daa8da082f3"
-  integrity sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==
-
-is-fullwidth-code-point@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
-  integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
-  dependencies:
-    number-is-nan "^1.0.0"
-
 is-fullwidth-code-point@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
   integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
 
-is-fullwidth-code-point@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
-  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
-
 is-glob@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
@@ -4178,30 +4024,16 @@ is-obj@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982"
   integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==
 
-is-path-cwd@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz#67d43b82664a7b5191fd9119127eb300048a9fdb"
-  integrity sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==
-
-is-path-in-cwd@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz#bfe2dca26c69f397265a4009963602935a053acb"
-  integrity sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==
-  dependencies:
-    is-path-inside "^2.1.0"
-
-is-path-inside@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-2.1.0.tgz#7c9810587d659a40d27bcdb4d5616eab059494b2"
-  integrity sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==
-  dependencies:
-    path-is-inside "^1.0.2"
-
 is-plain-obj@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
   integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
 
+is-plain-obj@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-3.0.0.tgz#af6f2ea14ac5a646183a5bbdb5baabbc156ad9d7"
+  integrity sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==
+
 is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
@@ -4209,7 +4041,7 @@ is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   dependencies:
     isobject "^3.0.1"
 
-is-regex@^1.0.4, is-regex@^1.1.4:
+is-regex@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958"
   integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==
@@ -4227,10 +4059,10 @@ is-shared-array-buffer@^1.0.1:
   resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz#97b0c85fbdacb59c9c446fe653b82cf2b5b7cfe6"
   integrity sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==
 
-is-stream@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
-  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
+is-stream@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
+  integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==
 
 is-string@^1.0.5, is-string@^1.0.7:
   version "1.0.7"
@@ -4246,16 +4078,6 @@ is-symbol@^1.0.2, is-symbol@^1.0.3:
   dependencies:
     has-symbols "^1.0.2"
 
-is-typedarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
-  integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
-
-is-utf8@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
-  integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
-
 is-weakref@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2"
@@ -4273,6 +4095,13 @@ is-wsl@^1.1.0:
   resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
   integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=
 
+is-wsl@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
+  integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==
+  dependencies:
+    is-docker "^2.0.0"
+
 isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
@@ -4295,11 +4124,6 @@ isobject@^3.0.0, isobject@^3.0.1:
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
   integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
 
-isstream@~0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
-  integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
-
 jest-worker@^26.5.0:
   version "26.6.2"
   resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed"
@@ -4309,17 +4133,12 @@ jest-worker@^26.5.0:
     merge-stream "^2.0.0"
     supports-color "^7.0.0"
 
-js-base64@^2.1.8:
-  version "2.6.4"
-  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.6.4.tgz#f4e686c5de1ea1f867dbcad3d46d969428df98c4"
-  integrity sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==
-
 js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
-js-yaml@^3.13.1, js-yaml@^3.14.0:
+js-yaml@^3.13.1, js-yaml@^3.14.1:
   version "3.14.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
   integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
@@ -4327,11 +4146,6 @@ js-yaml@^3.13.1, js-yaml@^3.14.0:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
-jsbn@~0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
-  integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
-
 jsesc@^2.5.1:
   version "2.5.2"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
@@ -4357,20 +4171,10 @@ json-schema-traverse@^0.4.1:
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
   integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
 
-json-schema@0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.4.0.tgz#f7de4cf6efab838ebaeb3236474cbba5a1930ab5"
-  integrity sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==
-
-json-stringify-safe@~5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
-  integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
-
-json3@^3.3.3:
-  version "3.3.3"
-  resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.3.tgz#7fc10e375fc5ae42c4705a5cc0aa6f62be305b81"
-  integrity sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==
+json-schema-traverse@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"
+  integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
 
 json5@^1.0.1:
   version "1.0.2"
@@ -4379,27 +4183,10 @@ json5@^1.0.1:
   dependencies:
     minimist "^1.2.0"
 
-json5@^2.1.2:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3"
-  integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==
-  dependencies:
-    minimist "^1.2.5"
-
-jsprim@^1.2.2:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.2.tgz#712c65533a15c878ba59e9ed5f0e26d5b77c5feb"
-  integrity sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==
-  dependencies:
-    assert-plus "1.0.0"
-    extsprintf "1.3.0"
-    json-schema "0.4.0"
-    verror "1.10.0"
-
-killable@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
-  integrity sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==
+json5@^2.1.2, json5@^2.2.3:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
+  integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
 
 kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
   version "3.2.2"
@@ -4425,6 +4212,11 @@ kind-of@^6.0.0, kind-of@^6.0.2:
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
 
+klona@^2.0.4:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.6.tgz#85bffbf819c03b2f53270412420a4555ef882e22"
+  integrity sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==
+
 last-call-webpack-plugin@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/last-call-webpack-plugin/-/last-call-webpack-plugin-3.0.0.tgz#9742df0e10e3cf46e5c0381c2de90d3a7a2d7555"
@@ -4433,22 +4225,19 @@ last-call-webpack-plugin@^3.0.0:
     lodash "^4.17.5"
     webpack-sources "^1.1.0"
 
+launch-editor@^2.6.0:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/launch-editor/-/launch-editor-2.6.1.tgz#f259c9ef95cbc9425620bbbd14b468fcdb4ffe3c"
+  integrity sha512-eB/uXmFVpY4zezmGp5XtU21kwo7GBbKB+EQ+UZeWtGb9yAM5xt/Evk+lYH3eRNAtId+ej4u7TYPFZ07w4s7rRw==
+  dependencies:
+    picocolors "^1.0.0"
+    shell-quote "^1.8.1"
+
 lines-and-columns@^1.1.6:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
   integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
 
-load-json-file@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
-  integrity sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=
-  dependencies:
-    graceful-fs "^4.1.2"
-    parse-json "^2.2.0"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-    strip-bom "^2.0.0"
-
 loader-runner@^2.4.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357"
@@ -4464,9 +4253,9 @@ loader-utils@^1.1.0, loader-utils@^1.2.3, loader-utils@^1.4.0:
     json5 "^1.0.1"
 
 loader-utils@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.2.tgz#d6e3b4fb81870721ae4e0868ab11dd638368c129"
-  integrity sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.4.tgz#8b5cb38b5c34a9a018ee1fc0e6a066d1dfcc528c"
+  integrity sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==
   dependencies:
     big.js "^5.2.2"
     emojis-list "^3.0.0"
@@ -4512,32 +4301,11 @@ lodash.uniq@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
   integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
 
-lodash@^4.0.0, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.5, lodash@~4.17.10:
+lodash@^4.17.5:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
-loglevel@^1.6.8:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.8.0.tgz#e7ec73a57e1e7b419cb6c6ac06bf050b67356114"
-  integrity sha512-G6A/nJLRgWOuuwdNuA6koovfEV1YpqqAG4pRUlFaz3jj2QNZ8M4vBqnVA+HBTmU/AMNUtlOsMmSpF6NyOjztbA==
-
-loud-rejection@^1.0.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
-  integrity sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=
-  dependencies:
-    currently-unhandled "^0.4.1"
-    signal-exit "^3.0.0"
-
-lru-cache@^4.0.1:
-  version "4.1.5"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
-  integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
-  dependencies:
-    pseudomap "^1.0.2"
-    yallist "^2.1.2"
-
 lru-cache@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
@@ -4572,11 +4340,6 @@ map-cache@^0.2.2:
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
   integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
 
-map-obj@^1.0.0, map-obj@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
-  integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=
-
 map-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
@@ -4608,6 +4371,13 @@ media-typer@0.3.0:
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
   integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==
 
+memfs@^3.4.3:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.6.0.tgz#d7a2110f86f79dd950a8b6df6d57bc984aa185f6"
+  integrity sha512-EGowvkkgbMcIChjMTMkESFDbZeSh8xZ7kNSF0hAiAN4Jh6jgHCRS0Ga/+C8y6Au+oqpezRHCfPsmJ2+DwAgiwQ==
+  dependencies:
+    fs-monkey "^1.0.4"
+
 memory-fs@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
@@ -4624,22 +4394,6 @@ memory-fs@^0.5.0:
     errno "^0.1.3"
     readable-stream "^2.0.1"
 
-meow@^3.7.0:
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
-  integrity sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=
-  dependencies:
-    camelcase-keys "^2.0.0"
-    decamelize "^1.1.2"
-    loud-rejection "^1.0.0"
-    map-obj "^1.0.1"
-    minimist "^1.1.3"
-    normalize-package-data "^2.3.4"
-    object-assign "^4.0.1"
-    read-pkg-up "^1.0.1"
-    redent "^1.0.0"
-    trim-newlines "^1.0.0"
-
 merge-descriptors@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
@@ -4674,6 +4428,14 @@ micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.2"
 
+micromatch@^4.0.2:
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
+  integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
+  dependencies:
+    braces "^3.0.2"
+    picomatch "^2.3.1"
+
 miller-rabin@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
@@ -4692,29 +4454,29 @@ mime-db@1.52.0:
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
   integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
 
-mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.19:
-  version "2.1.34"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24"
-  integrity sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==
-  dependencies:
-    mime-db "1.51.0"
-
-mime-types@~2.1.24, mime-types@~2.1.34:
+mime-types@^2.1.31, mime-types@~2.1.24, mime-types@~2.1.34:
   version "2.1.35"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
   integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
   dependencies:
     mime-db "1.52.0"
 
+mime-types@~2.1.17:
+  version "2.1.34"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24"
+  integrity sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==
+  dependencies:
+    mime-db "1.51.0"
+
 mime@1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
   integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
 
-mime@^2.4.4:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367"
-  integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==
+mimic-fn@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
+  integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
 
 mini-css-extract-plugin@^0.9.0:
   version "0.9.0"
@@ -4736,14 +4498,21 @@ minimalistic-crypto-utils@^1.0.1:
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
   integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
 
-minimatch@^3.0.4, minimatch@~3.0.2:
+minimatch@^3.0.4:
   version "3.0.8"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.8.tgz#5e6a59bd11e2ab0de1cfb843eb2d82e546c321c1"
   integrity sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==
   dependencies:
     brace-expansion "^1.1.7"
 
-minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.5:
+minimatch@^3.1.1:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
+  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
+  dependencies:
+    brace-expansion "^1.1.7"
+
+minimist@^1.2.0, minimist@^1.2.5:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18"
   integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==
@@ -4808,7 +4577,7 @@ mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
-"mkdirp@>=0.5 0", mkdirp@^0.5, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5, mkdirp@~0.5.1:
+mkdirp@^0.5, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@~0.5.1:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
   integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
@@ -4842,25 +4611,20 @@ ms@2.1.2:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-ms@2.1.3, ms@^2.1.1:
+ms@2.1.3:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
 
-multicast-dns-service-types@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz#899f11d9686e5e05cb91b35d5f0e63b773cfc901"
-  integrity sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=
-
-multicast-dns@^6.0.1:
-  version "6.2.3"
-  resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-6.2.3.tgz#a0ec7bd9055c4282f790c3c82f4e28db3b31b229"
-  integrity sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==
+multicast-dns@^7.2.5:
+  version "7.2.5"
+  resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-7.2.5.tgz#77eb46057f4d7adbd16d9290fa7299f6fa64cced"
+  integrity sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==
   dependencies:
-    dns-packet "^1.3.1"
+    dns-packet "^5.2.2"
     thunky "^1.0.2"
 
-nan@^2.12.1, nan@^2.13.2:
+nan@^2.12.1:
   version "2.15.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee"
   integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==
@@ -4887,7 +4651,7 @@ negotiator@0.6.3:
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
   integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
 
-neo-async@^2.5.0, neo-async@^2.6.1:
+neo-async@^2.5.0, neo-async@^2.6.1, neo-async@^2.6.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
   integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
@@ -4897,28 +4661,10 @@ nice-try@^1.0.4:
   resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
   integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
 
-node-forge@^0.10.0:
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3"
-  integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==
-
-node-gyp@^3.8.0:
-  version "3.8.0"
-  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c"
-  integrity sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==
-  dependencies:
-    fstream "^1.0.0"
-    glob "^7.0.3"
-    graceful-fs "^4.1.2"
-    mkdirp "^0.5.0"
-    nopt "2 || 3"
-    npmlog "0 || 1 || 2 || 3 || 4"
-    osenv "0"
-    request "^2.87.0"
-    rimraf "2"
-    semver "~5.3.0"
-    tar "^2.0.0"
-    which "1"
+node-forge@^1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3"
+  integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==
 
 node-libs-browser@^2.2.1:
   version "2.2.1"
@@ -4954,45 +4700,10 @@ node-releases@^2.0.1:
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.1.tgz#3d1d395f204f1f2f29a54358b9fb678765ad2fc5"
   integrity sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==
 
-node-sass@^4.14.1:
-  version "4.14.1"
-  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.14.1.tgz#99c87ec2efb7047ed638fb4c9db7f3a42e2217b5"
-  integrity sha512-sjCuOlvGyCJS40R8BscF5vhVlQjNN069NtQ1gSxyK1u9iqvn6tf7O1R4GNowVZfiZUCRt5MmMs1xd+4V/7Yr0g==
-  dependencies:
-    async-foreach "^0.1.3"
-    chalk "^1.1.1"
-    cross-spawn "^3.0.0"
-    gaze "^1.0.0"
-    get-stdin "^4.0.1"
-    glob "^7.0.3"
-    in-publish "^2.0.0"
-    lodash "^4.17.15"
-    meow "^3.7.0"
-    mkdirp "^0.5.1"
-    nan "^2.13.2"
-    node-gyp "^3.8.0"
-    npmlog "^4.0.0"
-    request "^2.88.0"
-    sass-graph "2.2.5"
-    stdout-stream "^1.4.0"
-    "true-case-path" "^1.0.2"
-
-"nopt@2 || 3":
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
-  integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k=
-  dependencies:
-    abbrev "1"
-
-normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
-  integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
-  dependencies:
-    hosted-git-info "^2.1.4"
-    resolve "^1.10.0"
-    semver "2 || 3 || 4 || 5"
-    validate-npm-package-license "^3.0.1"
+node-releases@^2.0.14:
+  version "2.0.14"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.14.tgz#2ffb053bceb8b2be8495ece1ab6ce600c4461b0b"
+  integrity sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==
 
 normalize-path@^2.1.1:
   version "2.1.1"
@@ -5026,22 +4737,12 @@ normalize-url@^3.0.0:
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559"
   integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==
 
-npm-run-path@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
-  integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=
-  dependencies:
-    path-key "^2.0.0"
-
-"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
-  integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
+npm-run-path@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
+  integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==
   dependencies:
-    are-we-there-yet "~1.1.2"
-    console-control-strings "~1.1.0"
-    gauge "~2.7.3"
-    set-blocking "~2.0.0"
+    path-key "^3.0.0"
 
 nth-check@^1.0.2:
   version "1.0.2"
@@ -5055,16 +4756,6 @@ num2fraction@^1.2.2:
   resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
   integrity sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=
 
-number-is-nan@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
-  integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
-
-oauth-sign@~0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
-  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
-
 object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
@@ -5089,14 +4780,6 @@ object-inspect@^1.9.0:
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.2.tgz#c0641f26394532f28ab8d796ab954e43c009a8ea"
   integrity sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==
 
-object-is@^1.0.1:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac"
-  integrity sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-
 object-keys@^1.0.12, object-keys@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
@@ -5168,14 +4851,23 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0:
   dependencies:
     wrappy "1"
 
-opn@^5.5.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz#fc7164fab56d235904c51c3b27da6758ca3b9bfc"
-  integrity sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==
+onetime@^5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
+  integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
   dependencies:
-    is-wsl "^1.1.0"
+    mimic-fn "^2.1.0"
+
+open@^8.0.9:
+  version "8.4.2"
+  resolved "https://registry.yarnpkg.com/open/-/open-8.4.2.tgz#5b5ffe2a8f793dcd2aad73e550cb87b59cb084f9"
+  integrity sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==
+  dependencies:
+    define-lazy-prop "^2.0.0"
+    is-docker "^2.1.1"
+    is-wsl "^2.2.0"
 
-optimize-css-assets-webpack-plugin@^5.0.3:
+optimize-css-assets-webpack-plugin@^5.0.8:
   version "5.0.8"
   resolved "https://registry.yarnpkg.com/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-5.0.8.tgz#cbccdcf5a6ef61d4f8cc78cf083a67446e5f402a"
   integrity sha512-mgFS1JdOtEGzD8l+EuISqL57cKO+We9GcoiQEmdCWRqqck+FGNmYJtx9qfAPzEz+lRrlThWMuGDaRkI/yWNx/Q==
@@ -5183,41 +4875,11 @@ optimize-css-assets-webpack-plugin@^5.0.3:
     cssnano "^4.1.10"
     last-call-webpack-plugin "^3.0.0"
 
-original@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/original/-/original-1.0.2.tgz#e442a61cffe1c5fd20a65f3261c26663b303f25f"
-  integrity sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==
-  dependencies:
-    url-parse "^1.4.3"
-
 os-browserify@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
   integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=
 
-os-homedir@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
-  integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
-
-os-tmpdir@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
-  integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
-
-osenv@0:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
-  integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
-  dependencies:
-    os-homedir "^1.0.0"
-    os-tmpdir "^1.0.0"
-
-p-finally@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
-  integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
-
 p-limit@^2.0.0, p-limit@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
@@ -5246,11 +4908,6 @@ p-locate@^4.1.0:
   dependencies:
     p-limit "^2.2.0"
 
-p-map@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175"
-  integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==
-
 p-map@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"
@@ -5258,12 +4915,13 @@ p-map@^4.0.0:
   dependencies:
     aggregate-error "^3.0.0"
 
-p-retry@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-3.0.1.tgz#316b4c8893e2c8dc1cfa891f406c4b422bebf328"
-  integrity sha512-XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w==
+p-retry@^4.5.0:
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-4.6.2.tgz#9baae7184057edd4e17231cee04264106e092a16"
+  integrity sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==
   dependencies:
-    retry "^0.12.0"
+    "@types/retry" "0.12.0"
+    retry "^0.13.1"
 
 p-try@^2.0.0:
   version "2.2.0"
@@ -5302,13 +4960,6 @@ parse-asn1@^5.0.0, parse-asn1@^5.1.6:
     pbkdf2 "^3.0.3"
     safe-buffer "^5.1.1"
 
-parse-json@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
-  integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=
-  dependencies:
-    error-ex "^1.2.0"
-
 parse-json@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
@@ -5357,13 +5008,6 @@ path-dirname@^1.0.0:
   resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
   integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
 
-path-exists@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
-  integrity sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=
-  dependencies:
-    pinkie-promise "^2.0.0"
-
 path-exists@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
@@ -5379,16 +5023,16 @@ path-is-absolute@^1.0.0:
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
   integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
-path-is-inside@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
-  integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
-
-path-key@^2.0.0, path-key@^2.0.1:
+path-key@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
   integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
 
+path-key@^3.0.0, path-key@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
+  integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
+
 path-parse@^1.0.6:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
@@ -5399,15 +5043,6 @@ path-to-regexp@0.1.7:
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
   integrity sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==
 
-path-type@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
-  integrity sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=
-  dependencies:
-    graceful-fs "^4.1.2"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-
 path-type@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
@@ -5424,11 +5059,6 @@ pbkdf2@^3.0.3:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
-performance-now@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
-  integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
-
 picocolors@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-0.2.1.tgz#570670f793646851d1ba135996962abad587859f"
@@ -5444,7 +5074,12 @@ picomatch@^2.0.4, picomatch@^2.2.1:
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972"
   integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==
 
-pify@^2.0.0, pify@^2.3.0:
+picomatch@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
+  integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
+
+pify@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
   integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
@@ -5454,18 +5089,6 @@ pify@^4.0.1:
   resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
   integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
 
-pinkie-promise@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
-  integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
-  dependencies:
-    pinkie "^2.0.0"
-
-pinkie@^2.0.0:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
-  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
-
 pkg-dir@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
@@ -5480,22 +5103,13 @@ pkg-dir@^4.1.0:
   dependencies:
     find-up "^4.0.0"
 
-pnp-webpack-plugin@^1.6.4:
+pnp-webpack-plugin@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/pnp-webpack-plugin/-/pnp-webpack-plugin-1.7.0.tgz#65741384f6d8056f36e2255a8d67ffc20866f5c9"
   integrity sha512-2Rb3vm+EXble/sMXNSu6eoBx8e79gKqhNq9F5ZWW6ERNCTE/Q0wQNne5541tE5vKjfM8hpNCYL+LGc1YTfI0dg==
   dependencies:
     ts-pnp "^1.1.6"
 
-portfinder@^1.0.26:
-  version "1.0.28"
-  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.28.tgz#67c4622852bd5374dd1dd900f779f53462fac778"
-  integrity sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==
-  dependencies:
-    async "^2.6.2"
-    debug "^3.1.1"
-    mkdirp "^0.5.5"
-
 posix-character-classes@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
@@ -6174,16 +5788,6 @@ prr@~1.0.1:
   resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
   integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY=
 
-pseudomap@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
-  integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
-
-psl@^1.1.28:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
-  integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
-
 public-encrypt@^4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0"
@@ -6231,7 +5835,7 @@ punycode@^1.2.4:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
   integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
 
-punycode@^2.1.0, punycode@^2.1.1:
+punycode@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
@@ -6248,11 +5852,6 @@ qs@6.11.0:
   dependencies:
     side-channel "^1.0.4"
 
-qs@~6.5.2:
-  version "6.5.3"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad"
-  integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==
-
 query-string@^4.1.0:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb"
@@ -6271,11 +5870,6 @@ querystring@0.2.0:
   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
   integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
 
-querystringify@^2.1.1:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6"
-  integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==
-
 randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5, randombytes@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
@@ -6313,24 +5907,7 @@ read-cache@^1.0.0:
   dependencies:
     pify "^2.3.0"
 
-read-pkg-up@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
-  integrity sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=
-  dependencies:
-    find-up "^1.0.0"
-    read-pkg "^1.0.0"
-
-read-pkg@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
-  integrity sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=
-  dependencies:
-    load-json-file "^1.0.0"
-    normalize-package-data "^2.3.2"
-    path-type "^1.0.0"
-
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
   version "2.3.7"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
   integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
@@ -6377,18 +5954,10 @@ readdirp@~3.6.0:
   dependencies:
     picomatch "^2.2.1"
 
-redent@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
-  integrity sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=
-  dependencies:
-    indent-string "^2.1.0"
-    strip-indent "^1.0.1"
-
-regenerate-unicode-properties@^9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-9.0.0.tgz#54d09c7115e1f53dc2314a974b32c1c344efe326"
-  integrity sha512-3E12UeNSPfjrgwjkR81m5J7Aw/T55Tu7nUyZVQYCKEOs+2dkxEY+DpPtZzO4YruuiPb7NkYLVcyJC4+zCbk5pA==
+regenerate-unicode-properties@^10.1.0:
+  version "10.1.1"
+  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.1.tgz#6b0e05489d9076b04c436f318d9b067bba459480"
+  integrity sha512-X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q==
   dependencies:
     regenerate "^1.4.2"
 
@@ -6397,15 +5966,25 @@ regenerate@^1.4.2:
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a"
   integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==
 
-regenerator-runtime@^0.13.4, regenerator-runtime@^0.13.7:
+regenerator-runtime@^0.13.4:
   version "0.13.9"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52"
   integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==
 
-regenerator-transform@^0.14.2:
-  version "0.14.5"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.5.tgz#c98da154683671c9c4dcb16ece736517e1b7feb4"
-  integrity sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==
+regenerator-runtime@^0.13.9:
+  version "0.13.11"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9"
+  integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==
+
+regenerator-runtime@^0.14.0:
+  version "0.14.1"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz#356ade10263f685dda125100cd862c1db895327f"
+  integrity sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==
+
+regenerator-transform@^0.15.2:
+  version "0.15.2"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.2.tgz#5bbae58b522098ebdf09bca2f83838929001c7a4"
+  integrity sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==
   dependencies:
     "@babel/runtime" "^7.8.4"
 
@@ -6417,35 +5996,22 @@ regex-not@^1.0.0, regex-not@^1.0.2:
     extend-shallow "^3.0.2"
     safe-regex "^1.1.0"
 
-regexp.prototype.flags@^1.2.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz#7ef352ae8d159e758c0eadca6f8fcb4eef07be26"
-  integrity sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-
-regexpu-core@^4.7.1:
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.8.0.tgz#e5605ba361b67b1718478501327502f4479a98f0"
-  integrity sha512-1F6bYsoYiz6is+oz70NWur2Vlh9KWtswuRuzJOfeYUrfPX2o8n74AnUVaOGDbUqVGO9fNHu48/pjJO4sNVwsOg==
+regexpu-core@^5.3.1:
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.3.2.tgz#11a2b06884f3527aec3e93dbbf4a3b958a95546b"
+  integrity sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==
   dependencies:
+    "@babel/regjsgen" "^0.8.0"
     regenerate "^1.4.2"
-    regenerate-unicode-properties "^9.0.0"
-    regjsgen "^0.5.2"
-    regjsparser "^0.7.0"
+    regenerate-unicode-properties "^10.1.0"
+    regjsparser "^0.9.1"
     unicode-match-property-ecmascript "^2.0.0"
-    unicode-match-property-value-ecmascript "^2.0.0"
-
-regjsgen@^0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz#92ff295fb1deecbf6ecdab2543d207e91aa33733"
-  integrity sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==
+    unicode-match-property-value-ecmascript "^2.1.0"
 
-regjsparser@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.7.0.tgz#a6b667b54c885e18b52554cb4960ef71187e9968"
-  integrity sha512-A4pcaORqmNMDVwUjWoTzuhwMGpP+NykpfqAsEgI1FSH/EzC7lrN5TMd+kN8YCovX+jMpu8eaqXgXPCa0g8FQNQ==
+regjsparser@^0.9.1:
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.9.1.tgz#272d05aa10c7c1f67095b1ff0addae8442fc5709"
+  integrity sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==
   dependencies:
     jsesc "~0.5.0"
 
@@ -6464,44 +6030,16 @@ repeat-string@^1.6.1:
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
   integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
 
-repeating@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
-  integrity sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=
-  dependencies:
-    is-finite "^1.0.0"
-
-request@^2.87.0, request@^2.88.0:
-  version "2.88.2"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
-  integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
-  dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.8.0"
-    caseless "~0.12.0"
-    combined-stream "~1.0.6"
-    extend "~3.0.2"
-    forever-agent "~0.6.1"
-    form-data "~2.3.2"
-    har-validator "~5.1.3"
-    http-signature "~1.2.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.19"
-    oauth-sign "~0.9.0"
-    performance-now "^2.1.0"
-    qs "~6.5.2"
-    safe-buffer "^5.1.2"
-    tough-cookie "~2.5.0"
-    tunnel-agent "^0.6.0"
-    uuid "^3.3.2"
-
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
   integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
 
+require-from-string@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
+  integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
+
 require-main-filename@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
@@ -6542,7 +6080,7 @@ resolve-url@^0.2.1:
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
-resolve@^1.1.7, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2:
+resolve@^1.1.7, resolve@^1.12.0, resolve@^1.14.2:
   version "1.20.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
   integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==
@@ -6555,10 +6093,10 @@ ret@~0.1.10:
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
   integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
 
-retry@^0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
-  integrity sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=
+retry@^0.13.1:
+  version "0.13.1"
+  resolved "https://registry.yarnpkg.com/retry/-/retry-0.13.1.tgz#185b1587acf67919d63b357349e03537b2484658"
+  integrity sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==
 
 rgb-regex@^1.0.1:
   version "1.0.1"
@@ -6570,7 +6108,7 @@ rgba-regex@^1.0.0:
   resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3"
   integrity sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=
 
-rimraf@2, rimraf@^2.5.4, rimraf@^2.6.3:
+rimraf@^2.5.4, rimraf@^2.6.3:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
   integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
@@ -6616,31 +6154,30 @@ safe-regex@^1.1.0:
   dependencies:
     ret "~0.1.10"
 
-"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
+"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-sass-graph@2.2.5:
-  version "2.2.5"
-  resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.5.tgz#a981c87446b8319d96dce0671e487879bd24c2e8"
-  integrity sha512-VFWDAHOe6mRuT4mZRd4eKE+d8Uedrk6Xnh7Sh9b4NGufQLQjOrvf/MQoOdx+0s92L89FeyUUNfU597j/3uNpag==
+sass-loader@10.1.1:
+  version "10.1.1"
+  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-10.1.1.tgz#4ddd5a3d7638e7949065dd6e9c7c04037f7e663d"
+  integrity sha512-W6gVDXAd5hR/WHsPicvZdjAWHBcEJ44UahgxcIE196fW2ong0ZHMPO1kZuI5q0VlvMQZh32gpv69PLWQm70qrw==
   dependencies:
-    glob "^7.0.0"
-    lodash "^4.0.0"
-    scss-tokenizer "^0.2.3"
-    yargs "^13.3.2"
+    klona "^2.0.4"
+    loader-utils "^2.0.0"
+    neo-async "^2.6.2"
+    schema-utils "^3.0.0"
+    semver "^7.3.2"
 
-sass-loader@^8.0.2:
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-8.0.2.tgz#debecd8c3ce243c76454f2e8290482150380090d"
-  integrity sha512-7o4dbSK8/Ol2KflEmSco4jTjQoV988bM82P9CZdmo9hR3RLnvNc0ufMNdMrB0caq38JQ/FgF4/7RcbcfKzxoFQ==
+sass@^1.38.0:
+  version "1.70.0"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.70.0.tgz#761197419d97b5358cb25f9dd38c176a8a270a75"
+  integrity sha512-uUxNQ3zAHeAx5nRFskBnrWzDUJrrvpCPD5FNAoRvTi0WwremlheES3tg+56PaVtCs5QDRX5CBLxxKMDJMEa1WQ==
   dependencies:
-    clone-deep "^4.0.1"
-    loader-utils "^1.2.3"
-    neo-async "^2.6.1"
-    schema-utils "^2.6.1"
-    semver "^6.3.0"
+    chokidar ">=3.0.0 <4.0.0"
+    immutable "^4.0.0"
+    source-map-js ">=0.6.2 <2.0.0"
 
 sax@~1.2.4:
   version "1.2.4"
@@ -6656,7 +6193,7 @@ schema-utils@^1.0.0:
     ajv-errors "^1.0.0"
     ajv-keywords "^3.1.0"
 
-schema-utils@^2.6.1, schema-utils@^2.6.5, schema-utils@^2.7.0:
+schema-utils@^2.6.5, schema-utils@^2.7.0:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7"
   integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==
@@ -6674,40 +6211,45 @@ schema-utils@^3.0.0:
     ajv "^6.12.5"
     ajv-keywords "^3.5.2"
 
-scss-tokenizer@^0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1"
-  integrity sha1-jrBtualyMzOCTT9VMGQRSYR85dE=
+schema-utils@^4.0.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.2.0.tgz#70d7c93e153a273a805801882ebd3bff20d89c8b"
+  integrity sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==
   dependencies:
-    js-base64 "^2.1.8"
-    source-map "^0.4.2"
+    "@types/json-schema" "^7.0.9"
+    ajv "^8.9.0"
+    ajv-formats "^2.1.1"
+    ajv-keywords "^5.1.0"
 
 select-hose@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
   integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=
 
-selfsigned@^1.10.8:
-  version "1.10.11"
-  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.11.tgz#24929cd906fe0f44b6d01fb23999a739537acbe9"
-  integrity sha512-aVmbPOfViZqOZPgRBT0+3u4yZFHpmnIghLMlAcb5/xhp5ZtB/RVnKhz5vl2M32CLXAqR4kha9zfhNg0Lf/sxKA==
+selfsigned@^2.1.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.4.1.tgz#560d90565442a3ed35b674034cec4e95dceb4ae0"
+  integrity sha512-th5B4L2U+eGLq1TVh7zNRGBapioSORUeymIydxgFpwww9d2qyKvtuPU2jJuHvYAwwqi2Y596QBL3eEqcPEYL8Q==
   dependencies:
-    node-forge "^0.10.0"
+    "@types/node-forge" "^1.3.0"
+    node-forge "^1"
 
-"semver@2 || 3 || 4 || 5", semver@^5.5.0, semver@^5.6.0:
+semver@^5.5.0, semver@^5.6.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
-semver@7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
-  integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
+semver@^6.0.0, semver@^6.3.0, semver@^6.3.1:
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
+  integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
-  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
+semver@^7.3.2:
+  version "7.5.4"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
+  integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
+  dependencies:
+    lru-cache "^6.0.0"
 
 semver@^7.3.5:
   version "7.3.5"
@@ -6716,11 +6258,6 @@ semver@^7.3.5:
   dependencies:
     lru-cache "^6.0.0"
 
-semver@~5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
-  integrity sha1-myzl094C0XxgEq0yaqa00M9U+U8=
-
 send@0.18.0:
   version "0.18.0"
   resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be"
@@ -6777,7 +6314,7 @@ serve-static@1.15.0:
     parseurl "~1.3.3"
     send "0.18.0"
 
-set-blocking@^2.0.0, set-blocking@~2.0.0:
+set-blocking@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
@@ -6815,13 +6352,6 @@ sha.js@^2.4.0, sha.js@^2.4.8:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
 
-shallow-clone@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3"
-  integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==
-  dependencies:
-    kind-of "^6.0.2"
-
 shebang-command@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
@@ -6829,11 +6359,28 @@ shebang-command@^1.2.0:
   dependencies:
     shebang-regex "^1.0.0"
 
+shebang-command@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
+  integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
+  dependencies:
+    shebang-regex "^3.0.0"
+
 shebang-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
   integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
 
+shebang-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
+  integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
+
+shell-quote@^1.8.1:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.1.tgz#6dbf4db75515ad5bac63b4f1894c3a154c766680"
+  integrity sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==
+
 side-channel@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
@@ -6843,10 +6390,10 @@ side-channel@^1.0.4:
     get-intrinsic "^1.0.2"
     object-inspect "^1.9.0"
 
-signal-exit@^3.0.0:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.6.tgz#24e630c4b0f03fea446a2bd299e62b4a6ca8d0af"
-  integrity sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ==
+signal-exit@^3.0.3:
+  version "3.0.7"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
+  integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
 
 simple-swizzle@^0.2.2:
   version "0.2.2"
@@ -6885,19 +6432,7 @@ snapdragon@^0.8.1:
     source-map-resolve "^0.5.0"
     use "^3.1.0"
 
-sockjs-client@^1.5.0:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.5.2.tgz#4bc48c2da9ce4769f19dc723396b50f5c12330a3"
-  integrity sha512-ZzRxPBISQE7RpzlH4tKJMQbHM9pabHluk0WBaxAQ+wm/UieeBVBou0p4wVnSQGN9QmpAZygQ0cDIypWuqOFmFQ==
-  dependencies:
-    debug "^3.2.6"
-    eventsource "^1.0.7"
-    faye-websocket "^0.11.3"
-    inherits "^2.0.4"
-    json3 "^3.3.3"
-    url-parse "^1.5.3"
-
-sockjs@^0.3.21:
+sockjs@^0.3.24:
   version "0.3.24"
   resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.24.tgz#c9bc8995f33a111bea0395ec30aa3206bdb5ccce"
   integrity sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==
@@ -6918,6 +6453,11 @@ source-list-map@^2.0.0:
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
   integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
 
+"source-map-js@>=0.6.2 <2.0.0":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
+  integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
+
 source-map-resolve@^0.5.0:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
@@ -6942,14 +6482,7 @@ source-map-url@^0.4.0:
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56"
   integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==
 
-source-map@^0.4.2:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
-  integrity sha1-66T12pwNyZneaAMti092FzZSA2s=
-  dependencies:
-    amdefine ">=0.0.4"
-
-source-map@^0.5.0, source-map@^0.5.6:
+source-map@^0.5.6:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
   integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
@@ -6959,42 +6492,11 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
-source-map@~0.7.2:
-  version "0.7.3"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
-  integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
-
-spark-md5@^3.0.0:
+spark-md5@^3.0.1:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/spark-md5/-/spark-md5-3.0.2.tgz#7952c4a30784347abcee73268e473b9c0167e3fc"
   integrity sha512-wcFzz9cDfbuqe0FZzfi2or1sgyIrsDwmPwfZC4hiNidPdPINjeUwNfv5kldczoEAcjl9Y1L3SM7Uz2PUEQzxQw==
 
-spdx-correct@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"
-  integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==
-  dependencies:
-    spdx-expression-parse "^3.0.0"
-    spdx-license-ids "^3.0.0"
-
-spdx-exceptions@^2.1.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d"
-  integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==
-
-spdx-expression-parse@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679"
-  integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==
-  dependencies:
-    spdx-exceptions "^2.1.0"
-    spdx-license-ids "^3.0.0"
-
-spdx-license-ids@^3.0.0:
-  version "3.0.11"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz#50c0d8c40a14ec1bf449bae69a0ea4685a9d9f95"
-  integrity sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==
-
 spdy-transport@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-3.0.0.tgz#00d4863a6400ad75df93361a1608605e5dcdcf31"
@@ -7030,21 +6532,6 @@ sprintf-js@~1.0.2:
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
   integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
 
-sshpk@^1.7.0:
-  version "1.16.1"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
-  integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==
-  dependencies:
-    asn1 "~0.2.3"
-    assert-plus "^1.0.0"
-    bcrypt-pbkdf "^1.0.0"
-    dashdash "^1.12.0"
-    ecc-jsbn "~0.1.1"
-    getpass "^0.1.1"
-    jsbn "~0.1.0"
-    safer-buffer "^2.0.2"
-    tweetnacl "~0.14.0"
-
 ssri@^6.0.1:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.2.tgz#157939134f20464e7301ddba3e90ffa8f7728ac5"
@@ -7082,13 +6569,6 @@ statuses@2.0.1:
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
   integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
 
-stdout-stream@^1.4.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/stdout-stream/-/stdout-stream-1.4.1.tgz#5ac174cdd5cd726104aa0c0b2bd83815d8d535de"
-  integrity sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==
-  dependencies:
-    readable-stream "^2.0.1"
-
 stream-browserify@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz#87521d38a44aa7ee91ce1cd2a47df0cb49dd660b"
@@ -7126,24 +6606,6 @@ strict-uri-encode@^1.0.0:
   resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
   integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=
 
-string-width@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
-  integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
-  dependencies:
-    code-point-at "^1.0.0"
-    is-fullwidth-code-point "^1.0.0"
-    strip-ansi "^3.0.0"
-
-"string-width@^1.0.2 || 2 || 3 || 4":
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
-  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.1"
-
 string-width@^3.0.0, string-width@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
@@ -7183,13 +6645,6 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-strip-ansi@^3.0.0, strip-ansi@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
-  integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
-  dependencies:
-    ansi-regex "^2.0.0"
-
 strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
@@ -7197,33 +6652,12 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
   dependencies:
     ansi-regex "^4.1.0"
 
-strip-ansi@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
-  dependencies:
-    ansi-regex "^5.0.1"
-
-strip-bom@^2.0.0:
+strip-final-newline@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
-  integrity sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=
-  dependencies:
-    is-utf8 "^0.2.0"
-
-strip-eof@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
-  integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
+  resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
+  integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
 
-strip-indent@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2"
-  integrity sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=
-  dependencies:
-    get-stdin "^4.0.1"
-
-style-loader@^1.2.1:
+style-loader@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-1.3.0.tgz#828b4a3b3b7e7aa5847ce7bae9e874512114249e"
   integrity sha512-V7TCORko8rs9rIqkSrlMfkqA63DfoGBBJmK1kKGCcSi+BWb4cqz0SRsnp4l6rU5iwOEd0/2ePv68SV22VXon4Q==
@@ -7240,11 +6674,6 @@ stylehacks@^4.0.0:
     postcss "^7.0.0"
     postcss-selector-parser "^3.0.0"
 
-supports-color@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
-  integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
-
 supports-color@^5.3.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
@@ -7290,15 +6719,6 @@ tapable@^1.0.0, tapable@^1.1.3:
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
   integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
 
-tar@^2.0.0:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.2.tgz#0ca8848562c7299b8b446ff6a4d60cdbb23edc40"
-  integrity sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==
-  dependencies:
-    block-stream "*"
-    fstream "^1.0.12"
-    inherits "2"
-
 tar@^6.0.2:
   version "6.1.11"
   resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621"
@@ -7326,7 +6746,7 @@ terser-webpack-plugin@^1.4.3:
     webpack-sources "^1.4.0"
     worker-farm "^1.7.0"
 
-terser-webpack-plugin@^4.0.0:
+terser-webpack-plugin@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-4.2.3.tgz#28daef4a83bd17c1db0297070adc07fc8cfc6a9a"
   integrity sha512-jTgXh40RnvOrLQNgIkwEKnQ8rmHjHK4u+6UBEi+W+FPmvb+uo+chJXntKe7/3lW5mNysgSWD60KyesnhW8D6MQ==
@@ -7351,12 +6771,13 @@ terser@^4.1.2:
     source-map-support "~0.5.12"
 
 terser@^5.3.4:
-  version "5.10.0"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.10.0.tgz#b86390809c0389105eb0a0b62397563096ddafcc"
-  integrity sha512-AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA==
+  version "5.27.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.27.0.tgz#70108689d9ab25fef61c4e93e808e9fd092bf20c"
+  integrity sha512-bi1HRwVRskAjheeYl291n3JC4GgO/Ty4z1nVs5AAsmonJulGxpSektecnNedrwK9C7vpvVtcX3cw00VSLt7U2A==
   dependencies:
+    "@jridgewell/source-map" "^0.3.3"
+    acorn "^8.8.2"
     commander "^2.20.0"
-    source-map "~0.7.2"
     source-map-support "~0.5.20"
 
 through2@^2.0.0:
@@ -7431,26 +6852,6 @@ toidentifier@1.0.1:
   resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35"
   integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==
 
-tough-cookie@~2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
-  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
-  dependencies:
-    psl "^1.1.28"
-    punycode "^2.1.1"
-
-trim-newlines@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
-  integrity sha1-WIeWa7WCpFA6QetST301ARgVphM=
-
-"true-case-path@^1.0.2":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/true-case-path/-/true-case-path-1.0.3.tgz#f813b5a8c86b40da59606722b144e3225799f47d"
-  integrity sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==
-  dependencies:
-    glob "^7.1.2"
-
 ts-pnp@^1.1.6:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.2.0.tgz#a500ad084b0798f1c3071af391e65912c86bca92"
@@ -7461,18 +6862,6 @@ tty-browserify@0.0.0:
   resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
   integrity sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=
 
-tunnel-agent@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
-  integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
-  dependencies:
-    safe-buffer "^5.0.1"
-
-tweetnacl@^0.14.3, tweetnacl@~0.14.0:
-  version "0.14.5"
-  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
-  integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
-
 type-is@~1.6.18:
   version "1.6.18"
   resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
@@ -7509,10 +6898,10 @@ unicode-match-property-ecmascript@^2.0.0:
     unicode-canonical-property-names-ecmascript "^2.0.0"
     unicode-property-aliases-ecmascript "^2.0.0"
 
-unicode-match-property-value-ecmascript@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz#1a01aa57247c14c568b89775a54938788189a714"
-  integrity sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==
+unicode-match-property-value-ecmascript@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz#cb5fffdcd16a05124f5a4b0bf7c3770208acbbe0"
+  integrity sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==
 
 unicode-property-aliases-ecmascript@^2.0.0:
   version "2.0.0"
@@ -7576,6 +6965,14 @@ upath@^1.1.1:
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"
   integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==
 
+update-browserslist-db@^1.0.13:
+  version "1.0.13"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz#3c5e4f5c083661bd38ef64b6328c26ed6c8248c4"
+  integrity sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==
+  dependencies:
+    escalade "^3.1.1"
+    picocolors "^1.0.0"
+
 uri-js@^4.2.2:
   version "4.4.1"
   resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
@@ -7588,14 +6985,6 @@ urix@^0.1.0:
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
   integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
 
-url-parse@^1.4.3, url-parse@^1.5.3:
-  version "1.5.10"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1"
-  integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==
-  dependencies:
-    querystringify "^2.1.1"
-    requires-port "^1.0.0"
-
 url@^0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
@@ -7643,11 +7032,6 @@ utils-merge@1.0.1:
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
   integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==
 
-uuid@^3.3.2:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
-  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
-
 uuid@^8.3.2:
   version "8.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
@@ -7658,14 +7042,6 @@ v8-compile-cache@^2.1.1:
   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
   integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
 
-validate-npm-package-license@^3.0.1:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
-  integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
-  dependencies:
-    spdx-correct "^3.0.0"
-    spdx-expression-parse "^3.0.0"
-
 vary@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
@@ -7676,15 +7052,6 @@ vendors@^1.0.0:
   resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.4.tgz#e2b800a53e7a29b93506c3cf41100d16c4c4ad8e"
   integrity sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w==
 
-verror@1.10.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
-  integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=
-  dependencies:
-    assert-plus "^1.0.0"
-    core-util-is "1.0.2"
-    extsprintf "^1.2.0"
-
 vm-browserify@^1.0.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
@@ -7745,63 +7112,52 @@ webpack-cli@^3.3.12:
     v8-compile-cache "^2.1.1"
     yargs "^13.3.2"
 
-webpack-dev-middleware@^3.7.2:
-  version "3.7.3"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.3.tgz#0639372b143262e2b84ab95d3b91a7597061c2c5"
-  integrity sha512-djelc/zGiz9nZj/U7PTBi2ViorGJXEWo/3ltkPbDyxCXhhEXkW0ce99falaok4TPj+AsxLiXJR0EBOb0zh9fKQ==
+webpack-dev-middleware@^5.3.1:
+  version "5.3.3"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz#efae67c2793908e7311f1d9b06f2a08dcc97e51f"
+  integrity sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==
   dependencies:
-    memory-fs "^0.4.1"
-    mime "^2.4.4"
-    mkdirp "^0.5.1"
+    colorette "^2.0.10"
+    memfs "^3.4.3"
+    mime-types "^2.1.31"
     range-parser "^1.2.1"
-    webpack-log "^2.0.0"
-
-webpack-dev-server@^3.11.2:
-  version "3.11.3"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.11.3.tgz#8c86b9d2812bf135d3c9bce6f07b718e30f7c3d3"
-  integrity sha512-3x31rjbEQWKMNzacUZRE6wXvUFuGpH7vr0lIEbYpMAG9BOxi0928QU1BBswOAP3kg3H1O4hiS+sq4YyAn6ANnA==
-  dependencies:
-    ansi-html-community "0.0.8"
-    bonjour "^3.5.0"
-    chokidar "^2.1.8"
+    schema-utils "^4.0.0"
+
+webpack-dev-server@4.15.1:
+  version "4.15.1"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.15.1.tgz#8944b29c12760b3a45bdaa70799b17cb91b03df7"
+  integrity sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA==
+  dependencies:
+    "@types/bonjour" "^3.5.9"
+    "@types/connect-history-api-fallback" "^1.3.5"
+    "@types/express" "^4.17.13"
+    "@types/serve-index" "^1.9.1"
+    "@types/serve-static" "^1.13.10"
+    "@types/sockjs" "^0.3.33"
+    "@types/ws" "^8.5.5"
+    ansi-html-community "^0.0.8"
+    bonjour-service "^1.0.11"
+    chokidar "^3.5.3"
+    colorette "^2.0.10"
     compression "^1.7.4"
-    connect-history-api-fallback "^1.6.0"
-    debug "^4.1.1"
-    del "^4.1.1"
-    express "^4.17.1"
-    html-entities "^1.3.1"
-    http-proxy-middleware "0.19.1"
-    import-local "^2.0.0"
-    internal-ip "^4.3.0"
-    ip "^1.1.5"
-    is-absolute-url "^3.0.3"
-    killable "^1.0.1"
-    loglevel "^1.6.8"
-    opn "^5.5.0"
-    p-retry "^3.0.1"
-    portfinder "^1.0.26"
-    schema-utils "^1.0.0"
-    selfsigned "^1.10.8"
-    semver "^6.3.0"
+    connect-history-api-fallback "^2.0.0"
+    default-gateway "^6.0.3"
+    express "^4.17.3"
+    graceful-fs "^4.2.6"
+    html-entities "^2.3.2"
+    http-proxy-middleware "^2.0.3"
+    ipaddr.js "^2.0.1"
+    launch-editor "^2.6.0"
+    open "^8.0.9"
+    p-retry "^4.5.0"
+    rimraf "^3.0.2"
+    schema-utils "^4.0.0"
+    selfsigned "^2.1.1"
     serve-index "^1.9.1"
-    sockjs "^0.3.21"
-    sockjs-client "^1.5.0"
+    sockjs "^0.3.24"
     spdy "^4.0.2"
-    strip-ansi "^3.0.1"
-    supports-color "^6.1.0"
-    url "^0.11.0"
-    webpack-dev-middleware "^3.7.2"
-    webpack-log "^2.0.0"
-    ws "^6.2.1"
-    yargs "^13.3.2"
-
-webpack-log@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/webpack-log/-/webpack-log-2.0.0.tgz#5b7928e0637593f119d32f6227c1e0ac31e1b47f"
-  integrity sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==
-  dependencies:
-    ansi-colors "^3.0.0"
-    uuid "^3.3.2"
+    webpack-dev-middleware "^5.3.1"
+    ws "^8.13.0"
 
 webpack-sources@^1.0.0, webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1, webpack-sources@^1.4.3:
   version "1.4.3"
@@ -7811,10 +7167,10 @@ webpack-sources@^1.0.0, webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-
     source-list-map "^2.0.0"
     source-map "~0.6.1"
 
-webpack@^4.44.1:
-  version "4.46.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.46.0.tgz#bf9b4404ea20a073605e0a011d188d77cb6ad542"
-  integrity sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q==
+webpack@^4.46.0:
+  version "4.47.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.47.0.tgz#8b8a02152d7076aeb03b61b47dad2eeed9810ebc"
+  integrity sha512-td7fYwgLSrky3fI1EuU5cneU4+pbH6GgOfuKNS1tNPcfdGinGELAqsb/BP4nnvZyKSG2i/xFGU7+n2PvZA8HJQ==
   dependencies:
     "@webassemblyjs/ast" "1.9.0"
     "@webassemblyjs/helper-module-context" "1.9.0"
@@ -7870,19 +7226,19 @@ which-module@^2.0.0:
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
   integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
 
-which@1, which@^1.2.14, which@^1.2.9, which@^1.3.1:
+which@^1.2.14, which@^1.2.9, which@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
   integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
   dependencies:
     isexe "^2.0.0"
 
-wide-align@^1.1.0:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3"
-  integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==
+which@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
+  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
   dependencies:
-    string-width "^1.0.2 || 2 || 3 || 4"
+    isexe "^2.0.0"
 
 worker-farm@^1.7.0:
   version "1.7.0"
@@ -7905,12 +7261,10 @@ wrappy@1:
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
-ws@^6.2.1:
-  version "6.2.2"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.2.tgz#dd5cdbd57a9979916097652d78f1cc5faea0c32e"
-  integrity sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==
-  dependencies:
-    async-limiter "~1.0.0"
+ws@^8.13.0:
+  version "8.16.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.16.0.tgz#d1cd774f36fbc07165066a60e40323eab6446fd4"
+  integrity sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==
 
 xtend@^4.0.0, xtend@~4.0.1:
   version "4.0.2"
@@ -7922,11 +7276,6 @@ y18n@^4.0.0:
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf"
   integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==
 
-yallist@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
-  integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
-
 yallist@^3.0.2:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"

From 0400905f3b6cd61924b9fcb9a9a89af7f4d9a340 Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Thu, 18 Jan 2024 14:49:45 -0600
Subject: [PATCH 065/125] setting host manually is deprecated

---
 server/app/controllers/application_controller.rb | 1 +
 server/app/controllers/graphql_controller.rb     | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/app/controllers/application_controller.rb b/server/app/controllers/application_controller.rb
index 361611fe7..3c21559e6 100644
--- a/server/app/controllers/application_controller.rb
+++ b/server/app/controllers/application_controller.rb
@@ -1,3 +1,4 @@
 class ApplicationController < ActionController::Base
   include Authentication
+  include ActiveStorage::SetCurrent
 end
diff --git a/server/app/controllers/graphql_controller.rb b/server/app/controllers/graphql_controller.rb
index aa5cbce43..db5ee3ced 100644
--- a/server/app/controllers/graphql_controller.rb
+++ b/server/app/controllers/graphql_controller.rb
@@ -5,7 +5,6 @@ class GraphqlController < ApplicationController
   protect_from_forgery with: :null_session, if: :from_external_domain
 
   def execute
-    ActiveStorage::Current.host = request.base_url
     variables = prepare_variables(params[:variables])
     query = params[:query]
     operation_name = params[:operationName]

From b95c94a9be18385d6d8dff14dc4a39d37e42cccb Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Thu, 18 Jan 2024 14:56:14 -0600
Subject: [PATCH 066/125] preload requires kwargs now

---
 server/app/graphql/loaders/association_loader.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/app/graphql/loaders/association_loader.rb b/server/app/graphql/loaders/association_loader.rb
index 828ca70a4..5399fca54 100644
--- a/server/app/graphql/loaders/association_loader.rb
+++ b/server/app/graphql/loaders/association_loader.rb
@@ -38,7 +38,7 @@ def validate
     end
 
     def preload_association(records)
-      ::ActiveRecord::Associations::Preloader.new.preload(records, @association_name)
+      ::ActiveRecord::Associations::Preloader.new(records: records, associations: @association_name).call
     end
 
     def read_association(record)

From b0b996f75825bcf95b3cbb3c210f5734b6f689ad Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Fri, 19 Jan 2024 11:49:39 -0600
Subject: [PATCH 067/125] tune thread pool more in line with current
 recomendations

---
 server/config/application.rb     | 2 ++
 server/config/database.yml       | 6 +++---
 server/config/puma/production.rb | 6 +++---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/server/config/application.rb b/server/config/application.rb
index 0fcdaac30..9f6a6bc06 100644
--- a/server/config/application.rb
+++ b/server/config/application.rb
@@ -24,6 +24,8 @@ class Application < Rails::Application
     config.load_defaults 6.1
 
     config.active_support.cache_format_version = 7.1
+    config.active_record.async_query_executor = :global_thread_pool
+    config.active_record.global_executor_concurrency = 4
 
     # Please, add to the `ignore` list any other `lib` subdirectories that do
     # not contain `.rb` files, or that should not be reloaded or eager loaded.
diff --git a/server/config/database.yml b/server/config/database.yml
index 7a0b18f3b..023edd3bc 100644
--- a/server/config/database.yml
+++ b/server/config/database.yml
@@ -18,10 +18,10 @@ test:
 
 production:
   <<: *default
-  pool: 40
+  pool: 20
   username: <%=  Rails.application.credentials.dig(:database, :username) %>
   password: <%=  Rails.application.credentials.dig(:database, :password) %>
-    
+
 staging:
   <<: *default
   pool: 20
@@ -31,5 +31,5 @@ staging:
 
 headless:
   <<: *default
-  pool: 40
+  pool: 20
 
diff --git a/server/config/puma/production.rb b/server/config/puma/production.rb
index 9fb118133..730b4183f 100644
--- a/server/config/puma/production.rb
+++ b/server/config/puma/production.rb
@@ -1,6 +1,6 @@
 app_dir = '/var/www/civic/current'
-max_threads_count = 5
-min_threads_count = 5
+max_threads_count = 3
+min_threads_count = 3
 threads min_threads_count, max_threads_count
 
 bind "unix://#{app_dir}/tmp/sockets/puma.sock"
@@ -18,7 +18,7 @@
 
 # Specifies the `environment` that Puma will run in.
 #
-environment ENV.fetch("RAILS_ENV") { "staging" }
+environment ENV.fetch("RAILS_ENV") { "production" }
 
 # Specifies the `pidfile` that Puma will use.
 pidfile ENV.fetch("PIDFILE") { "tmp/pids/server.pid" }

From 48c373af8e88b4a89b80c2f13068c1665fbbb55d Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Tue, 23 Jan 2024 09:06:49 -0600
Subject: [PATCH 068/125] configure production to use 3.3

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

diff --git a/server/config/deploy/production.rb b/server/config/deploy/production.rb
index 04d09ad21..cc7e70051 100644
--- a/server/config/deploy/production.rb
+++ b/server/config/deploy/production.rb
@@ -1,7 +1,7 @@
 server "44.231.73.12", user: 'ubuntu', roles: %w{web db app}
 
 set :branch, 'release'
-set :rbenv_ruby, '3.0.3'
+set :rbenv_ruby, '3.3.0'
 
 set :rails_env, 'production'
 

From 03f51b43cb1d58e629d8b4c1452a60be2a0fe6e7 Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Thu, 25 Jan 2024 10:45:46 -0600
Subject: [PATCH 069/125] show feature tag in variant menu on feature page

---
 .../variants-menu.component.html              | 121 ++++++++++++------
 .../variants-menu/variants-menu.component.ts  |  69 +++++-----
 .../variants-menu/variants-menu.module.ts     |   2 +
 client/src/app/generated/civic.apollo.ts      |   5 +-
 .../features-summary.page.html                |   4 +-
 .../features-summary.query.gql                |   1 +
 6 files changed, 125 insertions(+), 77 deletions(-)

diff --git a/client/src/app/components/variants/variants-menu/variants-menu.component.html b/client/src/app/components/variants/variants-menu/variants-menu.component.html
index 85ff904b8..a8ad1928a 100644
--- a/client/src/app/components/variants/variants-menu/variants-menu.component.html
+++ b/client/src/app/components/variants/variants-menu/variants-menu.component.html
@@ -1,43 +1,63 @@
 <nz-spin [nzSpinning]="loading$ | ngrxPush">
   <ng-container *ngIf="menuVariants$ | ngrxPush as variants">
-    <nz-card [nzTitle]="cardTitle"
+    <nz-card
+      [nzTitle]="cardTitle"
       [nzExtra]="cardExtra">
-
       <ng-template #cardTitle>
         <ng-container *ngIf="totalVariants$ | ngrxPush as total">
-          <span nz-typography
-            nzType="secondary">{{ total }} Total</span>
-          <span nz-typography
-            *ngIf="total  > variants.length"
-            nzType="secondary">({{ variants.length }} displayed)</span>
+          <span
+            nz-typography
+            nzType="secondary">
+            {{ total }} Total
+          </span>
+          <span
+            nz-typography
+            nzType="secondary">
+            &nbsp;
+            <cvc-feature-tag
+              *ngIf="feature"
+              [feature]="feature"></cvc-feature-tag>
+            Variants
+          </span>
+          <span
+            nz-typography
+            *ngIf="total > variants.length"
+            nzType="secondary"
+            >({{ variants.length }} displayed)</span
+          >
         </ng-container>
-
       </ng-template>
 
       <ng-template #cardExtra>
-        <form nz-form
+        <form
+          nz-form
           nzLayout="inline"
           id="variant-filters">
           <nz-form-item>
             <nz-form-label>Name Filter</nz-form-label>
             <nz-form-control>
-              <nz-input-group [nzSuffix]="nameInputClearTpl"
+              <nz-input-group
+                [nzSuffix]="nameInputClearTpl"
                 id="name-filter-group"
                 [nzCompact]="true"
                 nzSize="small">
-                <input type="text"
+                <input
+                  type="text"
                   nz-input
                   placeholder="Variant Names"
                   name="name-filter"
                   (ngModelChange)="onModelUpdated()"
                   [(ngModel)]="variantNameFilter" />
                 <ng-template #nameInputClearTpl>
-                  <i nz-icon
+                  <i
+                    nz-icon
                     class="ant-input-clear-icon"
                     nzTheme="fill"
                     nzType="close-circle"
                     *ngIf="variantNameFilter"
-                    (click)="variantNameFilter = undefined; onModelUpdated()"></i>
+                    (click)="
+                      variantNameFilter = undefined; onModelUpdated()
+                    "></i>
                 </ng-template>
               </nz-input-group>
             </nz-form-control>
@@ -45,11 +65,13 @@
           <nz-form-item>
             <nz-form-label>Variant Type</nz-form-label>
             <nz-form-control>
-              <ng-container *ngIf="menuVariantTypes$ | ngrxPush as variantTypes">
-                <nz-select nzAllowClear
+              <ng-container
+                *ngIf="menuVariantTypes$ | ngrxPush as variantTypes">
+                <nz-select
+                  nzAllowClear
                   nzSize="small"
                   nzMode="multiple"
-                  style="min-width: 115px;"
+                  style="min-width: 115px"
                   [nzDropdownMatchSelectWidth]="false"
                   nzPlaceHolder="Variant Type"
                   name="variantTypes"
@@ -57,14 +79,21 @@
                   [(ngModel)]="variantTypeFilter"
                   (ngModelChange)="onModelUpdated()"
                   [nzCustomTemplate]="variantTypeTemplate">
-                  <nz-option *ngFor="let variantType of variantTypes"
+                  <nz-option
+                    *ngFor="let variantType of variantTypes"
                     [nzLabel]="variantType!.name"
                     [nzValue]="variantType">
                   </nz-option>
                 </nz-select>
-                <ng-template #variantTypeTemplate let-selected>
+                <ng-template
+                  #variantTypeTemplate
+                  let-selected>
                   <div class="ant-select-selection-item-content">
-                    <i nz-icon nzType="civic-varianttype" nzTheme="twotone" [nzTwotoneColor]="iconColor"></i>
+                    <i
+                      nz-icon
+                      nzType="civic-varianttype"
+                      nzTheme="twotone"
+                      [nzTwotoneColor]="iconColor"></i>
                     {{ selected.nzLabel }}
                   </div>
                 </ng-template>
@@ -72,11 +101,10 @@
             </nz-form-control>
           </nz-form-item>
           <nz-form-item>
-            <nz-form-label>
-              No Variant Type
-            </nz-form-label>
+            <nz-form-label> No Variant Type </nz-form-label>
             <nz-form-control>
-              <label nz-checkbox
+              <label
+                nz-checkbox
                 name="noVt"
                 [(ngModel)]="hasNoVariantType"
                 (ngModelChange)="onModelUpdated()">
@@ -86,20 +114,24 @@
           <nz-form-item>
             <nz-form-label>Order By</nz-form-label>
             <nz-form-control>
-              <nz-select (ngModelChange)="onVariantSortOrderChanged($event)"
+              <nz-select
+                (ngModelChange)="onVariantSortOrderChanged($event)"
                 nzSize="small"
                 id="variant-sort-order"
                 name="sortBy"
-                style="width: 115px;"
+                style="width: 115px"
                 [(ngModel)]="sortBy">
-                <nz-option nzValue="NAME"
+                <nz-option
+                  nzValue="NAME"
                   nzLabel="Variant Name"
                   style="width: 100%"
                   selected></nz-option>
-                <nz-option nzValue="COORDINATE_START"
+                <nz-option
+                  nzValue="COORDINATE_START"
                   style="width: 100%"
                   nzLabel="Start Position"></nz-option>
-                <nz-option nzValue="COORDINATE_END"
+                <nz-option
+                  nzValue="COORDINATE_END"
                   style="width: 100%"
                   nzLabel="End Position"></nz-option>
               </nz-select>
@@ -111,30 +143,41 @@
         <nz-col nzSpan="24">
           <cvc-tag-list size="sm">
             <ng-container *ngFor="let v of variants">
-              <cvc-variant-tag *ngIf="v" [variant]="v"></cvc-variant-tag>
+              <cvc-variant-tag
+                *ngIf="v"
+                [variant]="v"></cvc-variant-tag>
             </ng-container>
           </cvc-tag-list>
         </nz-col>
       </nz-row>
       <ng-container *ngIf="pageInfo$ | ngrxPush as pageInfo">
-        <nz-row id="load-more-btn"
+        <nz-row
+          id="load-more-btn"
           *ngIf="pageInfo.hasNextPage && pageInfo.endCursor">
-          <button nz-button
+          <button
+            nz-button
             nzType="default"
             nzSize="small"
-            style="width: 95%;"
-            (click)="fetchMore(pageInfo.endCursor)">Load More
+            style="width: 95%"
+            (click)="fetchMore(pageInfo.endCursor)">
+            Load More
           </button>
-          <nz-select 
+          <nz-select
             [(ngModel)]="this.pageSize"
-            style="width: 5%;"
+            style="width: 5%"
             nzSize="small">
-            <nz-option nzLabel="50" [nzValue]="50"></nz-option>
-            <nz-option nzLabel="100" [nzValue]="100"></nz-option>
-            <nz-option nzLabel="300" [nzValue]="300"></nz-option>
+            <nz-option
+              nzLabel="50"
+              [nzValue]="50"></nz-option>
+            <nz-option
+              nzLabel="100"
+              [nzValue]="100"></nz-option>
+            <nz-option
+              nzLabel="300"
+              [nzValue]="300"></nz-option>
           </nz-select>
         </nz-row>
       </ng-container>
     </nz-card>
   </ng-container>
-</nz-spin>
\ No newline at end of file
+</nz-spin>
diff --git a/client/src/app/components/variants/variants-menu/variants-menu.component.ts b/client/src/app/components/variants/variants-menu/variants-menu.component.ts
index d476e52b2..4fb859785 100644
--- a/client/src/app/components/variants/variants-menu/variants-menu.component.ts
+++ b/client/src/app/components/variants/variants-menu/variants-menu.component.ts
@@ -12,13 +12,14 @@ import {
   MenuVariantTypeFragment,
   VariantTypesForFeatureGQL,
 } from '@app/generated/civic.apollo'
-import { map, debounceTime, distinctUntilChanged, filter, startWith } from 'rxjs/operators'
-import { Observable, Observer, Subject } from 'rxjs'
-import { Apollo, QueryRef } from 'apollo-angular'
+import { map, debounceTime, filter, startWith } from 'rxjs/operators'
+import { Observable, Subject } from 'rxjs'
+import { QueryRef } from 'apollo-angular'
 import { ApolloQueryResult } from '@apollo/client/core'
 import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy'
 import { isNonNulled } from 'rxjs-etc'
 import { getEntityColor } from '@app/core/utilities/get-entity-color'
+import { LinkableFeature } from '@app/components/features/feature-tag/feature-tag.component'
 
 @UntilDestroy()
 @Component({
@@ -27,38 +28,41 @@ import { getEntityColor } from '@app/core/utilities/get-entity-color'
   styleUrls: ['./variants-menu.component.less'],
 })
 export class CvcVariantsMenuComponent implements OnInit {
-  @Input() featureId?: number
-  @Input() featureName?: string
+  @Input() feature?: LinkableFeature
+  featureId?: number
 
-
-  menuVariants$?: Observable<Maybe<MenuVariantFragment>[]>;
-  menuVariantTypes$?: Observable<Maybe<MenuVariantTypeFragment>[]>;
-  totalVariants$?: Observable<number>;
-  queryRef$!: QueryRef<VariantsMenuQuery, VariantsMenuQueryVariables>;
-  pageInfo$?: Observable<PageInfo>;
-  loading$?: Observable<boolean>;
+  menuVariants$?: Observable<Maybe<MenuVariantFragment>[]>
+  menuVariantTypes$?: Observable<Maybe<MenuVariantTypeFragment>[]>
+  totalVariants$?: Observable<number>
+  queryRef$!: QueryRef<VariantsMenuQuery, VariantsMenuQueryVariables>
+  pageInfo$?: Observable<PageInfo>
+  loading$?: Observable<boolean>
 
   sortBy: VariantMenuSortColumns = VariantMenuSortColumns.Name
-  variantNameFilter: Maybe<string>;
-  variantTypeFilter: Maybe<MenuVariantTypeFragment[]> = [];
+  variantNameFilter: Maybe<string>
+  variantTypeFilter: Maybe<MenuVariantTypeFragment[]> = []
   hasNoVariantType: boolean = false
 
   private debouncedQuery = new Subject<void>()
   private result$!: Observable<ApolloQueryResult<VariantsMenuQuery>>
   connection$!: Observable<VariantConnection>
   private initialQueryVars!: VariantsMenuQueryVariables
-  pageSize = 50;
+  pageSize = 50
 
   iconColor = getEntityColor('VariantType')
 
-
-  constructor(private gql: VariantsMenuGQL, private variantTypeGql: VariantTypesForFeatureGQL) { }
+  constructor(
+    private gql: VariantsMenuGQL,
+    private variantTypeGql: VariantTypesForFeatureGQL
+  ) {}
 
   ngOnInit() {
-    if (this.featureId === undefined) {
-      throw new Error('Must pass a feature id into variant menu component.')
+    if (this.feature === undefined) {
+      throw new Error('Must pass a feature into variant menu component.')
     }
 
+    this.featureId = this.feature.id
+
     this.initialQueryVars = {
       featureId: this.featureId,
       first: this.pageSize,
@@ -68,14 +72,15 @@ export class CvcVariantsMenuComponent implements OnInit {
     this.result$ = this.queryRef$.valueChanges
 
     this.loading$ = this.result$.pipe(
-      map(({data, loading}) => (loading && !data) ),
+      map(({ data, loading }) => loading && !data),
       filter(isNonNulled),
       startWith(true)
-    );
+    )
 
-    this.connection$ = this.result$
-      .pipe(map(r => r.data?.variants),
-        filter(isNonNulled)) as Observable<VariantConnection>;
+    this.connection$ = this.result$.pipe(
+      map((r) => r.data?.variants),
+      filter(isNonNulled)
+    ) as Observable<VariantConnection>
 
     this.pageInfo$ = this.connection$.pipe(
       map((c) => c.pageInfo),
@@ -89,15 +94,13 @@ export class CvcVariantsMenuComponent implements OnInit {
     this.totalVariants$ = this.connection$.pipe(map((c) => c.totalCount))
 
     this.debouncedQuery
-      .pipe(debounceTime(500),
-        untilDestroyed(this))
-      .subscribe((_) => this.refresh());
+      .pipe(debounceTime(500), untilDestroyed(this))
+      .subscribe((_) => this.refresh())
 
     this.menuVariantTypes$ = this.variantTypeGql
-      .watch({featureId: this.featureId})
-      .valueChanges
-      .pipe(
-        map(c => c.data?.variantTypes.edges?.map((e) => e.node)),
+      .watch({ featureId: this.featureId })
+      .valueChanges.pipe(
+        map((c) => c.data?.variantTypes.edges?.map((e) => e.node)),
         filter(isNonNulled)
       )
   }
@@ -122,14 +125,14 @@ export class CvcVariantsMenuComponent implements OnInit {
 
   refresh() {
     if (this.featureId === undefined) {
-      throw new Error('Must pass a gene id into variant menu component.')
+      throw new Error('Must pass a feature id into variant menu component.')
     }
 
     this.queryRef$.refetch({
       featureId: this.featureId,
       variantName: this.variantNameFilter,
       hasNoVariantType: this.hasNoVariantType,
-      variantTypeIds: this.variantTypeFilter?.map(vt => vt.id),
+      variantTypeIds: this.variantTypeFilter?.map((vt) => vt.id),
       first: this.pageSize,
       sortBy: {
         column: this.sortBy,
diff --git a/client/src/app/components/variants/variants-menu/variants-menu.module.ts b/client/src/app/components/variants/variants-menu/variants-menu.module.ts
index f5618cc37..3b81f92a9 100644
--- a/client/src/app/components/variants/variants-menu/variants-menu.module.ts
+++ b/client/src/app/components/variants/variants-menu/variants-menu.module.ts
@@ -17,6 +17,7 @@ import { CvcVariantsMenuComponent } from './variants-menu.component'
 import { CvcVariantTypeTagModule } from '@app/components/variant-types/variant-type-tag/variant-type-tag.module'
 import { NzCheckboxModule } from 'ng-zorro-antd/checkbox'
 import { NzSpinModule } from 'ng-zorro-antd/spin'
+import { CvcFeatureTagModule } from '@app/components/features/feature-tag/feature-tag.module'
 
 @NgModule({
   declarations: [CvcVariantsMenuComponent],
@@ -39,6 +40,7 @@ import { NzSpinModule } from 'ng-zorro-antd/spin'
     CvcVariantTagModule,
     CvcTagListModule,
     CvcVariantTypeTagModule,
+    CvcFeatureTagModule,
   ],
   exports: [CvcVariantsMenuComponent],
 })
diff --git a/client/src/app/generated/civic.apollo.ts b/client/src/app/generated/civic.apollo.ts
index c732f1516..b48d55227 100644
--- a/client/src/app/generated/civic.apollo.ts
+++ b/client/src/app/generated/civic.apollo.ts
@@ -7519,9 +7519,9 @@ export type FeaturesSummaryQueryVariables = Exact<{
 }>;
 
 
-export type FeaturesSummaryQuery = { __typename: 'Query', feature?: { __typename: 'Feature', id: number, name: string, fullName?: string | undefined, featureInstance: { __typename: 'Gene', id: number, description: string, featureAliases: Array<string>, entrezId: number, name: string, myGeneInfoDetails?: any | undefined, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceUrl?: string | undefined, displayType: string, sourceType: SourceSource }> } } | undefined };
+export type FeaturesSummaryQuery = { __typename: 'Query', feature?: { __typename: 'Feature', id: number, name: string, fullName?: string | undefined, link: string, featureInstance: { __typename: 'Gene', id: number, description: string, featureAliases: Array<string>, entrezId: number, name: string, myGeneInfoDetails?: any | undefined, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceUrl?: string | undefined, displayType: string, sourceType: SourceSource }> } } | undefined };
 
-export type FeatureSummaryFieldsFragment = { __typename: 'Feature', id: number, name: string, fullName?: string | undefined, featureInstance: { __typename: 'Gene', id: number, description: string, featureAliases: Array<string>, entrezId: number, name: string, myGeneInfoDetails?: any | undefined, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceUrl?: string | undefined, displayType: string, sourceType: SourceSource }> } };
+export type FeatureSummaryFieldsFragment = { __typename: 'Feature', id: number, name: string, fullName?: string | undefined, link: string, featureInstance: { __typename: 'Gene', id: number, description: string, featureAliases: Array<string>, entrezId: number, name: string, myGeneInfoDetails?: any | undefined, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceUrl?: string | undefined, displayType: string, sourceType: SourceSource }> } };
 
 export type GeneSummaryFieldsFragment = { __typename: 'Gene', id: number, description: string, featureAliases: Array<string>, entrezId: number, name: string, myGeneInfoDetails?: any | undefined, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceUrl?: string | undefined, displayType: string, sourceType: SourceSource }> };
 
@@ -9780,6 +9780,7 @@ export const FeatureSummaryFieldsFragmentDoc = gql`
   id
   name
   fullName
+  link
   featureInstance {
     __typename
     ... on Gene {
diff --git a/client/src/app/views/features/features-detail/features-summary/features-summary.page.html b/client/src/app/views/features/features-detail/features-summary/features-summary.page.html
index d2b9edd2a..93abc9e52 100644
--- a/client/src/app/views/features/features-detail/features-summary/features-summary.page.html
+++ b/client/src/app/views/features/features-detail/features-summary/features-summary.page.html
@@ -14,9 +14,7 @@
             [featureId]="feature.id"></cvc-molecular-profile-menu>
         </nz-tab>
         <nz-tab nzTitle="Variants">
-          <cvc-variant-menu
-            [featureId]="feature.id"
-            [featureName]="feature.name"></cvc-variant-menu>
+          <cvc-variant-menu [feature]="feature"></cvc-variant-menu>
         </nz-tab>
       </nz-tabset>
     </nz-col>
diff --git a/client/src/app/views/features/features-detail/features-summary/features-summary.query.gql b/client/src/app/views/features/features-detail/features-summary/features-summary.query.gql
index c126494d0..4f4c1baf0 100644
--- a/client/src/app/views/features/features-detail/features-summary/features-summary.query.gql
+++ b/client/src/app/views/features/features-detail/features-summary/features-summary.query.gql
@@ -8,6 +8,7 @@ fragment FeatureSummaryFields on Feature{
   id
   name
   fullName
+  link
   featureInstance {
     __typename
     ... on Gene {

From 78b43b211be478bfad5b806c2438a75c42f80781 Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Mon, 29 Jan 2024 16:58:56 -0600
Subject: [PATCH 070/125] wip factors stubbed in

---
 server/app/models/features/factor.rb            | 1 +
 server/app/models/features/gene.rb              | 1 +
 server/db/migrate/20240126153659_add_factors.rb | 4 ++++
 3 files changed, 6 insertions(+)
 create mode 100644 server/db/migrate/20240126153659_add_factors.rb

diff --git a/server/app/models/features/factor.rb b/server/app/models/features/factor.rb
index 4841e6adb..db217cbf1 100644
--- a/server/app/models/features/factor.rb
+++ b/server/app/models/features/factor.rb
@@ -3,6 +3,7 @@ class Factor < ActiveRecord::Base
     include Subscribable
     include IsFeatureInstance
 
+    #TODO - move to feature?
     has_many :comment_mentions, foreign_key: :comment_id, class_name: 'EntityMention'
 
     def display_name
diff --git a/server/app/models/features/gene.rb b/server/app/models/features/gene.rb
index 6d360d579..3a9a22ddd 100644
--- a/server/app/models/features/gene.rb
+++ b/server/app/models/features/gene.rb
@@ -9,6 +9,7 @@ class Gene < ActiveRecord::Base
     #has_and_belongs_to_many :sources
     #has_and_belongs_to_many :gene_aliases
 
+    #TODO - move to feature?
     has_many :comment_mentions, foreign_key: :comment_id, class_name: 'EntityMention'
 
     def display_name
diff --git a/server/db/migrate/20240126153659_add_factors.rb b/server/db/migrate/20240126153659_add_factors.rb
new file mode 100644
index 000000000..e49ca1cfa
--- /dev/null
+++ b/server/db/migrate/20240126153659_add_factors.rb
@@ -0,0 +1,4 @@
+class AddFactors < ActiveRecord::Migration[6.1]
+  def change
+  end
+end

From e264c01fc2cdf6a7d01748e155c63f84dda74626 Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Mon, 29 Jan 2024 18:16:00 -0600
Subject: [PATCH 071/125] add solid_errors library for error monitoring

---
 .../viewer-button.component.html              |  5 ++++
 server/Gemfile                                |  2 ++
 server/Gemfile.lock                           |  3 +++
 server/config/routes.rb                       |  1 +
 ...240130000329_create_solid_errors_tables.rb | 25 ++++++++++++++++++
 server/db/schema.rb                           | 26 +++++++++++++++++--
 6 files changed, 60 insertions(+), 2 deletions(-)
 create mode 100644 server/db/migrate/20240130000329_create_solid_errors_tables.rb

diff --git a/client/src/app/components/layout/viewer-button/viewer-button.component.html b/client/src/app/components/layout/viewer-button/viewer-button.component.html
index 1ae978b94..5833f1ba1 100644
--- a/client/src/app/components/layout/viewer-button/viewer-button.component.html
+++ b/client/src/app/components/layout/viewer-button/viewer-button.component.html
@@ -169,6 +169,11 @@
             href="/admin">
             <a href="/admin"> Admin Console </a>
           </li>
+          <li
+            nz-menu-item
+            href="/errors">
+            <a href="/errors"> Error Monitoring </a>
+          </li>
           <li
             nz-menu-item
             href="/jobs">
diff --git a/server/Gemfile b/server/Gemfile
index 1a988533d..f1d5842ae 100644
--- a/server/Gemfile
+++ b/server/Gemfile
@@ -68,6 +68,8 @@ gem 'obo', '~> 0.1.5'
 
 gem 'activejob-null', '~> 0.0.1'
 
+gem "solid_errors", "~> 0.3.4"
+
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
   gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
diff --git a/server/Gemfile.lock b/server/Gemfile.lock
index 4ed9c801e..ff2dac44d 100644
--- a/server/Gemfile.lock
+++ b/server/Gemfile.lock
@@ -477,6 +477,8 @@ GEM
     solargraph-rails (1.1.0)
       activesupport
       solargraph
+    solid_errors (0.3.4)
+      rails (~> 7.0)
     sprockets (4.2.1)
       concurrent-ruby (~> 1.0)
       rack (>= 2.2.4, < 4)
@@ -582,6 +584,7 @@ DEPENDENCIES
   simplecov-lcov
   solargraph
   solargraph-rails
+  solid_errors (~> 0.3.4)
   trestle (~> 0.9.5)
   trestle-search (~> 0.4.3)
   typhoeus (~> 1.4.0)
diff --git a/server/config/routes.rb b/server/config/routes.rb
index 2ee489742..f6585f272 100644
--- a/server/config/routes.rb
+++ b/server/config/routes.rb
@@ -24,4 +24,5 @@
   require 'sidekiq/web'
   require 'sidekiq/cron/web'
   mount Sidekiq::Web, at: '/jobs', constraints: UserLoggedInConstraint.new
+  mount SolidErrors::Engine, at: "/errors", constraints: UserLoggedInConstraint.new
 end
diff --git a/server/db/migrate/20240130000329_create_solid_errors_tables.rb b/server/db/migrate/20240130000329_create_solid_errors_tables.rb
new file mode 100644
index 000000000..cac67ddac
--- /dev/null
+++ b/server/db/migrate/20240130000329_create_solid_errors_tables.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class CreateSolidErrorsTables < ActiveRecord::Migration[7.1]
+  def change
+    create_table :solid_errors do |t|
+      t.string :exception_class, null: false
+      t.string :message, null: false
+      t.string :severity, null: false
+      t.string :source
+      t.datetime :resolved_at, index: true
+
+      t.timestamps
+
+      t.index [:exception_class, :message, :severity, :source], unique: true, name: "solid_error_uniqueness_index"
+    end
+
+    create_table :solid_errors_occurrences do |t|
+      t.belongs_to :error, null: false, foreign_key: { to_table: :solid_errors }
+      t.text :backtrace
+      t.json :context
+
+      t.timestamps
+    end
+  end
+end
diff --git a/server/db/schema.rb b/server/db/schema.rb
index 798ffb0e3..9bfa28211 100644
--- a/server/db/schema.rb
+++ b/server/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.1].define(version: 2024_01_18_184730) do
+ActiveRecord::Schema[7.1].define(version: 2024_01_30_000329) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -681,6 +681,27 @@
     t.index ["comment_id"], name: "index_role_mentions_on_comment_id"
   end
 
+  create_table "solid_errors", force: :cascade do |t|
+    t.string "exception_class", null: false
+    t.string "message", null: false
+    t.string "severity", null: false
+    t.string "source"
+    t.datetime "resolved_at"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["exception_class", "message", "severity", "source"], name: "solid_error_uniqueness_index", unique: true
+    t.index ["resolved_at"], name: "index_solid_errors_on_resolved_at"
+  end
+
+  create_table "solid_errors_occurrences", force: :cascade do |t|
+    t.bigint "error_id", null: false
+    t.text "backtrace"
+    t.json "context"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["error_id"], name: "index_solid_errors_occurrences_on_error_id"
+  end
+
   create_table "source_suggestions", id: :serial, force: :cascade do |t|
     t.integer "source_id"
     t.integer "user_id"
@@ -713,7 +734,7 @@
     t.integer "source_type", null: false
     t.integer "asco_abstract_id"
     t.text "asco_presenter"
-    t.text "status", default: "fully_curated", null: false
+    t.boolean "fully_curated", default: false, null: false
     t.index ["asco_abstract_id"], name: "index_sources_on_asco_abstract_id"
     t.index ["asco_presenter"], name: "index_sources_on_asco_presenter"
     t.index ["citation_id"], name: "index_sources_on_citation_id"
@@ -989,6 +1010,7 @@
   add_foreign_key "regulatory_agencies", "countries"
   add_foreign_key "revisions", "revision_sets"
   add_foreign_key "role_mentions", "comments"
+  add_foreign_key "solid_errors_occurrences", "solid_errors", column: "error_id"
   add_foreign_key "source_suggestions", "diseases"
   add_foreign_key "source_suggestions", "molecular_profiles"
   add_foreign_key "subscriptions", "users"

From d543473bad81b4162609894acf441af05f9d4cc4 Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Tue, 30 Jan 2024 12:17:09 -0600
Subject: [PATCH 072/125] additional plumbing for factors, ncit api support

---
 client/src/app/generated/server.model.graphql |  245 ++-
 client/src/app/generated/server.schema.json   | 1831 +++++++++++++----
 .../app/graphql/types/entities/factor_type.rb |   11 +
 .../types/entities/ncit_details_type.rb       |   17 +
 .../graphql/types/feature_instance_type.rb    |    4 +-
 .../graphql/types/feature_instance_types.rb   |    1 +
 .../graphql/types/revisions/factor_fields.rb  |   17 +
 server/app/models/features/feature_alias.rb   |    9 +
 server/app/models/features/gene.rb            |    3 -
 .../input_adaptors/factor_input_adaptor.rb    |   30 +
 server/app/models/ncit_details.rb             |   49 +
 .../db/migrate/20240126153659_add_factors.rb  |    4 +
 server/db/schema.rb                           |  263 +--
 13 files changed, 1940 insertions(+), 544 deletions(-)
 create mode 100644 server/app/graphql/types/entities/factor_type.rb
 create mode 100644 server/app/graphql/types/entities/ncit_details_type.rb
 create mode 100644 server/app/graphql/types/revisions/factor_fields.rb
 create mode 100644 server/app/models/input_adaptors/factor_input_adaptor.rb
 create mode 100644 server/app/models/ncit_details.rb

diff --git a/client/src/app/generated/server.model.graphql b/client/src/app/generated/server.model.graphql
index 232095f37..3a72ae31f 100644
--- a/client/src/app/generated/server.model.graphql
+++ b/client/src/app/generated/server.model.graphql
@@ -2790,6 +2790,233 @@ enum EvidenceType {
   PROGNOSTIC
 }
 
+"""
+The Feature that a Variant can belong to
+"""
+type Factor implements Commentable & EventSubject & Flaggable & MolecularProfileComponent & WithRevisions {
+  """
+  List and filter comments.
+  """
+  comments(
+    """
+    Returns the elements in the list that come after the specified cursor.
+    """
+    after: String
+
+    """
+    Returns the elements in the list that come before the specified cursor.
+    """
+    before: String
+
+    """
+    Returns the first _n_ elements from the list.
+    """
+    first: Int
+
+    """
+    Returns the last _n_ elements from the list.
+    """
+    last: Int
+
+    """
+    Limit to comments that mention a certain entity
+    """
+    mentionedEntity: TaggableEntityInput
+
+    """
+    Limit to comments that mention a certain user role
+    """
+    mentionedRole: UserRole
+
+    """
+    Limit to comments that mention a certain user
+    """
+    mentionedUserId: Int
+
+    """
+    Limit to comments by a certain user
+    """
+    originatingUserId: Int
+
+    """
+    Sort order for the comments. Defaults to most recent.
+    """
+    sortBy: DateSort
+  ): CommentConnection!
+  description: String!
+
+  """
+  List and filter events for an object
+  """
+  events(
+    """
+    Returns the elements in the list that come after the specified cursor.
+    """
+    after: String
+
+    """
+    Returns the elements in the list that come before the specified cursor.
+    """
+    before: String
+    eventType: EventAction
+
+    """
+    Returns the first _n_ elements from the list.
+    """
+    first: Int
+
+    """
+    Returns the last _n_ elements from the list.
+    """
+    last: Int
+    organizationId: Int
+    originatingUserId: Int
+
+    """
+    Sort order for the events. Defaults to most recent.
+    """
+    sortBy: DateSort
+  ): EventConnection!
+  featureAliases: [String!]!
+  featureInstance: FeatureInstance!
+  flagged: Boolean!
+
+  """
+  List and filter flags.
+  """
+  flags(
+    """
+    Returns the elements in the list that come after the specified cursor.
+    """
+    after: String
+
+    """
+    Returns the elements in the list that come before the specified cursor.
+    """
+    before: String
+
+    """
+    Returns the first _n_ elements from the list.
+    """
+    first: Int
+
+    """
+    Limit to flags added by a certain user
+    """
+    flaggingUserId: Int
+
+    """
+    Returns the last _n_ elements from the list.
+    """
+    last: Int
+
+    """
+    Limit to flags resolved by a certain user
+    """
+    resolvingUserId: Int
+
+    """
+    Sort order for the flags. Defaults to most recent.
+    """
+    sortBy: DateSort
+
+    """
+    Limit to flags in a particular state
+    """
+    state: FlagState
+  ): FlagConnection!
+  fullName: String
+  id: Int!
+  lastAcceptedRevisionEvent: Event
+  lastCommentEvent: Event
+  lastSubmittedRevisionEvent: Event
+  link: String!
+  name: String!
+  ncitDetails: NcitDetails
+  ncitId: String
+
+  """
+  List and filter revisions.
+  """
+  revisions(
+    """
+    Returns the elements in the list that come after the specified cursor.
+    """
+    after: String
+
+    """
+    Returns the elements in the list that come before the specified cursor.
+    """
+    before: String
+
+    """
+    Limit to revisions on a particular field.
+    """
+    fieldName: String
+
+    """
+    Returns the first _n_ elements from the list.
+    """
+    first: Int
+
+    """
+    Returns the last _n_ elements from the list.
+    """
+    last: Int
+
+    """
+    Limit to revisions by a certain user
+    """
+    originatingUserId: Int
+
+    """
+    Limit to revisions suggested as part of a single Revision Set.
+    """
+    revisionSetId: Int
+
+    """
+    Sort order for the comments. Defaults to most recent.
+    """
+    sortBy: DateSort
+
+    """
+    Limit to revisions with a certain status
+    """
+    status: RevisionStatus
+  ): RevisionConnection!
+  sources: [Source!]!
+
+  """
+  List and filter variants.
+  """
+  variants(
+    """
+    Returns the elements in the list that come after the specified cursor.
+    """
+    after: String
+
+    """
+    Returns the elements in the list that come before the specified cursor.
+    """
+    before: String
+
+    """
+    Returns the first _n_ elements from the list.
+    """
+    first: Int
+
+    """
+    Returns the last _n_ elements from the list.
+    """
+    last: Int
+
+    """
+    Left anchored filtering for variant name and aliases.
+    """
+    name: String
+  ): VariantConnection!
+}
+
 type FdaCode {
   code: String!
   description: String!
@@ -3023,9 +3250,10 @@ type Feature implements Commentable & EventSubject & Flaggable & MolecularProfil
 """
 The specific type of a feature instance
 """
-union FeatureInstance = Gene
+union FeatureInstance = Factor | Gene
 
 enum FeatureInstanceTypes {
+  FACTOR
   GENE
 }
 
@@ -4991,6 +5219,21 @@ type NccnGuideline {
   name: String!
 }
 
+type NcitDefinition {
+  definition: String!
+  source: String!
+}
+
+type NcitDetails {
+  definitions: [NcitDefinition!]!
+  synonyms: [NcitSynonym!]!
+}
+
+type NcitSynonym {
+  name: String!
+  source: String!
+}
+
 type Notification {
   createdAt: ISO8601DateTime!
   event: Event!
diff --git a/client/src/app/generated/server.schema.json b/client/src/app/generated/server.schema.json
index 9385e6915..4741b142f 100644
--- a/client/src/app/generated/server.schema.json
+++ b/client/src/app/generated/server.schema.json
@@ -8543,6 +8543,11 @@
               "name": "EvidenceItem",
               "ofType": null
             },
+            {
+              "kind": "OBJECT",
+              "name": "Factor",
+              "ofType": null
+            },
             {
               "kind": "OBJECT",
               "name": "Feature",
@@ -11936,6 +11941,11 @@
               "name": "EvidenceItem",
               "ofType": null
             },
+            {
+              "kind": "OBJECT",
+              "name": "Factor",
+              "ofType": null
+            },
             {
               "kind": "OBJECT",
               "name": "Feature",
@@ -14000,50 +14010,7 @@
         },
         {
           "kind": "OBJECT",
-          "name": "FdaCode",
-          "description": null,
-          "fields": [
-            {
-              "name": "code",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "description",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            }
-          ],
-          "inputFields": null,
-          "interfaces": [],
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "OBJECT",
-          "name": "Feature",
+          "name": "Factor",
           "description": "The Feature that a Variant can belong to",
           "fields": [
             {
@@ -14565,6 +14532,30 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "ncitDetails",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "NcitDetails",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "ncitId",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "revisions",
               "description": "List and filter revisions.",
@@ -14823,191 +14814,13 @@
           "enumValues": null,
           "possibleTypes": null
         },
-        {
-          "kind": "UNION",
-          "name": "FeatureInstance",
-          "description": "The specific type of a feature instance",
-          "fields": null,
-          "inputFields": null,
-          "interfaces": null,
-          "enumValues": null,
-          "possibleTypes": [
-            {
-              "kind": "OBJECT",
-              "name": "Gene",
-              "ofType": null
-            }
-          ]
-        },
-        {
-          "kind": "ENUM",
-          "name": "FeatureInstanceTypes",
-          "description": null,
-          "fields": null,
-          "inputFields": null,
-          "interfaces": null,
-          "enumValues": [
-            {
-              "name": "GENE",
-              "description": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            }
-          ],
-          "possibleTypes": null
-        },
-        {
-          "kind": "INPUT_OBJECT",
-          "name": "FeaturesSort",
-          "description": null,
-          "fields": null,
-          "inputFields": [
-            {
-              "name": "column",
-              "description": "Available columns for sorting",
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "ENUM",
-                  "name": "FeaturesSortColumns",
-                  "ofType": null
-                }
-              },
-              "defaultValue": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "direction",
-              "description": "Sort direction",
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "ENUM",
-                  "name": "SortDirection",
-                  "ofType": null
-                }
-              },
-              "defaultValue": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            }
-          ],
-          "interfaces": null,
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "ENUM",
-          "name": "FeaturesSortColumns",
-          "description": null,
-          "fields": null,
-          "inputFields": null,
-          "interfaces": null,
-          "enumValues": [
-            {
-              "name": "featureName",
-              "description": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "therapyName",
-              "description": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "featureAlias",
-              "description": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "diseaseName",
-              "description": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "variantCount",
-              "description": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "evidenceItemCount",
-              "description": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "assertionCount",
-              "description": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "molecularProfileCount",
-              "description": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            }
-          ],
-          "possibleTypes": null
-        },
-        {
-          "kind": "OBJECT",
-          "name": "FieldName",
-          "description": null,
-          "fields": [
-            {
-              "name": "displayName",
-              "description": "The user facing representation of the field name.",
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "name",
-              "description": "The internal server representation of the field name.",
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            }
-          ],
-          "inputFields": null,
-          "interfaces": [],
-          "enumValues": null,
-          "possibleTypes": null
-        },
         {
           "kind": "OBJECT",
-          "name": "FieldValidationError",
+          "name": "FdaCode",
           "description": null,
           "fields": [
             {
-              "name": "error",
+              "name": "code",
               "description": null,
               "args": [],
               "type": {
@@ -15023,7 +14836,1021 @@
               "deprecationReason": null
             },
             {
-              "name": "fieldName",
+              "name": "description",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "Feature",
+          "description": "The Feature that a Variant can belong to",
+          "fields": [
+            {
+              "name": "comments",
+              "description": "List and filter comments.",
+              "args": [
+                {
+                  "name": "originatingUserId",
+                  "description": "Limit to comments by a certain user",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "sortBy",
+                  "description": "Sort order for the comments. Defaults to most recent.",
+                  "type": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "DateSort",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "mentionedUserId",
+                  "description": "Limit to comments that mention a certain user",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "mentionedRole",
+                  "description": "Limit to comments that mention a certain user role",
+                  "type": {
+                    "kind": "ENUM",
+                    "name": "UserRole",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "mentionedEntity",
+                  "description": "Limit to comments that mention a certain entity",
+                  "type": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "TaggableEntityInput",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "after",
+                  "description": "Returns the elements in the list that come after the specified cursor.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "before",
+                  "description": "Returns the elements in the list that come before the specified cursor.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "first",
+                  "description": "Returns the first _n_ elements from the list.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "last",
+                  "description": "Returns the last _n_ elements from the list.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                }
+              ],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "CommentConnection",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "description",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "events",
+              "description": "List and filter events for an object",
+              "args": [
+                {
+                  "name": "eventType",
+                  "description": null,
+                  "type": {
+                    "kind": "ENUM",
+                    "name": "EventAction",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "originatingUserId",
+                  "description": null,
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "organizationId",
+                  "description": null,
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "sortBy",
+                  "description": "Sort order for the events. Defaults to most recent.",
+                  "type": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "DateSort",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "after",
+                  "description": "Returns the elements in the list that come after the specified cursor.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "before",
+                  "description": "Returns the elements in the list that come before the specified cursor.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "first",
+                  "description": "Returns the first _n_ elements from the list.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "last",
+                  "description": "Returns the last _n_ elements from the list.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                }
+              ],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "EventConnection",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "featureAliases",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "SCALAR",
+                      "name": "String",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "featureInstance",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "UNION",
+                  "name": "FeatureInstance",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "flagged",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Boolean",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "flags",
+              "description": "List and filter flags.",
+              "args": [
+                {
+                  "name": "flaggingUserId",
+                  "description": "Limit to flags added by a certain user",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "resolvingUserId",
+                  "description": "Limit to flags resolved by a certain user",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "state",
+                  "description": "Limit to flags in a particular state",
+                  "type": {
+                    "kind": "ENUM",
+                    "name": "FlagState",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "sortBy",
+                  "description": "Sort order for the flags. Defaults to most recent.",
+                  "type": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "DateSort",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "after",
+                  "description": "Returns the elements in the list that come after the specified cursor.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "before",
+                  "description": "Returns the elements in the list that come before the specified cursor.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "first",
+                  "description": "Returns the first _n_ elements from the list.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "last",
+                  "description": "Returns the last _n_ elements from the list.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                }
+              ],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "FlagConnection",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "fullName",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "id",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "lastAcceptedRevisionEvent",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Event",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "lastCommentEvent",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Event",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "lastSubmittedRevisionEvent",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Event",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "link",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "name",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "revisions",
+              "description": "List and filter revisions.",
+              "args": [
+                {
+                  "name": "originatingUserId",
+                  "description": "Limit to revisions by a certain user",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "status",
+                  "description": "Limit to revisions with a certain status",
+                  "type": {
+                    "kind": "ENUM",
+                    "name": "RevisionStatus",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "sortBy",
+                  "description": "Sort order for the comments. Defaults to most recent.",
+                  "type": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "DateSort",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "fieldName",
+                  "description": "Limit to revisions on a particular field.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "revisionSetId",
+                  "description": "Limit to revisions suggested as part of a single Revision Set.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "after",
+                  "description": "Returns the elements in the list that come after the specified cursor.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "before",
+                  "description": "Returns the elements in the list that come before the specified cursor.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "first",
+                  "description": "Returns the first _n_ elements from the list.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "last",
+                  "description": "Returns the last _n_ elements from the list.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                }
+              ],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "RevisionConnection",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "sources",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "Source",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "variants",
+              "description": "List and filter variants.",
+              "args": [
+                {
+                  "name": "name",
+                  "description": "Left anchored filtering for variant name and aliases.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "after",
+                  "description": "Returns the elements in the list that come after the specified cursor.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "before",
+                  "description": "Returns the elements in the list that come before the specified cursor.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "first",
+                  "description": "Returns the first _n_ elements from the list.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "last",
+                  "description": "Returns the last _n_ elements from the list.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                }
+              ],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "VariantConnection",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [
+            {
+              "kind": "INTERFACE",
+              "name": "Flaggable",
+              "ofType": null
+            },
+            {
+              "kind": "INTERFACE",
+              "name": "EventSubject",
+              "ofType": null
+            },
+            {
+              "kind": "INTERFACE",
+              "name": "MolecularProfileComponent",
+              "ofType": null
+            },
+            {
+              "kind": "INTERFACE",
+              "name": "Commentable",
+              "ofType": null
+            },
+            {
+              "kind": "INTERFACE",
+              "name": "WithRevisions",
+              "ofType": null
+            }
+          ],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "UNION",
+          "name": "FeatureInstance",
+          "description": "The specific type of a feature instance",
+          "fields": null,
+          "inputFields": null,
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": [
+            {
+              "kind": "OBJECT",
+              "name": "Factor",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "Gene",
+              "ofType": null
+            }
+          ]
+        },
+        {
+          "kind": "ENUM",
+          "name": "FeatureInstanceTypes",
+          "description": null,
+          "fields": null,
+          "inputFields": null,
+          "interfaces": null,
+          "enumValues": [
+            {
+              "name": "GENE",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "FACTOR",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "FeaturesSort",
+          "description": null,
+          "fields": null,
+          "inputFields": [
+            {
+              "name": "column",
+              "description": "Available columns for sorting",
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "ENUM",
+                  "name": "FeaturesSortColumns",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "direction",
+              "description": "Sort direction",
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "ENUM",
+                  "name": "SortDirection",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "ENUM",
+          "name": "FeaturesSortColumns",
+          "description": null,
+          "fields": null,
+          "inputFields": null,
+          "interfaces": null,
+          "enumValues": [
+            {
+              "name": "featureName",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "therapyName",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "featureAlias",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "diseaseName",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "variantCount",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "evidenceItemCount",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "assertionCount",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "molecularProfileCount",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "FieldName",
+          "description": null,
+          "fields": [
+            {
+              "name": "displayName",
+              "description": "The user facing representation of the field name.",
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "name",
+              "description": "The internal server representation of the field name.",
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "FieldValidationError",
+          "description": null,
+          "fields": [
+            {
+              "name": "error",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "fieldName",
               "description": null,
               "args": [],
               "type": {
@@ -16187,6 +17014,11 @@
               "name": "EvidenceItem",
               "ofType": null
             },
+            {
+              "kind": "OBJECT",
+              "name": "Factor",
+              "ofType": null
+            },
             {
               "kind": "OBJECT",
               "name": "Feature",
@@ -21160,6 +21992,11 @@
           "interfaces": null,
           "enumValues": null,
           "possibleTypes": [
+            {
+              "kind": "OBJECT",
+              "name": "Factor",
+              "ofType": null
+            },
             {
               "kind": "OBJECT",
               "name": "Feature",
@@ -23727,7 +24564,283 @@
               "deprecationReason": null
             },
             {
-              "name": "mutationtasterScore",
+              "name": "mutationtasterScore",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "SCALAR",
+                      "name": "Float",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "myVariantInfoId",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "phastcons100way",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "Float",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "phastcons30way",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "Float",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "phyloP100way",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "Float",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "phyloP30way",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "Float",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "polyphen2HdivPrediction",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "SCALAR",
+                      "name": "String",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "polyphen2HdivScore",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "SCALAR",
+                      "name": "Float",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "polyphen2HvarPrediction",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "SCALAR",
+                      "name": "String",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "polyphen2HvarScore",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "SCALAR",
+                      "name": "Float",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "proveanPrediction",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "SCALAR",
+                      "name": "String",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "proveanScore",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "SCALAR",
+                      "name": "Float",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "revelScore",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "SCALAR",
+                    "name": "Float",
+                    "ofType": null
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "siftPrediction",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "SCALAR",
+                      "name": "String",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "siftScore",
               "description": null,
               "args": [],
               "type": {
@@ -23751,59 +24864,7 @@
               "deprecationReason": null
             },
             {
-              "name": "myVariantInfoId",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "phastcons100way",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "SCALAR",
-                "name": "Float",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "phastcons30way",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "SCALAR",
-                "name": "Float",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "phyloP100way",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "SCALAR",
-                "name": "Float",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "phyloP30way",
+              "name": "siphy",
               "description": null,
               "args": [],
               "type": {
@@ -23815,7 +24876,7 @@
               "deprecationReason": null
             },
             {
-              "name": "polyphen2HdivPrediction",
+              "name": "snpeffSnpEffect",
               "description": null,
               "args": [],
               "type": {
@@ -23839,31 +24900,7 @@
               "deprecationReason": null
             },
             {
-              "name": "polyphen2HdivScore",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "SCALAR",
-                      "name": "Float",
-                      "ofType": null
-                    }
-                  }
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "polyphen2HvarPrediction",
+              "name": "snpeffSnpImpact",
               "description": null,
               "args": [],
               "type": {
@@ -23885,161 +24922,106 @@
               },
               "isDeprecated": false,
               "deprecationReason": null
-            },
-            {
-              "name": "polyphen2HvarScore",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "SCALAR",
-                      "name": "Float",
-                      "ofType": null
-                    }
-                  }
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "NccnGuideline",
+          "description": null,
+          "fields": [
             {
-              "name": "proveanPrediction",
+              "name": "id",
               "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "SCALAR",
-                      "name": "String",
-                      "ofType": null
-                    }
-                  }
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "proveanScore",
+              "name": "name",
               "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "SCALAR",
-                      "name": "Float",
-                      "ofType": null
-                    }
-                  }
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "revelScore",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "LIST",
-                "name": null,
-                "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "SCALAR",
-                    "name": "Float",
-                    "ofType": null
-                  }
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
-            },
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "NcitDefinition",
+          "description": null,
+          "fields": [
             {
-              "name": "siftPrediction",
+              "name": "definition",
               "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "SCALAR",
-                      "name": "String",
-                      "ofType": null
-                    }
-                  }
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "siftScore",
+              "name": "source",
               "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "SCALAR",
-                      "name": "Float",
-                      "ofType": null
-                    }
-                  }
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
-            },
-            {
-              "name": "siphy",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "SCALAR",
-                "name": "Float",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "NcitDetails",
+          "description": null,
+          "fields": [
             {
-              "name": "snpeffSnpEffect",
+              "name": "definitions",
               "description": null,
               "args": [],
               "type": {
@@ -24052,8 +25034,8 @@
                     "kind": "NON_NULL",
                     "name": null,
                     "ofType": {
-                      "kind": "SCALAR",
-                      "name": "String",
+                      "kind": "OBJECT",
+                      "name": "NcitDefinition",
                       "ofType": null
                     }
                   }
@@ -24063,7 +25045,7 @@
               "deprecationReason": null
             },
             {
-              "name": "snpeffSnpImpact",
+              "name": "synonyms",
               "description": null,
               "args": [],
               "type": {
@@ -24076,8 +25058,8 @@
                     "kind": "NON_NULL",
                     "name": null,
                     "ofType": {
-                      "kind": "SCALAR",
-                      "name": "String",
+                      "kind": "OBJECT",
+                      "name": "NcitSynonym",
                       "ofType": null
                     }
                   }
@@ -24094,11 +25076,11 @@
         },
         {
           "kind": "OBJECT",
-          "name": "NccnGuideline",
+          "name": "NcitSynonym",
           "description": null,
           "fields": [
             {
-              "name": "id",
+              "name": "name",
               "description": null,
               "args": [],
               "type": {
@@ -24106,7 +25088,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "Int",
+                  "name": "String",
                   "ofType": null
                 }
               },
@@ -24114,7 +25096,7 @@
               "deprecationReason": null
             },
             {
-              "name": "name",
+              "name": "source",
               "description": null,
               "args": [],
               "type": {
@@ -44248,6 +45230,11 @@
               "name": "EvidenceItem",
               "ofType": null
             },
+            {
+              "kind": "OBJECT",
+              "name": "Factor",
+              "ofType": null
+            },
             {
               "kind": "OBJECT",
               "name": "Feature",
diff --git a/server/app/graphql/types/entities/factor_type.rb b/server/app/graphql/types/entities/factor_type.rb
new file mode 100644
index 000000000..a02f0bbb6
--- /dev/null
+++ b/server/app/graphql/types/entities/factor_type.rb
@@ -0,0 +1,11 @@
+module Types::Entities
+  class FactorType < Types::Entities::FeatureType
+
+    field :ncit_id, String, null: true
+    field :ncit_details, Types::Entities::NcitDetailsType, null: true
+
+    def ncit_details
+      NcitDetails.new(object).response
+    end
+  end
+end
diff --git a/server/app/graphql/types/entities/ncit_details_type.rb b/server/app/graphql/types/entities/ncit_details_type.rb
new file mode 100644
index 000000000..b30b3a403
--- /dev/null
+++ b/server/app/graphql/types/entities/ncit_details_type.rb
@@ -0,0 +1,17 @@
+module Types::Entities
+  class NcitSynonym < Types::BaseObject
+    field :name, String, null: false
+    field :source, String, null: false
+  end
+
+  class NcitDefinition < Types::BaseObject
+    field :definition, String, null: false
+    field :source, String, null: false
+  end
+
+  class NcitDetailsType < Types::BaseObject
+    field :synonyms, [NcitSynonym], null: false
+    field :definitions, [NcitDefinition], null: false
+  end
+end
+
diff --git a/server/app/graphql/types/feature_instance_type.rb b/server/app/graphql/types/feature_instance_type.rb
index 987084730..fa7692148 100644
--- a/server/app/graphql/types/feature_instance_type.rb
+++ b/server/app/graphql/types/feature_instance_type.rb
@@ -1,11 +1,13 @@
 module Types
   class FeatureInstanceType < Types::BaseUnion
     description 'The specific type of a feature instance'
-    possible_types "Types::Entities::GeneType"
+    possible_types "Types::Entities::GeneType", "Types::Entities::FactorType"
 
     def self.resolve_type(object, context)
       if object.is_a?(Features::Gene)
         Types::Entities::GeneType
+      elsif object.is_a?(Features::Factor)
+        Types::Entities::FactorType
       else
         raise StandardError.new("Unknown feature instance type #{object.class}")
       end
diff --git a/server/app/graphql/types/feature_instance_types.rb b/server/app/graphql/types/feature_instance_types.rb
index 6de09d93e..992d22eb4 100644
--- a/server/app/graphql/types/feature_instance_types.rb
+++ b/server/app/graphql/types/feature_instance_types.rb
@@ -1,5 +1,6 @@
 module Types
   class FeatureInstanceTypes < Types::BaseEnum
     value 'GENE', value: 'Features::Gene'
+    value 'FACTOR', value: 'Features::Factor'
   end
 end
diff --git a/server/app/graphql/types/revisions/factor_fields.rb b/server/app/graphql/types/revisions/factor_fields.rb
new file mode 100644
index 000000000..a41d7c26d
--- /dev/null
+++ b/server/app/graphql/types/revisions/factor_fields.rb
@@ -0,0 +1,17 @@
+module Types::Revisions
+  class FactorFields < Types::BaseInputObject
+    description 'Fields on a Factor that curators may propose revisions to.'
+    argument :description, Types::NullableValueInputType.for(GraphQL::Types::String), required: true,
+      description: "The Factor's description/summary text."
+    argument :name, Types::NullableValueInputType.for(GraphQL::Types::String), required: true,
+      description: "The Factor's display name."
+    argument :name, Types::NullableValueInputType.for(GraphQL::Types::String), required: true,
+      description: "The Factor's full name if applicable."
+    argument :ncit_id, Types::NullableValueInputType.for(GraphQL::Types::String), required: true,
+      description: "NCI Thesaurus concept ID for this Factor"
+    argument :source_ids, [Int], required: true,
+      description: "Source IDs cited by the Factor's summary."
+    argument :aliases, [String], required: true,
+      description: 'List of aliases or alternate names for the Factor.'
+  end
+end
diff --git a/server/app/models/features/feature_alias.rb b/server/app/models/features/feature_alias.rb
index ad58b3455..7362dfa2c 100644
--- a/server/app/models/features/feature_alias.rb
+++ b/server/app/models/features/feature_alias.rb
@@ -1,3 +1,12 @@
 class Features::FeatureAlias < ActiveRecord::Base
+  validates :name, presence: true, uniqueness: true
   has_and_belongs_to_many :features
+
+  def self.get_or_create_by_name(name)
+    if found = self.where('lower(name) = ?', name.downcase).first
+      found
+    else
+      self.create!(name: name)
+    end
+  end
 end
diff --git a/server/app/models/features/gene.rb b/server/app/models/features/gene.rb
index 3a9a22ddd..5147816db 100644
--- a/server/app/models/features/gene.rb
+++ b/server/app/models/features/gene.rb
@@ -3,11 +3,8 @@ class Gene < ActiveRecord::Base
     include Subscribable
     include IsFeatureInstance
 
-    #has_many :variants
     has_many :variant_groups
     has_many :source_suggestions
-    #has_and_belongs_to_many :sources
-    #has_and_belongs_to_many :gene_aliases
 
     #TODO - move to feature?
     has_many :comment_mentions, foreign_key: :comment_id, class_name: 'EntityMention'
diff --git a/server/app/models/input_adaptors/factor_input_adaptor.rb b/server/app/models/input_adaptors/factor_input_adaptor.rb
new file mode 100644
index 000000000..a8a7e0157
--- /dev/null
+++ b/server/app/models/input_adaptors/factor_input_adaptor.rb
@@ -0,0 +1,30 @@
+#Conversion from a GraphQL FactorFields input object to Gene model type
+class InputAdaptors::FactorInputAdaptor
+  attr_reader :input
+
+  def initialize(factor_input_object: )
+    @input = factor_input_object
+  end
+
+  def perform
+    f = Features::Factor.new(
+      ncit_id: input.ncit_id
+    )
+
+    Feature.new(
+      description: input.description,
+      source_ids: input.source_ids,
+      name: input.name,
+      full_name: input.full_name,
+      feature_alias_ids: get_alias_ids,
+      feature_instance: f
+    )
+  end
+
+  private
+  def get_alias_ids
+    input.aliases.map do |a|
+      FeatureAliases.get_or_create_by_name(a).id
+    end
+  end
+end
diff --git a/server/app/models/ncit_details.rb b/server/app/models/ncit_details.rb
new file mode 100644
index 000000000..f4d3875d1
--- /dev/null
+++ b/server/app/models/ncit_details.rb
@@ -0,0 +1,49 @@
+class NcitDetails
+  attr_reader :term
+
+  def initialize(term)
+    @term = term
+  end
+
+  def response
+    Rails.cache.fetch(cache_key(term), expires_in: 24.hours) do
+      if term.ncit_id.present?
+        resp = make_request(term)
+        parse_response(resp)
+      else
+        nil
+      end
+    end
+  rescue StandardError
+    nil
+  end
+
+
+  def parse_response(resp)
+    p = JSON.parse(resp)
+    if p.size > 1
+      # ambiguous result somehow
+      return nil
+    end
+
+    data = p.first
+    if data.nil?
+      # didn't find a match
+      return nil
+    end
+
+    return {
+      synonyms: data["synonyms"] || [],
+      definitions: data["definitions"] || []
+    }
+  end
+
+  def make_request(term)
+    url = "https://api-evsrest.nci.nih.gov/api/v1/concept/ncit?include=summary&list=#{term.ncit_id}"
+    Scrapers::Util.make_get_request(url)
+  end
+
+  def cache_key(term)
+    "ncit_details#{term.id}_#{term.updated_at}"
+  end
+end
diff --git a/server/db/migrate/20240126153659_add_factors.rb b/server/db/migrate/20240126153659_add_factors.rb
index e49ca1cfa..2b443b602 100644
--- a/server/db/migrate/20240126153659_add_factors.rb
+++ b/server/db/migrate/20240126153659_add_factors.rb
@@ -1,4 +1,8 @@
 class AddFactors < ActiveRecord::Migration[6.1]
   def change
+    create_table :factors do |t|
+      t.text :ncit_id
+      t.timestamps
+    end
   end
 end
diff --git a/server/db/schema.rb b/server/db/schema.rb
index d5ea4a3ed..43b468af3 100644
--- a/server/db/schema.rb
+++ b/server/db/schema.rb
@@ -10,7 +10,8 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.1].define(version: 2024_01_12_212453) do
+ActiveRecord::Schema.define(version: 2024_01_30_000329) do
+
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -32,7 +33,7 @@
     t.string "record_type", null: false
     t.bigint "record_id", null: false
     t.bigint "blob_id", null: false
-    t.datetime "created_at", precision: nil, null: false
+    t.datetime "created_at", null: false
     t.index ["blob_id"], name: "index_active_storage_attachments_on_blob_id"
     t.index ["record_type", "record_id", "name", "blob_id"], name: "index_active_storage_attachments_uniqueness", unique: true
   end
@@ -44,8 +45,8 @@
     t.text "metadata"
     t.string "service_name", null: false
     t.bigint "byte_size", null: false
-    t.string "checksum", null: false
-    t.datetime "created_at", precision: nil, null: false
+    t.string "checksum"
+    t.datetime "created_at", null: false
     t.index ["key"], name: "index_active_storage_blobs_on_key", unique: true
   end
 
@@ -61,8 +62,8 @@
     t.bigint "organization_id"
     t.string "subject_type", null: false
     t.bigint "subject_id", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
     t.text "verbiage"
     t.text "note"
     t.index ["organization_id"], name: "index_activities_on_organization_id"
@@ -75,15 +76,15 @@
     t.string "entity_type", null: false
     t.bigint "entity_id", null: false
     t.bigint "activity_id", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
     t.index ["activity_id"], name: "index_activity_linked_entities_on_activity_id"
     t.index ["entity_type", "entity_id"], name: "index_activity_linked_entities_on_entity"
   end
 
   create_table "advanced_searches", id: :serial, force: :cascade do |t|
-    t.datetime "created_at", precision: nil
-    t.datetime "updated_at", precision: nil
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.text "params"
     t.text "search_type"
     t.text "token"
@@ -93,16 +94,16 @@
   create_table "affiliations", id: false, force: :cascade do |t|
     t.bigint "user_id"
     t.bigint "organization_id"
-    t.datetime "created_at", precision: nil, null: false
-    t.datetime "updated_at", precision: nil, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["organization_id"], name: "index_affiliations_on_organization_id"
     t.index ["user_id"], name: "index_affiliations_on_user_id"
   end
 
   create_table "assertions", id: :serial, force: :cascade do |t|
     t.text "description"
-    t.datetime "created_at", precision: nil
-    t.datetime "updated_at", precision: nil
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.boolean "deleted", default: false
     t.text "status", default: "submitted", null: false
     t.integer "nccn_guideline_old"
@@ -132,8 +133,8 @@
   create_table "assertions_clingen_codes", id: false, force: :cascade do |t|
     t.bigint "assertion_id", null: false
     t.bigint "clingen_code_id", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
     t.index ["assertion_id"], name: "index_assertions_clingen_codes_on_assertion_id"
     t.index ["clingen_code_id", "assertion_id"], name: "idx_clingencodes_assertions"
   end
@@ -179,7 +180,7 @@
     t.string "comment"
     t.string "remote_address"
     t.string "request_uuid"
-    t.datetime "created_at", precision: nil
+    t.datetime "created_at"
     t.index ["action"], name: "index_audits_on_action"
     t.index ["associated_id", "associated_type"], name: "associated_index"
     t.index ["auditable_id", "auditable_type"], name: "auditable_index"
@@ -192,24 +193,24 @@
     t.integer "user_id", null: false
     t.string "provider", null: false
     t.string "uid", null: false
-    t.datetime "created_at", precision: nil
-    t.datetime "updated_at", precision: nil
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.index ["user_id"], name: "index_authorizations_on_user_id"
   end
 
   create_table "authors", id: :serial, force: :cascade do |t|
     t.text "last_name"
     t.text "fore_name"
-    t.datetime "created_at", precision: nil
-    t.datetime "updated_at", precision: nil
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
   create_table "authors_sources", id: false, force: :cascade do |t|
     t.integer "source_id"
     t.integer "author_id"
     t.integer "author_position"
-    t.datetime "created_at", precision: nil
-    t.datetime "updated_at", precision: nil
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.index ["author_id", "source_id"], name: "index_authors_sources_on_author_id_and_source_id"
     t.index ["source_id", "author_id"], name: "idx_author_source_id"
     t.index ["source_id"], name: "index_authors_sources_on_source_id"
@@ -220,8 +221,8 @@
     t.integer "user_id"
     t.text "tier"
     t.text "message"
-    t.datetime "created_at", precision: nil
-    t.datetime "updated_at", precision: nil
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.index ["badge_id", "user_id"], name: "index_badge_awards_on_badge_id_and_user_id"
     t.index ["user_id", "badge_id"], name: "index_badge_awards_on_user_id_and_badge_id"
   end
@@ -230,8 +231,8 @@
     t.integer "user_id"
     t.integer "badge_id"
     t.string "redemption_code"
-    t.datetime "created_at", precision: nil, null: false
-    t.datetime "updated_at", precision: nil, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["badge_id"], name: "index_badge_claims_on_badge_id"
     t.index ["user_id"], name: "index_badge_claims_on_user_id"
   end
@@ -240,8 +241,8 @@
     t.text "name", null: false
     t.text "description", null: false
     t.text "additional_fields"
-    t.datetime "created_at", precision: nil
-    t.datetime "updated_at", precision: nil
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.text "display_name"
     t.index ["name"], name: "index_badges_on_name"
   end
@@ -257,8 +258,8 @@
     t.text "nct_id"
     t.text "name"
     t.text "description"
-    t.datetime "created_at", precision: nil
-    t.datetime "updated_at", precision: nil
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.index ["nct_id"], name: "index_clinical_trials_on_nct_id"
   end
 
@@ -273,8 +274,8 @@
 
   create_table "clinvar_entries", id: :serial, force: :cascade do |t|
     t.string "clinvar_id"
-    t.datetime "created_at", precision: nil
-    t.datetime "updated_at", precision: nil
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.index ["clinvar_id"], name: "index_clinvar_entries_on_clinvar_id"
   end
 
@@ -294,8 +295,8 @@
     t.integer "commentable_id"
     t.integer "user_id"
     t.string "role", default: "comments"
-    t.datetime "created_at", precision: nil
-    t.datetime "updated_at", precision: nil
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.index ["commentable_id"], name: "index_comments_on_commentable_id"
     t.index ["commentable_type"], name: "index_comments_on_commentable_type"
     t.index ["user_id"], name: "index_comments_on_user_id"
@@ -305,8 +306,8 @@
     t.integer "user_id", null: false
     t.boolean "coi_present", null: false
     t.text "coi_statement"
-    t.datetime "created_at", precision: nil, null: false
-    t.datetime "updated_at", precision: nil, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
   create_table "countries", id: :serial, force: :cascade do |t|
@@ -321,8 +322,8 @@
   create_table "definitions", id: :serial, force: :cascade do |t|
     t.string "term", null: false
     t.text "text", null: false
-    t.datetime "created_at", precision: nil
-    t.datetime "updated_at", precision: nil
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.index ["term"], name: "index_definitions_on_term"
   end
 
@@ -341,8 +342,8 @@
   create_table "diseases", id: :serial, force: :cascade do |t|
     t.text "doid"
     t.string "display_name", null: false
-    t.datetime "created_at", precision: nil
-    t.datetime "updated_at", precision: nil
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.string "name"
     t.boolean "deprecated", default: false, null: false
     t.index ["name"], name: "index_diseases_on_name"
@@ -350,8 +351,8 @@
 
   create_table "domain_expert_tags", id: :serial, force: :cascade do |t|
     t.text "description"
-    t.datetime "created_at", precision: nil
-    t.datetime "updated_at", precision: nil
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.string "domain_of_expertise_type"
     t.integer "domain_of_expertise_id"
     t.integer "user_id"
@@ -361,8 +362,8 @@
   end
 
   create_table "entity_mentions", force: :cascade do |t|
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
     t.string "entity_type"
     t.bigint "entity_id"
     t.bigint "comment_id"
@@ -371,8 +372,8 @@
   end
 
   create_table "events", id: :serial, force: :cascade do |t|
-    t.datetime "created_at", precision: nil
-    t.datetime "updated_at", precision: nil
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.text "action"
     t.text "description"
     t.integer "originating_user_id"
@@ -399,8 +400,8 @@
     t.text "description", null: false
     t.integer "disease_id"
     t.integer "source_id"
-    t.datetime "created_at", precision: nil
-    t.datetime "updated_at", precision: nil
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.integer "rating"
     t.string "status"
     t.string "variant_hgvs"
@@ -410,7 +411,7 @@
     t.integer "evidence_direction"
     t.integer "significance"
     t.boolean "deleted", default: false
-    t.datetime "deleted_at", precision: nil
+    t.datetime "deleted_at"
     t.integer "therapy_interaction_type"
     t.boolean "flagged", default: false, null: false
     t.bigint "molecular_profile_id"
@@ -441,10 +442,16 @@
     t.index ["therapy_id", "evidence_item_id"], name: "idx_therapy_eid_bridge_table"
   end
 
+  create_table "factors", force: :cascade do |t|
+    t.text "ncit_id"
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+  end
+
   create_table "feature_aliases", force: :cascade do |t|
     t.text "name", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
     t.index ["name"], name: "index_feature_aliases_on_name"
   end
 
@@ -459,8 +466,8 @@
   create_table "features", force: :cascade do |t|
     t.text "name", null: false
     t.text "description"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
     t.string "feature_instance_type", null: false
     t.bigint "feature_instance_id", null: false
     t.boolean "flagged", default: false, null: false
@@ -481,8 +488,8 @@
     t.string "flaggable_type"
     t.integer "flaggable_id"
     t.text "state"
-    t.datetime "created_at", precision: nil
-    t.datetime "updated_at", precision: nil
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.index ["flaggable_type", "flaggable_id"], name: "index_flags_on_flaggable_type_and_flaggable_id"
     t.index ["flagging_user_id"], name: "index_flags_on_flagging_user_id"
     t.index ["resolving_user_id"], name: "index_flags_on_resolving_user_id"
@@ -506,11 +513,11 @@
     t.string "name", null: false
     t.text "description", null: false
     t.text "official_name", null: false
-    t.datetime "created_at", precision: nil
-    t.datetime "updated_at", precision: nil
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.text "clinical_description"
     t.boolean "deleted", default: false
-    t.datetime "deleted_at", precision: nil
+    t.datetime "deleted_at"
     t.boolean "flagged", default: false, null: false
     t.index "char_length((name)::text)", name: "gene_name_size_idx"
     t.index ["deleted"], name: "index_genes_on_deleted"
@@ -520,15 +527,15 @@
   create_table "genes_sources", id: false, force: :cascade do |t|
     t.integer "gene_id", null: false
     t.integer "source_id", null: false
-    t.datetime "created_at", precision: nil
-    t.datetime "updated_at", precision: nil
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.index ["gene_id", "source_id"], name: "index_genes_sources_on_gene_id_and_source_id"
   end
 
   create_table "hgvs_descriptions", id: :serial, force: :cascade do |t|
     t.text "description"
-    t.datetime "created_at", precision: nil
-    t.datetime "updated_at", precision: nil
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.index ["description"], name: "index_hgvs_descriptions_on_description"
   end
 
@@ -555,8 +562,8 @@
 
   create_table "molecular_profiles", force: :cascade do |t|
     t.string "name"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
     t.text "description"
     t.boolean "flagged", default: false, null: false
     t.float "evidence_score", null: false
@@ -569,8 +576,8 @@
   create_table "molecular_profiles_sources", id: false, force: :cascade do |t|
     t.bigint "molecular_profile_id", null: false
     t.bigint "source_id", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
     t.index ["molecular_profile_id", "source_id"], name: "idx_mp_source_id"
   end
 
@@ -592,8 +599,8 @@
     t.boolean "seen", default: false
     t.integer "type"
     t.text "description"
-    t.datetime "created_at", precision: nil
-    t.datetime "updated_at", precision: nil
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.index ["created_at"], name: "index_notifications_on_created_at"
     t.index ["notified_user_id"], name: "index_notifications_on_notified_user_id"
   end
@@ -601,7 +608,7 @@
   create_table "ontologies", id: :serial, force: :cascade do |t|
     t.string "name"
     t.string "version"
-    t.datetime "import_date", precision: nil
+    t.datetime "import_date"
     t.string "permalink_format"
     t.string "civic_class"
     t.string "id_name"
@@ -612,9 +619,9 @@
     t.text "url"
     t.text "description"
     t.integer "parent_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.datetime "most_recent_activity_timestamp", precision: nil
+    t.datetime "created_at", precision: 6
+    t.datetime "updated_at", precision: 6
+    t.datetime "most_recent_activity_timestamp"
     t.index ["most_recent_activity_timestamp"], name: "index_organizations_on_most_recent_activity_timestamp"
   end
 
@@ -627,8 +634,8 @@
 
   create_table "pipeline_types", id: :serial, force: :cascade do |t|
     t.text "name", null: false
-    t.datetime "created_at", precision: nil
-    t.datetime "updated_at", precision: nil
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.index ["name"], name: "index_pipeline_types_on_name"
   end
 
@@ -649,8 +656,8 @@
   end
 
   create_table "revision_sets", force: :cascade do |t|
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
   end
 
   create_table "revisions", force: :cascade do |t|
@@ -660,8 +667,8 @@
     t.text "field_name", null: false
     t.jsonb "current_value"
     t.jsonb "suggested_value"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
     t.uuid "revisionset_id"
     t.integer "revision_set_id"
     t.index ["created_at"], name: "index_revisions_on_created_at"
@@ -675,19 +682,40 @@
 
   create_table "role_mentions", force: :cascade do |t|
     t.integer "role", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
     t.bigint "comment_id"
     t.index ["comment_id"], name: "index_role_mentions_on_comment_id"
   end
 
+  create_table "solid_errors", force: :cascade do |t|
+    t.string "exception_class", null: false
+    t.string "message", null: false
+    t.string "severity", null: false
+    t.string "source"
+    t.datetime "resolved_at", precision: 6
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+    t.index ["exception_class", "message", "severity", "source"], name: "solid_error_uniqueness_index", unique: true
+    t.index ["resolved_at"], name: "index_solid_errors_on_resolved_at"
+  end
+
+  create_table "solid_errors_occurrences", force: :cascade do |t|
+    t.bigint "error_id", null: false
+    t.text "backtrace"
+    t.json "context"
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+    t.index ["error_id"], name: "index_solid_errors_occurrences_on_error_id"
+  end
+
   create_table "source_suggestions", id: :serial, force: :cascade do |t|
     t.integer "source_id"
     t.integer "user_id"
     t.text "initial_comment"
     t.text "status"
-    t.datetime "created_at", precision: nil
-    t.datetime "updated_at", precision: nil
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.text "reason"
     t.integer "disease_id"
     t.bigint "molecular_profile_id"
@@ -698,8 +726,8 @@
     t.string "citation_id", null: false
     t.string "study_type"
     t.text "citation"
-    t.datetime "created_at", precision: nil
-    t.datetime "updated_at", precision: nil
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.text "abstract"
     t.boolean "open_access"
     t.text "pmc_id"
@@ -713,7 +741,7 @@
     t.integer "source_type", null: false
     t.integer "asco_abstract_id"
     t.text "asco_presenter"
-    t.text "status", default: "fully_curated", null: false
+    t.boolean "fully_curated", default: false, null: false
     t.index ["asco_abstract_id"], name: "index_sources_on_asco_abstract_id"
     t.index ["asco_presenter"], name: "index_sources_on_asco_presenter"
     t.index ["citation_id"], name: "index_sources_on_citation_id"
@@ -722,8 +750,8 @@
   create_table "sources_variant_groups", id: false, force: :cascade do |t|
     t.integer "variant_group_id", null: false
     t.integer "source_id", null: false
-    t.datetime "created_at", precision: nil
-    t.datetime "updated_at", precision: nil
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
   create_table "subscriptions", id: :serial, force: :cascade do |t|
@@ -731,8 +759,8 @@
     t.string "subscribable_type"
     t.integer "subscribable_id"
     t.string "type"
-    t.datetime "created_at", precision: nil
-    t.datetime "updated_at", precision: nil
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.text "action_type"
     t.text "action_class"
     t.index ["action_type", "action_class"], name: "index_subscriptions_on_action_type_and_action_class"
@@ -746,8 +774,8 @@
     t.integer "moderated_id"
     t.integer "user_id", null: false
     t.string "status", default: "new", null: false
-    t.datetime "created_at", precision: nil
-    t.datetime "updated_at", precision: nil
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.index ["created_at"], name: "index_suggested_changes_on_created_at"
     t.index ["moderated_id", "moderated_type"], name: "index_suggested_changes_on_moderated_id_and_moderated_type"
     t.index ["status"], name: "index_suggested_changes_on_status"
@@ -756,8 +784,8 @@
 
   create_table "therapies", id: :serial, force: :cascade do |t|
     t.string "name", null: false
-    t.datetime "created_at", precision: nil
-    t.datetime "updated_at", precision: nil
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.text "ncit_id"
     t.boolean "deprecated", default: false, null: false
     t.index ["name"], name: "index_therapies_on_name"
@@ -778,13 +806,13 @@
 
   create_table "tsv_releases", id: :serial, force: :cascade do |t|
     t.text "path", null: false
-    t.datetime "created_at", precision: nil
-    t.datetime "updated_at", precision: nil
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
   create_table "user_mentions", force: :cascade do |t|
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
     t.bigint "user_id"
     t.bigint "comment_id"
     t.index ["comment_id"], name: "index_user_mentions_on_comment_id"
@@ -796,14 +824,14 @@
     t.string "name"
     t.string "url"
     t.string "username"
-    t.datetime "created_at", precision: nil
-    t.datetime "updated_at", precision: nil
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.string "orcid"
     t.integer "area_of_expertise"
     t.boolean "deleted", default: false
-    t.datetime "deleted_at", precision: nil
+    t.datetime "deleted_at"
     t.integer "role", default: 0
-    t.datetime "last_seen_at", precision: nil
+    t.datetime "last_seen_at"
     t.text "twitter_handle"
     t.text "facebook_profile"
     t.text "linkedin_profile"
@@ -813,7 +841,7 @@
     t.boolean "signup_complete"
     t.integer "country_id"
     t.integer "most_recent_organization_id"
-    t.datetime "most_recent_activity_timestamp", precision: nil
+    t.datetime "most_recent_activity_timestamp"
     t.index ["country_id"], name: "index_users_on_country_id"
     t.index ["deleted"], name: "index_users_on_deleted"
     t.index ["last_seen_at"], name: "index_users_on_last_seen_at"
@@ -836,18 +864,18 @@
   create_table "variant_group_variants", id: false, force: :cascade do |t|
     t.integer "variant_id", null: false
     t.integer "variant_group_id", null: false
-    t.datetime "created_at", precision: nil
-    t.datetime "updated_at", precision: nil
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.index ["variant_id", "variant_group_id"], name: "index_variant_group_variants_on_variant_id_and_variant_group_id"
   end
 
   create_table "variant_groups", id: :serial, force: :cascade do |t|
     t.string "name", null: false
     t.text "description"
-    t.datetime "created_at", precision: nil
-    t.datetime "updated_at", precision: nil
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.boolean "deleted", default: false
-    t.datetime "deleted_at", precision: nil
+    t.datetime "deleted_at"
     t.boolean "flagged", default: false, null: false
     t.index ["deleted"], name: "index_variant_groups_on_deleted"
   end
@@ -857,8 +885,8 @@
     t.text "display_name", null: false
     t.text "description", null: false
     t.text "soid", null: false
-    t.datetime "created_at", precision: nil
-    t.datetime "updated_at", precision: nil
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.integer "parent_id"
     t.integer "lft"
     t.integer "rgt"
@@ -870,18 +898,18 @@
   create_table "variant_types_variants", id: false, force: :cascade do |t|
     t.integer "variant_id", null: false
     t.integer "variant_type_id", null: false
-    t.datetime "created_at", precision: nil
-    t.datetime "updated_at", precision: nil
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.index ["variant_id", "variant_type_id"], name: "index_variant_types_variants_on_variant_id_and_variant_type_id"
   end
 
   create_table "variants", id: :serial, force: :cascade do |t|
     t.integer "gene_id", null: false
     t.string "name", null: false
-    t.datetime "created_at", precision: nil
-    t.datetime "updated_at", precision: nil
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.boolean "deleted", default: false
-    t.datetime "deleted_at", precision: nil
+    t.datetime "deleted_at"
     t.text "genome_build"
     t.text "chromosome"
     t.integer "start"
@@ -924,8 +952,8 @@
 
   create_table "view_last_updated_timestamps", force: :cascade do |t|
     t.text "view_name", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
     t.index ["view_name"], name: "index_view_last_updated_timestamps_on_view_name"
   end
 
@@ -989,6 +1017,7 @@
   add_foreign_key "regulatory_agencies", "countries"
   add_foreign_key "revisions", "revision_sets"
   add_foreign_key "role_mentions", "comments"
+  add_foreign_key "solid_errors_occurrences", "solid_errors", column: "error_id"
   add_foreign_key "source_suggestions", "diseases"
   add_foreign_key "source_suggestions", "molecular_profiles"
   add_foreign_key "subscriptions", "users"

From 384246995b463727ef5b2a75d9b973fa144238f3 Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Tue, 30 Jan 2024 14:25:55 -0600
Subject: [PATCH 073/125] begin frontend work on factors

---
 .../factor-summary/factor-summary.page.html   |  96 +++++++
 .../factor-summary/factor-summary.page.less   |   9 +
 .../factor-summary/factor-summary.page.ts     |  56 ++++
 .../genes/genes-summary/genes-summary.page.ts |   8 +-
 .../src/app/generated/civic.apollo-helpers.ts |  53 ++++
 client/src/app/generated/civic.apollo.ts      | 245 ++++++++++++++----
 .../src/app/generated/civic.possible-types.ts |   6 +
 client/src/app/generated/server.model.graphql |   6 +-
 client/src/app/generated/server.schema.json   |  30 +--
 .../features-summary.module.ts                |   2 +
 .../features-summary.page.html                |  13 +-
 .../features-summary.query.gql                |  29 +++
 .../mutations/suggest_factor_revision.rb      |  82 ++++++
 .../graphql/types/entities/feature_type.rb    |   2 +-
 server/app/models/features/factor.rb          |   6 +-
 server/app/models/ncit_details.rb             |   2 +-
 16 files changed, 562 insertions(+), 83 deletions(-)
 create mode 100644 client/src/app/components/factors/factor-summary/factor-summary.page.html
 create mode 100644 client/src/app/components/factors/factor-summary/factor-summary.page.less
 create mode 100644 client/src/app/components/factors/factor-summary/factor-summary.page.ts
 create mode 100644 server/app/graphql/mutations/suggest_factor_revision.rb

diff --git a/client/src/app/components/factors/factor-summary/factor-summary.page.html b/client/src/app/components/factors/factor-summary/factor-summary.page.html
new file mode 100644
index 000000000..6954cde6a
--- /dev/null
+++ b/client/src/app/components/factors/factor-summary/factor-summary.page.html
@@ -0,0 +1,96 @@
+<nz-row [nzGutter]="[8,16]">
+  <nz-col nzSpan="12">
+    <!-- LEFT COLUMN -->
+    <nz-row [nzGutter]="[8,8]">
+      <!-- factor description, sources block -->
+      <nz-col nzSpan="24">
+        <!-- description, sources -->
+        <nz-descriptions
+          nzLayout="vertical"
+          nzSize="small"
+          nzBordered="true"
+          [nzColumn]="1">
+          <!-- description -->
+          <nz-descriptions-item nzTitle="Description">
+            <p
+              *ngIf="factor.description; else noDescription"
+              nz-typography
+              nzEllipsis
+              nzExpandable
+              [nzEllipsisRows]="8">
+              {{ factor.description }}
+            </p>
+
+            <!-- noDescription Tpl -->
+            <ng-template #noDescription>
+              <cvc-empty-revisable notification="No description provided">
+              </cvc-empty-revisable>
+            </ng-template>
+          </nz-descriptions-item>
+        </nz-descriptions>
+      </nz-col>
+
+      <!-- sources, aliases, resource block -->
+      <nz-col nzSpan="24">
+        <nz-descriptions
+          nzLayout="horizontal"
+          nzSize="small"
+          [nzColumn]="1"
+          nzBordered="true">
+          <!-- sources -->
+          <nz-descriptions-item nzTitle="Sources">
+            <ng-container *ngIf="factor.sources.length > 0; else noSources">
+              <cvc-tag-list>
+                <cvc-source-tag
+                  *ngFor="let source of factor.sources"
+                  [source]="source"></cvc-source-tag>
+              </cvc-tag-list>
+            </ng-container>
+            <ng-template #noSources>
+              <span
+                nz-typography
+                nzType="secondary"
+                >None specified</span
+              >
+            </ng-template>
+          </nz-descriptions-item>
+
+          <!-- aliases -->
+          <nz-descriptions-item
+            nzTitle="Aliases"
+            *ngIf="factor.featureAliases.length > 0; else noAliases">
+            <nz-tag *ngFor="let alias of factor.featureAliases"
+              >{{ alias }}</nz-tag
+            >
+          </nz-descriptions-item>
+          <ng-template #noAliases>
+            <span
+              nz-typography
+              nzType="secondary"
+              >None specified</span
+            >
+          </ng-template>
+
+          <!-- resource links -->
+          <nz-descriptions-item
+            *ngIf="factor.ncitId"
+            nzTitle="Resources">
+            <cvc-tag-list>
+              <cvc-link-tag
+                [href]="'https://ncithesaurus.nci.nih.gov/ncitbrowser/ConceptReport.jsp?dictionary=NCI_Thesaurus&ns=ncit&code=' + factor.ncitId"
+                [tooltip]="'View ' + factor.name + ' in the NCI Thesaurus'">
+                NCIt
+              </cvc-link-tag>
+            </cvc-tag-list>
+          </nz-descriptions-item>
+        </nz-descriptions>
+      </nz-col>
+    </nz-row>
+  </nz-col>
+
+  <!-- last revision submitted/accepted, mygeneinfo col -->
+  <nz-col nzSpan="12">
+    <!-- ncit info -->
+    NCI STUFF HERE
+  </nz-col>
+</nz-row>
diff --git a/client/src/app/components/factors/factor-summary/factor-summary.page.less b/client/src/app/components/factors/factor-summary/factor-summary.page.less
new file mode 100644
index 000000000..b2848ee08
--- /dev/null
+++ b/client/src/app/components/factors/factor-summary/factor-summary.page.less
@@ -0,0 +1,9 @@
+@import "themes/overrides/descriptions-overrides.less";
+:host {
+  display: block;
+}
+
+nz-space,
+nz-space-item {
+  width: 100%;
+}
diff --git a/client/src/app/components/factors/factor-summary/factor-summary.page.ts b/client/src/app/components/factors/factor-summary/factor-summary.page.ts
new file mode 100644
index 000000000..65e6f386a
--- /dev/null
+++ b/client/src/app/components/factors/factor-summary/factor-summary.page.ts
@@ -0,0 +1,56 @@
+import { CommonModule } from '@angular/common'
+import { Component, Input, OnInit } from '@angular/core'
+import { CvcEmptyRevisableModule } from '@app/components/shared/empty-revisable/empty-revisable.module'
+import { CvcLinkTagModule } from '@app/components/shared/link-tag/link-tag.module'
+import { CvcTagListModule } from '@app/components/shared/tag-list/tag-list.module'
+import { CvcSourceTagModule } from '@app/components/sources/source-tag/source-tag.module'
+
+import {
+  FactorSummaryFieldsFragment,
+  SubscribableEntities,
+  SubscribableInput,
+} from '@app/generated/civic.apollo'
+import { NzDescriptionsModule } from 'ng-zorro-antd/descriptions'
+import { NzGridModule } from 'ng-zorro-antd/grid'
+import { NzSpaceModule } from 'ng-zorro-antd/space'
+import { NzTagModule } from 'ng-zorro-antd/tag'
+import { NzTypographyModule } from 'ng-zorro-antd/typography'
+
+@Component({
+  standalone: true,
+  selector: 'cvc-factor-summary',
+  templateUrl: './factor-summary.page.html',
+  styleUrls: ['./factor-summary.page.less'],
+  imports: [
+    CommonModule,
+    NzGridModule,
+    NzDescriptionsModule,
+    NzTypographyModule,
+    NzSpaceModule,
+    NzTagModule,
+
+    CvcEmptyRevisableModule,
+    CvcTagListModule,
+    CvcSourceTagModule,
+    CvcLinkTagModule,
+  ],
+})
+export class FactorSummaryComponent implements OnInit {
+  @Input() factor!: FactorSummaryFieldsFragment
+  @Input() featureId!: number
+
+  subscribableEntity?: SubscribableInput
+
+  ngOnInit() {
+    if (this.factor == undefined) {
+      throw new Error('Must pass a Factor into factor summary')
+    } else if (this.featureId === undefined) {
+      throw new Error('Must pass a feature id into factor summary')
+    } else {
+      this.subscribableEntity = {
+        id: this.featureId,
+        entityType: SubscribableEntities.Feature,
+      }
+    }
+  }
+}
diff --git a/client/src/app/components/genes/genes-summary/genes-summary.page.ts b/client/src/app/components/genes/genes-summary/genes-summary.page.ts
index 557ac7746..c38442f2d 100644
--- a/client/src/app/components/genes/genes-summary/genes-summary.page.ts
+++ b/client/src/app/components/genes/genes-summary/genes-summary.page.ts
@@ -13,16 +13,18 @@ import {
 })
 export class GenesSummaryPage implements OnInit {
   @Input() gene!: GeneSummaryFieldsFragment
+  @Input() featureId!: number
 
   subscribableEntity?: SubscribableInput
 
   ngOnInit() {
     if (this.gene == undefined) {
       throw new Error('Must pass a Gene into gene summary')
-    }
-    else {
+    } else if (this.featureId === undefined) {
+      throw new Error('Must pass a feature id into factor summary')
+    } else {
       this.subscribableEntity = {
-        id: this.gene.id,
+        id: this.featureId,
         entityType: SubscribableEntities.Feature,
       }
     }
diff --git a/client/src/app/generated/civic.apollo-helpers.ts b/client/src/app/generated/civic.apollo-helpers.ts
index 0059daa74..d47e451a7 100644
--- a/client/src/app/generated/civic.apollo-helpers.ts
+++ b/client/src/app/generated/civic.apollo-helpers.ts
@@ -775,6 +775,28 @@ export type EvidenceItemsByTypeFieldPolicy = {
 	predisposingCount?: FieldPolicy<any> | FieldReadFunction<any>,
 	prognosticCount?: FieldPolicy<any> | FieldReadFunction<any>
 };
+export type FactorKeySpecifier = ('comments' | 'description' | 'events' | 'featureAliases' | 'featureInstance' | 'flagged' | 'flags' | 'fullName' | 'id' | 'lastAcceptedRevisionEvent' | 'lastCommentEvent' | 'lastSubmittedRevisionEvent' | 'link' | 'name' | 'ncitDetails' | 'ncitId' | 'revisions' | 'sources' | 'variants' | FactorKeySpecifier)[];
+export type FactorFieldPolicy = {
+	comments?: FieldPolicy<any> | FieldReadFunction<any>,
+	description?: FieldPolicy<any> | FieldReadFunction<any>,
+	events?: FieldPolicy<any> | FieldReadFunction<any>,
+	featureAliases?: FieldPolicy<any> | FieldReadFunction<any>,
+	featureInstance?: FieldPolicy<any> | FieldReadFunction<any>,
+	flagged?: FieldPolicy<any> | FieldReadFunction<any>,
+	flags?: FieldPolicy<any> | FieldReadFunction<any>,
+	fullName?: FieldPolicy<any> | FieldReadFunction<any>,
+	id?: FieldPolicy<any> | FieldReadFunction<any>,
+	lastAcceptedRevisionEvent?: FieldPolicy<any> | FieldReadFunction<any>,
+	lastCommentEvent?: FieldPolicy<any> | FieldReadFunction<any>,
+	lastSubmittedRevisionEvent?: FieldPolicy<any> | FieldReadFunction<any>,
+	link?: FieldPolicy<any> | FieldReadFunction<any>,
+	name?: FieldPolicy<any> | FieldReadFunction<any>,
+	ncitDetails?: FieldPolicy<any> | FieldReadFunction<any>,
+	ncitId?: FieldPolicy<any> | FieldReadFunction<any>,
+	revisions?: FieldPolicy<any> | FieldReadFunction<any>,
+	sources?: FieldPolicy<any> | FieldReadFunction<any>,
+	variants?: FieldPolicy<any> | FieldReadFunction<any>
+};
 export type FdaCodeKeySpecifier = ('code' | 'description' | FdaCodeKeySpecifier)[];
 export type FdaCodeFieldPolicy = {
 	code?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -1266,6 +1288,21 @@ export type NccnGuidelineFieldPolicy = {
 	id?: FieldPolicy<any> | FieldReadFunction<any>,
 	name?: FieldPolicy<any> | FieldReadFunction<any>
 };
+export type NcitDefinitionKeySpecifier = ('definition' | 'source' | NcitDefinitionKeySpecifier)[];
+export type NcitDefinitionFieldPolicy = {
+	definition?: FieldPolicy<any> | FieldReadFunction<any>,
+	source?: FieldPolicy<any> | FieldReadFunction<any>
+};
+export type NcitDetailsKeySpecifier = ('definitions' | 'synonyms' | NcitDetailsKeySpecifier)[];
+export type NcitDetailsFieldPolicy = {
+	definitions?: FieldPolicy<any> | FieldReadFunction<any>,
+	synonyms?: FieldPolicy<any> | FieldReadFunction<any>
+};
+export type NcitSynonymKeySpecifier = ('name' | 'source' | NcitSynonymKeySpecifier)[];
+export type NcitSynonymFieldPolicy = {
+	name?: FieldPolicy<any> | FieldReadFunction<any>,
+	source?: FieldPolicy<any> | FieldReadFunction<any>
+};
 export type NotificationKeySpecifier = ('createdAt' | 'event' | 'id' | 'notifiedUser' | 'originatingUser' | 'seen' | 'subscription' | 'type' | 'updatedAt' | NotificationKeySpecifier)[];
 export type NotificationFieldPolicy = {
 	createdAt?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -2368,6 +2405,10 @@ export type StrictTypedTypePolicies = {
 		keyFields?: false | EvidenceItemsByTypeKeySpecifier | (() => undefined | EvidenceItemsByTypeKeySpecifier),
 		fields?: EvidenceItemsByTypeFieldPolicy,
 	},
+	Factor?: Omit<TypePolicy, "fields" | "keyFields"> & {
+		keyFields?: false | FactorKeySpecifier | (() => undefined | FactorKeySpecifier),
+		fields?: FactorFieldPolicy,
+	},
 	FdaCode?: Omit<TypePolicy, "fields" | "keyFields"> & {
 		keyFields?: false | FdaCodeKeySpecifier | (() => undefined | FdaCodeKeySpecifier),
 		fields?: FdaCodeFieldPolicy,
@@ -2540,6 +2581,18 @@ export type StrictTypedTypePolicies = {
 		keyFields?: false | NccnGuidelineKeySpecifier | (() => undefined | NccnGuidelineKeySpecifier),
 		fields?: NccnGuidelineFieldPolicy,
 	},
+	NcitDefinition?: Omit<TypePolicy, "fields" | "keyFields"> & {
+		keyFields?: false | NcitDefinitionKeySpecifier | (() => undefined | NcitDefinitionKeySpecifier),
+		fields?: NcitDefinitionFieldPolicy,
+	},
+	NcitDetails?: Omit<TypePolicy, "fields" | "keyFields"> & {
+		keyFields?: false | NcitDetailsKeySpecifier | (() => undefined | NcitDetailsKeySpecifier),
+		fields?: NcitDetailsFieldPolicy,
+	},
+	NcitSynonym?: Omit<TypePolicy, "fields" | "keyFields"> & {
+		keyFields?: false | NcitSynonymKeySpecifier | (() => undefined | NcitSynonymKeySpecifier),
+		fields?: NcitSynonymFieldPolicy,
+	},
 	Notification?: Omit<TypePolicy, "fields" | "keyFields"> & {
 		keyFields?: false | NotificationKeySpecifier | (() => undefined | NotificationKeySpecifier),
 		fields?: NotificationFieldPolicy,
diff --git a/client/src/app/generated/civic.apollo.ts b/client/src/app/generated/civic.apollo.ts
index b48d55227..221b25165 100644
--- a/client/src/app/generated/civic.apollo.ts
+++ b/client/src/app/generated/civic.apollo.ts
@@ -1774,6 +1774,99 @@ export enum EvidenceType {
   Prognostic = 'PROGNOSTIC'
 }
 
+/** The Feature that a Variant can belong to */
+export type Factor = Commentable & EventSubject & Flaggable & MolecularProfileComponent & WithRevisions & {
+  __typename: 'Factor';
+  /** List and filter comments. */
+  comments: CommentConnection;
+  description?: Maybe<Scalars['String']>;
+  /** List and filter events for an object */
+  events: EventConnection;
+  featureAliases: Array<Scalars['String']>;
+  featureInstance: FeatureInstance;
+  flagged: Scalars['Boolean'];
+  /** List and filter flags. */
+  flags: FlagConnection;
+  fullName?: Maybe<Scalars['String']>;
+  id: Scalars['Int'];
+  lastAcceptedRevisionEvent?: Maybe<Event>;
+  lastCommentEvent?: Maybe<Event>;
+  lastSubmittedRevisionEvent?: Maybe<Event>;
+  link: Scalars['String'];
+  name: Scalars['String'];
+  ncitDetails?: Maybe<NcitDetails>;
+  ncitId?: Maybe<Scalars['String']>;
+  /** List and filter revisions. */
+  revisions: RevisionConnection;
+  sources: Array<Source>;
+  /** List and filter variants. */
+  variants: VariantConnection;
+};
+
+
+/** The Feature that a Variant can belong to */
+export type FactorCommentsArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  first?: InputMaybe<Scalars['Int']>;
+  last?: InputMaybe<Scalars['Int']>;
+  mentionedEntity?: InputMaybe<TaggableEntityInput>;
+  mentionedRole?: InputMaybe<UserRole>;
+  mentionedUserId?: InputMaybe<Scalars['Int']>;
+  originatingUserId?: InputMaybe<Scalars['Int']>;
+  sortBy?: InputMaybe<DateSort>;
+};
+
+
+/** The Feature that a Variant can belong to */
+export type FactorEventsArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  eventType?: InputMaybe<EventAction>;
+  first?: InputMaybe<Scalars['Int']>;
+  last?: InputMaybe<Scalars['Int']>;
+  organizationId?: InputMaybe<Scalars['Int']>;
+  originatingUserId?: InputMaybe<Scalars['Int']>;
+  sortBy?: InputMaybe<DateSort>;
+};
+
+
+/** The Feature that a Variant can belong to */
+export type FactorFlagsArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  first?: InputMaybe<Scalars['Int']>;
+  flaggingUserId?: InputMaybe<Scalars['Int']>;
+  last?: InputMaybe<Scalars['Int']>;
+  resolvingUserId?: InputMaybe<Scalars['Int']>;
+  sortBy?: InputMaybe<DateSort>;
+  state?: InputMaybe<FlagState>;
+};
+
+
+/** The Feature that a Variant can belong to */
+export type FactorRevisionsArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  fieldName?: InputMaybe<Scalars['String']>;
+  first?: InputMaybe<Scalars['Int']>;
+  last?: InputMaybe<Scalars['Int']>;
+  originatingUserId?: InputMaybe<Scalars['Int']>;
+  revisionSetId?: InputMaybe<Scalars['Int']>;
+  sortBy?: InputMaybe<DateSort>;
+  status?: InputMaybe<RevisionStatus>;
+};
+
+
+/** The Feature that a Variant can belong to */
+export type FactorVariantsArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  first?: InputMaybe<Scalars['Int']>;
+  last?: InputMaybe<Scalars['Int']>;
+  name?: InputMaybe<Scalars['String']>;
+};
+
 export type FdaCode = {
   __typename: 'FdaCode';
   code: Scalars['String'];
@@ -1785,7 +1878,7 @@ export type Feature = Commentable & EventSubject & Flaggable & MolecularProfileC
   __typename: 'Feature';
   /** List and filter comments. */
   comments: CommentConnection;
-  description: Scalars['String'];
+  description?: Maybe<Scalars['String']>;
   /** List and filter events for an object */
   events: EventConnection;
   featureAliases: Array<Scalars['String']>;
@@ -1872,9 +1965,10 @@ export type FeatureVariantsArgs = {
 };
 
 /** The specific type of a feature instance */
-export type FeatureInstance = Gene;
+export type FeatureInstance = Factor | Gene;
 
 export enum FeatureInstanceTypes {
+  Factor = 'FACTOR',
   Gene = 'GENE'
 }
 
@@ -2078,7 +2172,7 @@ export type Gene = Commentable & EventSubject & Flaggable & MolecularProfileComp
   __typename: 'Gene';
   /** List and filter comments. */
   comments: CommentConnection;
-  description: Scalars['String'];
+  description?: Maybe<Scalars['String']>;
   entrezId: Scalars['Int'];
   /** List and filter events for an object */
   events: EventConnection;
@@ -3096,6 +3190,24 @@ export type NccnGuideline = {
   name: Scalars['String'];
 };
 
+export type NcitDefinition = {
+  __typename: 'NcitDefinition';
+  definition: Scalars['String'];
+  source: Scalars['String'];
+};
+
+export type NcitDetails = {
+  __typename: 'NcitDetails';
+  definitions: Array<NcitDefinition>;
+  synonyms: Array<NcitSynonym>;
+};
+
+export type NcitSynonym = {
+  __typename: 'NcitSynonym';
+  name: Scalars['String'];
+  source: Scalars['String'];
+};
+
 export type Notification = {
   __typename: 'Notification';
   createdAt: Scalars['ISO8601DateTime'];
@@ -5979,41 +6091,41 @@ export type ActivityFeedQueryVariables = Exact<{
 }>;
 
 
-export type ActivityFeedQuery = { __typename: 'Query', activities: { __typename: 'ActivityInterfaceConnection', pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, edges: Array<{ __typename: 'ActivityInterfaceEdge', cursor: string, node?: { __typename: 'AcceptRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CommentActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CreateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CreateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'DeprecateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'DeprecateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'FlagEntityActivity', id: number, verbiage: string, createdAt: any, flag: { __typename: 'Flag', id: number, name: string, link: string }, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ModerateAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ModerateEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'RejectRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ResolveFlagActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SubmitAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SubmitEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SuggestRevisionSetActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SuggestSourceActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'UpdateSourceSuggestionStatusActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | undefined }> } };
+export type ActivityFeedQuery = { __typename: 'Query', activities: { __typename: 'ActivityInterfaceConnection', pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, edges: Array<{ __typename: 'ActivityInterfaceEdge', cursor: string, node?: { __typename: 'AcceptRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CommentActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CreateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CreateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'DeprecateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'DeprecateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'FlagEntityActivity', id: number, verbiage: string, createdAt: any, flag: { __typename: 'Flag', id: number, name: string, link: string }, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ModerateAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ModerateEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'RejectRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ResolveFlagActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SubmitAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SubmitEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SuggestRevisionSetActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SuggestSourceActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'UpdateSourceSuggestionStatusActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | undefined }> } };
 
-export type ActivityFeedFragment = { __typename: 'ActivityInterfaceConnection', pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, edges: Array<{ __typename: 'ActivityInterfaceEdge', cursor: string, node?: { __typename: 'AcceptRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CommentActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CreateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CreateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'DeprecateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'DeprecateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'FlagEntityActivity', id: number, verbiage: string, createdAt: any, flag: { __typename: 'Flag', id: number, name: string, link: string }, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ModerateAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ModerateEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'RejectRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ResolveFlagActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SubmitAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SubmitEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SuggestRevisionSetActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SuggestSourceActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'UpdateSourceSuggestionStatusActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | undefined }> };
+export type ActivityFeedFragment = { __typename: 'ActivityInterfaceConnection', pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, edges: Array<{ __typename: 'ActivityInterfaceEdge', cursor: string, node?: { __typename: 'AcceptRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CommentActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CreateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CreateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'DeprecateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'DeprecateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'FlagEntityActivity', id: number, verbiage: string, createdAt: any, flag: { __typename: 'Flag', id: number, name: string, link: string }, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ModerateAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ModerateEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'RejectRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ResolveFlagActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SubmitAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SubmitEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SuggestRevisionSetActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SuggestSourceActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'UpdateSourceSuggestionStatusActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | undefined }> };
 
-type ActivityFeedNode_AcceptRevisionsActivity_Fragment = { __typename: 'AcceptRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_AcceptRevisionsActivity_Fragment = { __typename: 'AcceptRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_CommentActivity_Fragment = { __typename: 'CommentActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_CommentActivity_Fragment = { __typename: 'CommentActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_CreateComplexMolecularProfileActivity_Fragment = { __typename: 'CreateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_CreateComplexMolecularProfileActivity_Fragment = { __typename: 'CreateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_CreateVariantActivity_Fragment = { __typename: 'CreateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_CreateVariantActivity_Fragment = { __typename: 'CreateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_DeprecateComplexMolecularProfileActivity_Fragment = { __typename: 'DeprecateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_DeprecateComplexMolecularProfileActivity_Fragment = { __typename: 'DeprecateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_DeprecateVariantActivity_Fragment = { __typename: 'DeprecateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_DeprecateVariantActivity_Fragment = { __typename: 'DeprecateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_FlagEntityActivity_Fragment = { __typename: 'FlagEntityActivity', id: number, verbiage: string, createdAt: any, flag: { __typename: 'Flag', id: number, name: string, link: string }, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_FlagEntityActivity_Fragment = { __typename: 'FlagEntityActivity', id: number, verbiage: string, createdAt: any, flag: { __typename: 'Flag', id: number, name: string, link: string }, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_ModerateAssertionActivity_Fragment = { __typename: 'ModerateAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_ModerateAssertionActivity_Fragment = { __typename: 'ModerateAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_ModerateEvidenceItemActivity_Fragment = { __typename: 'ModerateEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_ModerateEvidenceItemActivity_Fragment = { __typename: 'ModerateEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_RejectRevisionsActivity_Fragment = { __typename: 'RejectRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_RejectRevisionsActivity_Fragment = { __typename: 'RejectRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_ResolveFlagActivity_Fragment = { __typename: 'ResolveFlagActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_ResolveFlagActivity_Fragment = { __typename: 'ResolveFlagActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_SubmitAssertionActivity_Fragment = { __typename: 'SubmitAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_SubmitAssertionActivity_Fragment = { __typename: 'SubmitAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_SubmitEvidenceItemActivity_Fragment = { __typename: 'SubmitEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_SubmitEvidenceItemActivity_Fragment = { __typename: 'SubmitEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_SuggestRevisionSetActivity_Fragment = { __typename: 'SuggestRevisionSetActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_SuggestRevisionSetActivity_Fragment = { __typename: 'SuggestRevisionSetActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_SuggestSourceActivity_Fragment = { __typename: 'SuggestSourceActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_SuggestSourceActivity_Fragment = { __typename: 'SuggestSourceActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_UpdateSourceSuggestionStatusActivity_Fragment = { __typename: 'UpdateSourceSuggestionStatusActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_UpdateSourceSuggestionStatusActivity_Fragment = { __typename: 'UpdateSourceSuggestionStatusActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
 export type ActivityFeedNodeFragment = ActivityFeedNode_AcceptRevisionsActivity_Fragment | ActivityFeedNode_CommentActivity_Fragment | ActivityFeedNode_CreateComplexMolecularProfileActivity_Fragment | ActivityFeedNode_CreateVariantActivity_Fragment | ActivityFeedNode_DeprecateComplexMolecularProfileActivity_Fragment | ActivityFeedNode_DeprecateVariantActivity_Fragment | ActivityFeedNode_FlagEntityActivity_Fragment | ActivityFeedNode_ModerateAssertionActivity_Fragment | ActivityFeedNode_ModerateEvidenceItemActivity_Fragment | ActivityFeedNode_RejectRevisionsActivity_Fragment | ActivityFeedNode_ResolveFlagActivity_Fragment | ActivityFeedNode_SubmitAssertionActivity_Fragment | ActivityFeedNode_SubmitEvidenceItemActivity_Fragment | ActivityFeedNode_SuggestRevisionSetActivity_Fragment | ActivityFeedNode_SuggestSourceActivity_Fragment | ActivityFeedNode_UpdateSourceSuggestionStatusActivity_Fragment;
 
@@ -6112,9 +6224,9 @@ export type CommentPopoverQueryVariables = Exact<{
 }>;
 
 
-export type CommentPopoverQuery = { __typename: 'Query', comment?: { __typename: 'Comment', id: number, name: string, createdAt: any, title?: string | undefined, comment: string, commenter: { __typename: 'User', id: number, displayName: string, role: UserRole }, commentable: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, name: string, link: string } | { __typename: 'Source', id: number, name: string, link: string } | { __typename: 'SourcePopover', id: number, name: string, link: string } | { __typename: 'Variant', deprecated: boolean, id: number, name: string, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', id: number, name: string, link: string } } | undefined };
+export type CommentPopoverQuery = { __typename: 'Query', comment?: { __typename: 'Comment', id: number, name: string, createdAt: any, title?: string | undefined, comment: string, commenter: { __typename: 'User', id: number, displayName: string, role: UserRole }, commentable: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Factor', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, name: string, link: string } | { __typename: 'Source', id: number, name: string, link: string } | { __typename: 'SourcePopover', id: number, name: string, link: string } | { __typename: 'Variant', deprecated: boolean, id: number, name: string, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', id: number, name: string, link: string } } | undefined };
 
-export type CommentPopoverFragment = { __typename: 'Comment', id: number, name: string, createdAt: any, title?: string | undefined, comment: string, commenter: { __typename: 'User', id: number, displayName: string, role: UserRole }, commentable: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, name: string, link: string } | { __typename: 'Source', id: number, name: string, link: string } | { __typename: 'SourcePopover', id: number, name: string, link: string } | { __typename: 'Variant', deprecated: boolean, id: number, name: string, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', id: number, name: string, link: string } };
+export type CommentPopoverFragment = { __typename: 'Comment', id: number, name: string, createdAt: any, title?: string | undefined, comment: string, commenter: { __typename: 'User', id: number, displayName: string, role: UserRole }, commentable: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Factor', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, name: string, link: string } | { __typename: 'Source', id: number, name: string, link: string } | { __typename: 'SourcePopover', id: number, name: string, link: string } | { __typename: 'Variant', deprecated: boolean, id: number, name: string, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', id: number, name: string, link: string } };
 
 export type DiseasePopoverQueryVariables = Exact<{
   diseaseId: Scalars['Int'];
@@ -6170,11 +6282,11 @@ export type EventFeedQueryVariables = Exact<{
 }>;
 
 
-export type EventFeedQuery = { __typename: 'Query', events: { __typename: 'EventConnection', eventTypes?: Array<EventAction>, unfilteredCount: number, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, uniqueParticipants?: Array<{ __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined }>, participatingOrganizations?: Array<{ __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined }>, edges: Array<{ __typename: 'EventEdge', cursor: string, node?: { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined } | undefined }> } };
+export type EventFeedQuery = { __typename: 'Query', events: { __typename: 'EventConnection', eventTypes?: Array<EventAction>, unfilteredCount: number, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, uniqueParticipants?: Array<{ __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined }>, participatingOrganizations?: Array<{ __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined }>, edges: Array<{ __typename: 'EventEdge', cursor: string, node?: { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined } | undefined }> } };
 
-export type EventFeedFragment = { __typename: 'EventConnection', eventTypes?: Array<EventAction>, unfilteredCount: number, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, uniqueParticipants?: Array<{ __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined }>, participatingOrganizations?: Array<{ __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined }>, edges: Array<{ __typename: 'EventEdge', cursor: string, node?: { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined } | undefined }> };
+export type EventFeedFragment = { __typename: 'EventConnection', eventTypes?: Array<EventAction>, unfilteredCount: number, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, uniqueParticipants?: Array<{ __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined }>, participatingOrganizations?: Array<{ __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined }>, edges: Array<{ __typename: 'EventEdge', cursor: string, node?: { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined } | undefined }> };
 
-export type EventFeedNodeFragment = { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined };
+export type EventFeedNodeFragment = { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined };
 
 export type EvidencePopoverQueryVariables = Exact<{
   evidenceId: Scalars['Int'];
@@ -6225,9 +6337,9 @@ export type FeaturePopoverQueryVariables = Exact<{
 }>;
 
 
-export type FeaturePopoverQuery = { __typename: 'Query', feature?: { __typename: 'Feature', id: number, name: string, featureAliases: Array<string>, featureInstance: { __typename: 'Gene' }, variants: { __typename: 'VariantConnection', totalCount: number }, flags: { __typename: 'FlagConnection', totalCount: number } } | undefined };
+export type FeaturePopoverQuery = { __typename: 'Query', feature?: { __typename: 'Feature', id: number, name: string, featureAliases: Array<string>, featureInstance: { __typename: 'Factor' } | { __typename: 'Gene' }, variants: { __typename: 'VariantConnection', totalCount: number }, flags: { __typename: 'FlagConnection', totalCount: number } } | undefined };
 
-export type FeaturePopoverFragment = { __typename: 'Feature', id: number, name: string, featureAliases: Array<string>, featureInstance: { __typename: 'Gene' }, variants: { __typename: 'VariantConnection', totalCount: number }, flags: { __typename: 'FlagConnection', totalCount: number } };
+export type FeaturePopoverFragment = { __typename: 'Feature', id: number, name: string, featureAliases: Array<string>, featureInstance: { __typename: 'Factor' } | { __typename: 'Gene' }, variants: { __typename: 'VariantConnection', totalCount: number }, flags: { __typename: 'FlagConnection', totalCount: number } };
 
 export type BrowseFeaturesQueryVariables = Exact<{
   featureName?: InputMaybe<Scalars['String']>;
@@ -6259,20 +6371,20 @@ export type FlagListQueryVariables = Exact<{
 }>;
 
 
-export type FlagListQuery = { __typename: 'Query', flags: { __typename: 'FlagConnection', totalCount: number, unfilteredCountForSubject?: number | undefined, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, uniqueFlaggingUsers: Array<{ __typename: 'User', username: string, id: number, profileImagePath?: string | undefined }>, uniqueResolvingUsers?: Array<{ __typename: 'User', username: string, id: number, profileImagePath?: string | undefined }> | undefined, edges: Array<{ __typename: 'FlagEdge', node?: { __typename: 'Flag', id: number, state: FlagState, flaggable: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'BrowseFeature', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | { __typename: 'VariantGroup', id: number, name: string, link: string }, openActivity: { __typename: 'FlagEntityActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } }, resolutionActivity?: { __typename: 'ResolveFlagActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined } | undefined }> } };
+export type FlagListQuery = { __typename: 'Query', flags: { __typename: 'FlagConnection', totalCount: number, unfilteredCountForSubject?: number | undefined, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, uniqueFlaggingUsers: Array<{ __typename: 'User', username: string, id: number, profileImagePath?: string | undefined }>, uniqueResolvingUsers?: Array<{ __typename: 'User', username: string, id: number, profileImagePath?: string | undefined }> | undefined, edges: Array<{ __typename: 'FlagEdge', node?: { __typename: 'Flag', id: number, state: FlagState, flaggable: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'BrowseFeature', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Factor', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | { __typename: 'VariantGroup', id: number, name: string, link: string }, openActivity: { __typename: 'FlagEntityActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } }, resolutionActivity?: { __typename: 'ResolveFlagActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined } | undefined }> } };
 
-export type FlagListFragment = { __typename: 'FlagConnection', totalCount: number, unfilteredCountForSubject?: number | undefined, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, uniqueFlaggingUsers: Array<{ __typename: 'User', username: string, id: number, profileImagePath?: string | undefined }>, uniqueResolvingUsers?: Array<{ __typename: 'User', username: string, id: number, profileImagePath?: string | undefined }> | undefined, edges: Array<{ __typename: 'FlagEdge', node?: { __typename: 'Flag', id: number, state: FlagState, flaggable: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'BrowseFeature', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | { __typename: 'VariantGroup', id: number, name: string, link: string }, openActivity: { __typename: 'FlagEntityActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } }, resolutionActivity?: { __typename: 'ResolveFlagActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined } | undefined }> };
+export type FlagListFragment = { __typename: 'FlagConnection', totalCount: number, unfilteredCountForSubject?: number | undefined, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, uniqueFlaggingUsers: Array<{ __typename: 'User', username: string, id: number, profileImagePath?: string | undefined }>, uniqueResolvingUsers?: Array<{ __typename: 'User', username: string, id: number, profileImagePath?: string | undefined }> | undefined, edges: Array<{ __typename: 'FlagEdge', node?: { __typename: 'Flag', id: number, state: FlagState, flaggable: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'BrowseFeature', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Factor', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | { __typename: 'VariantGroup', id: number, name: string, link: string }, openActivity: { __typename: 'FlagEntityActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } }, resolutionActivity?: { __typename: 'ResolveFlagActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined } | undefined }> };
 
-export type FlagFragment = { __typename: 'Flag', id: number, state: FlagState, flaggable: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'BrowseFeature', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | { __typename: 'VariantGroup', id: number, name: string, link: string }, openActivity: { __typename: 'FlagEntityActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } }, resolutionActivity?: { __typename: 'ResolveFlagActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined };
+export type FlagFragment = { __typename: 'Flag', id: number, state: FlagState, flaggable: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'BrowseFeature', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Factor', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | { __typename: 'VariantGroup', id: number, name: string, link: string }, openActivity: { __typename: 'FlagEntityActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } }, resolutionActivity?: { __typename: 'ResolveFlagActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined };
 
 export type FlagPopoverQueryVariables = Exact<{
   flagId: Scalars['Int'];
 }>;
 
 
-export type FlagPopoverQuery = { __typename: 'Query', flag?: { __typename: 'Flag', id: number, name: string, state: FlagState, createdAt: any, flaggingUser: { __typename: 'User', id: number, displayName: string, role: UserRole }, flaggable: { __typename: 'Assertion', id: number, link: string, name: string } | { __typename: 'BrowseFeature', id: number, link: string, name: string } | { __typename: 'EvidenceItem', id: number, link: string, name: string } | { __typename: 'Feature', id: number, link: string, name: string } | { __typename: 'Gene', id: number, link: string, name: string } | { __typename: 'MolecularProfile', id: number, link: string, name: string } | { __typename: 'Variant', deprecated: boolean, id: number, link: string, name: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', id: number, link: string, name: string }, openActivity: { __typename: 'FlagEntityActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } } | undefined };
+export type FlagPopoverQuery = { __typename: 'Query', flag?: { __typename: 'Flag', id: number, name: string, state: FlagState, createdAt: any, flaggingUser: { __typename: 'User', id: number, displayName: string, role: UserRole }, flaggable: { __typename: 'Assertion', id: number, link: string, name: string } | { __typename: 'BrowseFeature', id: number, link: string, name: string } | { __typename: 'EvidenceItem', id: number, link: string, name: string } | { __typename: 'Factor', id: number, link: string, name: string } | { __typename: 'Feature', id: number, link: string, name: string } | { __typename: 'Gene', id: number, link: string, name: string } | { __typename: 'MolecularProfile', id: number, link: string, name: string } | { __typename: 'Variant', deprecated: boolean, id: number, link: string, name: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', id: number, link: string, name: string }, openActivity: { __typename: 'FlagEntityActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } } | undefined };
 
-export type FlagPopoverFragment = { __typename: 'Flag', id: number, name: string, state: FlagState, createdAt: any, flaggingUser: { __typename: 'User', id: number, displayName: string, role: UserRole }, flaggable: { __typename: 'Assertion', id: number, link: string, name: string } | { __typename: 'BrowseFeature', id: number, link: string, name: string } | { __typename: 'EvidenceItem', id: number, link: string, name: string } | { __typename: 'Feature', id: number, link: string, name: string } | { __typename: 'Gene', id: number, link: string, name: string } | { __typename: 'MolecularProfile', id: number, link: string, name: string } | { __typename: 'Variant', deprecated: boolean, id: number, link: string, name: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', id: number, link: string, name: string }, openActivity: { __typename: 'FlagEntityActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } };
+export type FlagPopoverFragment = { __typename: 'Flag', id: number, name: string, state: FlagState, createdAt: any, flaggingUser: { __typename: 'User', id: number, displayName: string, role: UserRole }, flaggable: { __typename: 'Assertion', id: number, link: string, name: string } | { __typename: 'BrowseFeature', id: number, link: string, name: string } | { __typename: 'EvidenceItem', id: number, link: string, name: string } | { __typename: 'Factor', id: number, link: string, name: string } | { __typename: 'Feature', id: number, link: string, name: string } | { __typename: 'Gene', id: number, link: string, name: string } | { __typename: 'MolecularProfile', id: number, link: string, name: string } | { __typename: 'Variant', deprecated: boolean, id: number, link: string, name: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', id: number, link: string, name: string }, openActivity: { __typename: 'FlagEntityActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } };
 
 export type QuicksearchQueryVariables = Exact<{
   query: Scalars['String'];
@@ -6450,9 +6562,9 @@ export type RevisionPopoverQueryVariables = Exact<{
 }>;
 
 
-export type RevisionPopoverQuery = { __typename: 'Query', revision?: { __typename: 'Revision', id: number, name: string, link: string, status: RevisionStatus, createdAt: any, creationActivity?: { __typename: 'SuggestRevisionSetActivity', user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, subject: { __typename: 'Assertion', id: number, link: string, name: string } | { __typename: 'EvidenceItem', id: number, link: string, name: string } | { __typename: 'Feature', id: number, link: string, name: string } | { __typename: 'Flag', id: number, link: string, name: string } | { __typename: 'Gene', id: number, link: string, name: string } | { __typename: 'MolecularProfile', id: number, link: string, name: string } | { __typename: 'Revision', id: number, link: string, name: string } | { __typename: 'RevisionSet', id: number, link: string, name: string } | { __typename: 'Source', id: number, link: string, name: string } | { __typename: 'SourcePopover', id: number, link: string, name: string } | { __typename: 'SourceSuggestion', id: number, link: string, name: string } | { __typename: 'Variant', deprecated: boolean, id: number, link: string, name: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', id: number, link: string, name: string }, linkoutData: { __typename: 'LinkoutData', name: string } } | undefined };
+export type RevisionPopoverQuery = { __typename: 'Query', revision?: { __typename: 'Revision', id: number, name: string, link: string, status: RevisionStatus, createdAt: any, creationActivity?: { __typename: 'SuggestRevisionSetActivity', user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, subject: { __typename: 'Assertion', id: number, link: string, name: string } | { __typename: 'EvidenceItem', id: number, link: string, name: string } | { __typename: 'Factor', id: number, link: string, name: string } | { __typename: 'Feature', id: number, link: string, name: string } | { __typename: 'Flag', id: number, link: string, name: string } | { __typename: 'Gene', id: number, link: string, name: string } | { __typename: 'MolecularProfile', id: number, link: string, name: string } | { __typename: 'Revision', id: number, link: string, name: string } | { __typename: 'RevisionSet', id: number, link: string, name: string } | { __typename: 'Source', id: number, link: string, name: string } | { __typename: 'SourcePopover', id: number, link: string, name: string } | { __typename: 'SourceSuggestion', id: number, link: string, name: string } | { __typename: 'Variant', deprecated: boolean, id: number, link: string, name: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', id: number, link: string, name: string }, linkoutData: { __typename: 'LinkoutData', name: string } } | undefined };
 
-export type RevisionPopoverFragment = { __typename: 'Revision', id: number, name: string, link: string, status: RevisionStatus, createdAt: any, creationActivity?: { __typename: 'SuggestRevisionSetActivity', user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, subject: { __typename: 'Assertion', id: number, link: string, name: string } | { __typename: 'EvidenceItem', id: number, link: string, name: string } | { __typename: 'Feature', id: number, link: string, name: string } | { __typename: 'Flag', id: number, link: string, name: string } | { __typename: 'Gene', id: number, link: string, name: string } | { __typename: 'MolecularProfile', id: number, link: string, name: string } | { __typename: 'Revision', id: number, link: string, name: string } | { __typename: 'RevisionSet', id: number, link: string, name: string } | { __typename: 'Source', id: number, link: string, name: string } | { __typename: 'SourcePopover', id: number, link: string, name: string } | { __typename: 'SourceSuggestion', id: number, link: string, name: string } | { __typename: 'Variant', deprecated: boolean, id: number, link: string, name: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', id: number, link: string, name: string }, linkoutData: { __typename: 'LinkoutData', name: string } };
+export type RevisionPopoverFragment = { __typename: 'Revision', id: number, name: string, link: string, status: RevisionStatus, createdAt: any, creationActivity?: { __typename: 'SuggestRevisionSetActivity', user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, subject: { __typename: 'Assertion', id: number, link: string, name: string } | { __typename: 'EvidenceItem', id: number, link: string, name: string } | { __typename: 'Factor', id: number, link: string, name: string } | { __typename: 'Feature', id: number, link: string, name: string } | { __typename: 'Flag', id: number, link: string, name: string } | { __typename: 'Gene', id: number, link: string, name: string } | { __typename: 'MolecularProfile', id: number, link: string, name: string } | { __typename: 'Revision', id: number, link: string, name: string } | { __typename: 'RevisionSet', id: number, link: string, name: string } | { __typename: 'Source', id: number, link: string, name: string } | { __typename: 'SourcePopover', id: number, link: string, name: string } | { __typename: 'SourceSuggestion', id: number, link: string, name: string } | { __typename: 'Variant', deprecated: boolean, id: number, link: string, name: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', id: number, link: string, name: string }, linkoutData: { __typename: 'LinkoutData', name: string } };
 
 export type RevisionsQueryVariables = Exact<{
   subject?: InputMaybe<ModeratedInput>;
@@ -7003,9 +7115,9 @@ export type GeneRevisableFieldsQueryVariables = Exact<{
 }>;
 
 
-export type GeneRevisableFieldsQuery = { __typename: 'Query', feature?: { __typename: 'Feature', id: number, description: string, sources: Array<{ __typename: 'Source', id: number, sourceType: SourceSource, citation?: string | undefined, citationId: string }> } | undefined };
+export type GeneRevisableFieldsQuery = { __typename: 'Query', feature?: { __typename: 'Feature', id: number, description?: string | undefined, sources: Array<{ __typename: 'Source', id: number, sourceType: SourceSource, citation?: string | undefined, citationId: string }> } | undefined };
 
-export type RevisableGeneFieldsFragment = { __typename: 'Feature', id: number, description: string, sources: Array<{ __typename: 'Source', id: number, sourceType: SourceSource, citation?: string | undefined, citationId: string }> };
+export type RevisableGeneFieldsFragment = { __typename: 'Feature', id: number, description?: string | undefined, sources: Array<{ __typename: 'Source', id: number, sourceType: SourceSource, citation?: string | undefined, citationId: string }> };
 
 export type SuggestGeneRevisionMutationVariables = Exact<{
   input: SuggestGeneRevisionInput;
@@ -7221,16 +7333,16 @@ export type FeatureSelectTypeaheadQueryVariables = Exact<{
 }>;
 
 
-export type FeatureSelectTypeaheadQuery = { __typename: 'Query', featureTypeahead: Array<{ __typename: 'Feature', id: number, name: string, featureAliases: Array<string>, link: string, featureInstance: { __typename: 'Gene', entrezId: number } }> };
+export type FeatureSelectTypeaheadQuery = { __typename: 'Query', featureTypeahead: Array<{ __typename: 'Feature', id: number, name: string, featureAliases: Array<string>, link: string, featureInstance: { __typename: 'Factor' } | { __typename: 'Gene', entrezId: number } }> };
 
 export type FeatureSelectTagQueryVariables = Exact<{
   featureId: Scalars['Int'];
 }>;
 
 
-export type FeatureSelectTagQuery = { __typename: 'Query', feature?: { __typename: 'Feature', id: number, name: string, featureAliases: Array<string>, link: string, featureInstance: { __typename: 'Gene', entrezId: number } } | undefined };
+export type FeatureSelectTagQuery = { __typename: 'Query', feature?: { __typename: 'Feature', id: number, name: string, featureAliases: Array<string>, link: string, featureInstance: { __typename: 'Factor' } | { __typename: 'Gene', entrezId: number } } | undefined };
 
-export type FeatureSelectTypeaheadFieldsFragment = { __typename: 'Feature', id: number, name: string, featureAliases: Array<string>, link: string, featureInstance: { __typename: 'Gene', entrezId: number } };
+export type FeatureSelectTypeaheadFieldsFragment = { __typename: 'Feature', id: number, name: string, featureAliases: Array<string>, link: string, featureInstance: { __typename: 'Factor' } | { __typename: 'Gene', entrezId: number } };
 
 export type MolecularProfileSelectTypeaheadQueryVariables = Exact<{
   name: Scalars['String'];
@@ -7510,20 +7622,22 @@ export type FeatureDetailQueryVariables = Exact<{
 }>;
 
 
-export type FeatureDetailQuery = { __typename: 'Query', feature?: { __typename: 'Feature', id: number, name: string, fullName?: string | undefined, featureInstance: { __typename: 'Gene' }, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number } } | undefined };
+export type FeatureDetailQuery = { __typename: 'Query', feature?: { __typename: 'Feature', id: number, name: string, fullName?: string | undefined, featureInstance: { __typename: 'Factor' } | { __typename: 'Gene' }, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number } } | undefined };
 
-export type FeatureDetailFieldsFragment = { __typename: 'Feature', id: number, name: string, fullName?: string | undefined, featureInstance: { __typename: 'Gene' }, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number } };
+export type FeatureDetailFieldsFragment = { __typename: 'Feature', id: number, name: string, fullName?: string | undefined, featureInstance: { __typename: 'Factor' } | { __typename: 'Gene' }, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number } };
 
 export type FeaturesSummaryQueryVariables = Exact<{
   featureId: Scalars['Int'];
 }>;
 
 
-export type FeaturesSummaryQuery = { __typename: 'Query', feature?: { __typename: 'Feature', id: number, name: string, fullName?: string | undefined, link: string, featureInstance: { __typename: 'Gene', id: number, description: string, featureAliases: Array<string>, entrezId: number, name: string, myGeneInfoDetails?: any | undefined, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceUrl?: string | undefined, displayType: string, sourceType: SourceSource }> } } | undefined };
+export type FeaturesSummaryQuery = { __typename: 'Query', feature?: { __typename: 'Feature', id: number, name: string, fullName?: string | undefined, link: string, featureInstance: { __typename: 'Factor', id: number, name: string, description?: string | undefined, featureAliases: Array<string>, ncitId?: string | undefined, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceUrl?: string | undefined, displayType: string, sourceType: SourceSource }>, ncitDetails?: { __typename: 'NcitDetails', synonyms: Array<{ __typename: 'NcitSynonym', name: string, source: string }>, definitions: Array<{ __typename: 'NcitDefinition', definition: string, source: string }> } | undefined } | { __typename: 'Gene', id: number, description?: string | undefined, featureAliases: Array<string>, entrezId: number, name: string, myGeneInfoDetails?: any | undefined, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceUrl?: string | undefined, displayType: string, sourceType: SourceSource }> } } | undefined };
 
-export type FeatureSummaryFieldsFragment = { __typename: 'Feature', id: number, name: string, fullName?: string | undefined, link: string, featureInstance: { __typename: 'Gene', id: number, description: string, featureAliases: Array<string>, entrezId: number, name: string, myGeneInfoDetails?: any | undefined, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceUrl?: string | undefined, displayType: string, sourceType: SourceSource }> } };
+export type FeatureSummaryFieldsFragment = { __typename: 'Feature', id: number, name: string, fullName?: string | undefined, link: string, featureInstance: { __typename: 'Factor', id: number, name: string, description?: string | undefined, featureAliases: Array<string>, ncitId?: string | undefined, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceUrl?: string | undefined, displayType: string, sourceType: SourceSource }>, ncitDetails?: { __typename: 'NcitDetails', synonyms: Array<{ __typename: 'NcitSynonym', name: string, source: string }>, definitions: Array<{ __typename: 'NcitDefinition', definition: string, source: string }> } | undefined } | { __typename: 'Gene', id: number, description?: string | undefined, featureAliases: Array<string>, entrezId: number, name: string, myGeneInfoDetails?: any | undefined, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceUrl?: string | undefined, displayType: string, sourceType: SourceSource }> } };
 
-export type GeneSummaryFieldsFragment = { __typename: 'Gene', id: number, description: string, featureAliases: Array<string>, entrezId: number, name: string, myGeneInfoDetails?: any | undefined, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceUrl?: string | undefined, displayType: string, sourceType: SourceSource }> };
+export type GeneSummaryFieldsFragment = { __typename: 'Gene', id: number, description?: string | undefined, featureAliases: Array<string>, entrezId: number, name: string, myGeneInfoDetails?: any | undefined, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceUrl?: string | undefined, displayType: string, sourceType: SourceSource }> };
+
+export type FactorSummaryFieldsFragment = { __typename: 'Factor', id: number, name: string, description?: string | undefined, featureAliases: Array<string>, ncitId?: string | undefined, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceUrl?: string | undefined, displayType: string, sourceType: SourceSource }>, ncitDetails?: { __typename: 'NcitDetails', synonyms: Array<{ __typename: 'NcitSynonym', name: string, source: string }>, definitions: Array<{ __typename: 'NcitDefinition', definition: string, source: string }> } | undefined };
 
 export type MolecularProfileDetailQueryVariables = Exact<{
   mpId: Scalars['Int'];
@@ -7658,22 +7772,22 @@ export type UserNotificationsQueryVariables = Exact<{
 }>;
 
 
-export type UserNotificationsQuery = { __typename: 'Query', notifications: { __typename: 'NotificationConnection', eventTypes: Array<EventAction>, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, notificationSubjects: Array<{ __typename: 'EventSubjectWithCount', occuranceCount: number, subject?: { __typename: 'Assertion', id: number, name: string } | { __typename: 'EvidenceItem', id: number, name: string } | { __typename: 'Feature', id: number, name: string } | { __typename: 'Flag', id: number, name: string } | { __typename: 'Gene', id: number, name: string } | { __typename: 'MolecularProfile', id: number, name: string } | { __typename: 'Revision', id: number, name: string } | { __typename: 'RevisionSet', id: number, name: string } | { __typename: 'Source', id: number, name: string } | { __typename: 'SourcePopover', id: number, name: string } | { __typename: 'SourceSuggestion', id: number, name: string } | { __typename: 'Variant', id: number, name: string } | { __typename: 'VariantGroup', id: number, name: string } | undefined }>, originatingUsers: Array<{ __typename: 'User', id: number, displayName: string }>, organizations: Array<{ __typename: 'Organization', id: number, name: string }>, edges: Array<{ __typename: 'NotificationEdge', node?: { __typename: 'Notification', id: number, type: NotificationReason, seen: boolean, event: { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined }, subscription?: { __typename: 'Subscription', id: number, subscribable: { __typename: 'Assertion', id: number, name: string } | { __typename: 'EvidenceItem', id: number, name: string } | { __typename: 'Feature', id: number, name: string } | { __typename: 'Flag', id: number, name: string } | { __typename: 'Gene', id: number, name: string } | { __typename: 'MolecularProfile', id: number, name: string } | { __typename: 'Revision', id: number, name: string } | { __typename: 'RevisionSet', id: number, name: string } | { __typename: 'Source', id: number, name: string } | { __typename: 'SourcePopover', id: number, name: string } | { __typename: 'SourceSuggestion', id: number, name: string } | { __typename: 'Variant', id: number, name: string } | { __typename: 'VariantGroup', id: number, name: string } } | undefined } | undefined }> } };
+export type UserNotificationsQuery = { __typename: 'Query', notifications: { __typename: 'NotificationConnection', eventTypes: Array<EventAction>, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, notificationSubjects: Array<{ __typename: 'EventSubjectWithCount', occuranceCount: number, subject?: { __typename: 'Assertion', id: number, name: string } | { __typename: 'EvidenceItem', id: number, name: string } | { __typename: 'Factor', id: number, name: string } | { __typename: 'Feature', id: number, name: string } | { __typename: 'Flag', id: number, name: string } | { __typename: 'Gene', id: number, name: string } | { __typename: 'MolecularProfile', id: number, name: string } | { __typename: 'Revision', id: number, name: string } | { __typename: 'RevisionSet', id: number, name: string } | { __typename: 'Source', id: number, name: string } | { __typename: 'SourcePopover', id: number, name: string } | { __typename: 'SourceSuggestion', id: number, name: string } | { __typename: 'Variant', id: number, name: string } | { __typename: 'VariantGroup', id: number, name: string } | undefined }>, originatingUsers: Array<{ __typename: 'User', id: number, displayName: string }>, organizations: Array<{ __typename: 'Organization', id: number, name: string }>, edges: Array<{ __typename: 'NotificationEdge', node?: { __typename: 'Notification', id: number, type: NotificationReason, seen: boolean, event: { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined }, subscription?: { __typename: 'Subscription', id: number, subscribable: { __typename: 'Assertion', id: number, name: string } | { __typename: 'EvidenceItem', id: number, name: string } | { __typename: 'Factor', id: number, name: string } | { __typename: 'Feature', id: number, name: string } | { __typename: 'Flag', id: number, name: string } | { __typename: 'Gene', id: number, name: string } | { __typename: 'MolecularProfile', id: number, name: string } | { __typename: 'Revision', id: number, name: string } | { __typename: 'RevisionSet', id: number, name: string } | { __typename: 'Source', id: number, name: string } | { __typename: 'SourcePopover', id: number, name: string } | { __typename: 'SourceSuggestion', id: number, name: string } | { __typename: 'Variant', id: number, name: string } | { __typename: 'VariantGroup', id: number, name: string } } | undefined } | undefined }> } };
 
 export type NotificationOrganizationFragment = { __typename: 'Organization', id: number, name: string };
 
 export type NotificationOriginatingUsersFragment = { __typename: 'User', id: number, displayName: string };
 
-export type NotificationFeedSubjectsFragment = { __typename: 'EventSubjectWithCount', occuranceCount: number, subject?: { __typename: 'Assertion', id: number, name: string } | { __typename: 'EvidenceItem', id: number, name: string } | { __typename: 'Feature', id: number, name: string } | { __typename: 'Flag', id: number, name: string } | { __typename: 'Gene', id: number, name: string } | { __typename: 'MolecularProfile', id: number, name: string } | { __typename: 'Revision', id: number, name: string } | { __typename: 'RevisionSet', id: number, name: string } | { __typename: 'Source', id: number, name: string } | { __typename: 'SourcePopover', id: number, name: string } | { __typename: 'SourceSuggestion', id: number, name: string } | { __typename: 'Variant', id: number, name: string } | { __typename: 'VariantGroup', id: number, name: string } | undefined };
+export type NotificationFeedSubjectsFragment = { __typename: 'EventSubjectWithCount', occuranceCount: number, subject?: { __typename: 'Assertion', id: number, name: string } | { __typename: 'EvidenceItem', id: number, name: string } | { __typename: 'Factor', id: number, name: string } | { __typename: 'Feature', id: number, name: string } | { __typename: 'Flag', id: number, name: string } | { __typename: 'Gene', id: number, name: string } | { __typename: 'MolecularProfile', id: number, name: string } | { __typename: 'Revision', id: number, name: string } | { __typename: 'RevisionSet', id: number, name: string } | { __typename: 'Source', id: number, name: string } | { __typename: 'SourcePopover', id: number, name: string } | { __typename: 'SourceSuggestion', id: number, name: string } | { __typename: 'Variant', id: number, name: string } | { __typename: 'VariantGroup', id: number, name: string } | undefined };
 
-export type NotificationNodeFragment = { __typename: 'Notification', id: number, type: NotificationReason, seen: boolean, event: { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined }, subscription?: { __typename: 'Subscription', id: number, subscribable: { __typename: 'Assertion', id: number, name: string } | { __typename: 'EvidenceItem', id: number, name: string } | { __typename: 'Feature', id: number, name: string } | { __typename: 'Flag', id: number, name: string } | { __typename: 'Gene', id: number, name: string } | { __typename: 'MolecularProfile', id: number, name: string } | { __typename: 'Revision', id: number, name: string } | { __typename: 'RevisionSet', id: number, name: string } | { __typename: 'Source', id: number, name: string } | { __typename: 'SourcePopover', id: number, name: string } | { __typename: 'SourceSuggestion', id: number, name: string } | { __typename: 'Variant', id: number, name: string } | { __typename: 'VariantGroup', id: number, name: string } } | undefined };
+export type NotificationNodeFragment = { __typename: 'Notification', id: number, type: NotificationReason, seen: boolean, event: { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined }, subscription?: { __typename: 'Subscription', id: number, subscribable: { __typename: 'Assertion', id: number, name: string } | { __typename: 'EvidenceItem', id: number, name: string } | { __typename: 'Factor', id: number, name: string } | { __typename: 'Feature', id: number, name: string } | { __typename: 'Flag', id: number, name: string } | { __typename: 'Gene', id: number, name: string } | { __typename: 'MolecularProfile', id: number, name: string } | { __typename: 'Revision', id: number, name: string } | { __typename: 'RevisionSet', id: number, name: string } | { __typename: 'Source', id: number, name: string } | { __typename: 'SourcePopover', id: number, name: string } | { __typename: 'SourceSuggestion', id: number, name: string } | { __typename: 'Variant', id: number, name: string } | { __typename: 'VariantGroup', id: number, name: string } } | undefined };
 
 export type UpdateNotificationStatusMutationVariables = Exact<{
   input: UpdateNotificationStatusInput;
 }>;
 
 
-export type UpdateNotificationStatusMutation = { __typename: 'Mutation', updateNotificationStatus?: { __typename: 'UpdateNotificationStatusPayload', notifications: Array<{ __typename: 'Notification', id: number, type: NotificationReason, seen: boolean, event: { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined }, subscription?: { __typename: 'Subscription', id: number, subscribable: { __typename: 'Assertion', id: number, name: string } | { __typename: 'EvidenceItem', id: number, name: string } | { __typename: 'Feature', id: number, name: string } | { __typename: 'Flag', id: number, name: string } | { __typename: 'Gene', id: number, name: string } | { __typename: 'MolecularProfile', id: number, name: string } | { __typename: 'Revision', id: number, name: string } | { __typename: 'RevisionSet', id: number, name: string } | { __typename: 'Source', id: number, name: string } | { __typename: 'SourcePopover', id: number, name: string } | { __typename: 'SourceSuggestion', id: number, name: string } | { __typename: 'Variant', id: number, name: string } | { __typename: 'VariantGroup', id: number, name: string } } | undefined }> } | undefined };
+export type UpdateNotificationStatusMutation = { __typename: 'Mutation', updateNotificationStatus?: { __typename: 'UpdateNotificationStatusPayload', notifications: Array<{ __typename: 'Notification', id: number, type: NotificationReason, seen: boolean, event: { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined }, subscription?: { __typename: 'Subscription', id: number, subscribable: { __typename: 'Assertion', id: number, name: string } | { __typename: 'EvidenceItem', id: number, name: string } | { __typename: 'Factor', id: number, name: string } | { __typename: 'Feature', id: number, name: string } | { __typename: 'Flag', id: number, name: string } | { __typename: 'Gene', id: number, name: string } | { __typename: 'MolecularProfile', id: number, name: string } | { __typename: 'Revision', id: number, name: string } | { __typename: 'RevisionSet', id: number, name: string } | { __typename: 'Source', id: number, name: string } | { __typename: 'SourcePopover', id: number, name: string } | { __typename: 'SourceSuggestion', id: number, name: string } | { __typename: 'Variant', id: number, name: string } | { __typename: 'VariantGroup', id: number, name: string } } | undefined }> } | undefined };
 
 export type UnsubscribeMutationVariables = Exact<{
   input: UnsubscribeInput;
@@ -9775,6 +9889,33 @@ export const GeneSummaryFieldsFragmentDoc = gql`
   myGeneInfoDetails
 }
     `;
+export const FactorSummaryFieldsFragmentDoc = gql`
+    fragment FactorSummaryFields on Factor {
+  id
+  name
+  description
+  featureAliases
+  ncitId
+  sources {
+    id
+    citation
+    link
+    sourceUrl
+    displayType
+    sourceType
+  }
+  ncitDetails {
+    synonyms {
+      name
+      source
+    }
+    definitions {
+      definition
+      source
+    }
+  }
+}
+    `;
 export const FeatureSummaryFieldsFragmentDoc = gql`
     fragment FeatureSummaryFields on Feature {
   id
@@ -9786,9 +9927,13 @@ export const FeatureSummaryFieldsFragmentDoc = gql`
     ... on Gene {
       ...GeneSummaryFields
     }
+    ... on Factor {
+      ...FactorSummaryFields
+    }
   }
 }
-    ${GeneSummaryFieldsFragmentDoc}`;
+    ${GeneSummaryFieldsFragmentDoc}
+${FactorSummaryFieldsFragmentDoc}`;
 export const MolecularProfileDetailFieldsFragmentDoc = gql`
     fragment MolecularProfileDetailFields on MolecularProfile {
   id
diff --git a/client/src/app/generated/civic.possible-types.ts b/client/src/app/generated/civic.possible-types.ts
index eb64011d2..b58377532 100644
--- a/client/src/app/generated/civic.possible-types.ts
+++ b/client/src/app/generated/civic.possible-types.ts
@@ -32,6 +32,7 @@
     "Commentable": [
       "Assertion",
       "EvidenceItem",
+      "Factor",
       "Feature",
       "Flag",
       "Gene",
@@ -55,6 +56,7 @@
     "EventSubject": [
       "Assertion",
       "EvidenceItem",
+      "Factor",
       "Feature",
       "Flag",
       "Gene",
@@ -68,12 +70,14 @@
       "VariantGroup"
     ],
     "FeatureInstance": [
+      "Factor",
       "Gene"
     ],
     "Flaggable": [
       "Assertion",
       "BrowseFeature",
       "EvidenceItem",
+      "Factor",
       "Feature",
       "Gene",
       "MolecularProfile",
@@ -89,6 +93,7 @@
       "ScalarFieldDiff"
     ],
     "MolecularProfileComponent": [
+      "Factor",
       "Feature",
       "Gene",
       "Variant"
@@ -101,6 +106,7 @@
     "WithRevisions": [
       "Assertion",
       "EvidenceItem",
+      "Factor",
       "Feature",
       "Gene",
       "MolecularProfile",
diff --git a/client/src/app/generated/server.model.graphql b/client/src/app/generated/server.model.graphql
index 3a72ae31f..278a28a8e 100644
--- a/client/src/app/generated/server.model.graphql
+++ b/client/src/app/generated/server.model.graphql
@@ -2843,7 +2843,7 @@ type Factor implements Commentable & EventSubject & Flaggable & MolecularProfile
     """
     sortBy: DateSort
   ): CommentConnection!
-  description: String!
+  description: String
 
   """
   List and filter events for an object
@@ -3075,7 +3075,7 @@ type Feature implements Commentable & EventSubject & Flaggable & MolecularProfil
     """
     sortBy: DateSort
   ): CommentConnection!
-  description: String!
+  description: String
 
   """
   List and filter events for an object
@@ -3650,7 +3650,7 @@ type Gene implements Commentable & EventSubject & Flaggable & MolecularProfileCo
     """
     sortBy: DateSort
   ): CommentConnection!
-  description: String!
+  description: String
   entrezId: Int!
 
   """
diff --git a/client/src/app/generated/server.schema.json b/client/src/app/generated/server.schema.json
index 4741b142f..7fedfe9ad 100644
--- a/client/src/app/generated/server.schema.json
+++ b/client/src/app/generated/server.schema.json
@@ -14143,13 +14143,9 @@
               "description": null,
               "args": [],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
@@ -14992,13 +14988,9 @@
               "description": null,
               "args": [],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
@@ -17281,13 +17273,9 @@
               "description": null,
               "args": [],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
diff --git a/client/src/app/views/features/features-detail/features-summary/features-summary.module.ts b/client/src/app/views/features/features-detail/features-summary/features-summary.module.ts
index 8774204c9..30ab15f40 100644
--- a/client/src/app/views/features/features-detail/features-summary/features-summary.module.ts
+++ b/client/src/app/views/features/features-detail/features-summary/features-summary.module.ts
@@ -18,6 +18,7 @@ import { NzTagModule } from 'ng-zorro-antd/tag'
 import { NzTabsModule } from 'ng-zorro-antd/tabs'
 import { CvcMolecularProfilesMenuModule } from '@app/components/molecular-profiles/molecular-profiles-menu/molecular-profiles-menu.module'
 import { GenesSummaryModule } from '@app/components/genes/genes-summary/genes-summary.module'
+import { FactorSummaryComponent } from '@app/components/factors/factor-summary/factor-summary.page'
 
 @NgModule({
   declarations: [FeaturesSummaryPage],
@@ -42,6 +43,7 @@ import { GenesSummaryModule } from '@app/components/genes/genes-summary/genes-su
     CvcMyGeneInfoModule,
     CvcMolecularProfilesMenuModule,
     GenesSummaryModule,
+    FactorSummaryComponent,
   ],
   exports: [FeaturesSummaryPage],
 })
diff --git a/client/src/app/views/features/features-detail/features-summary/features-summary.page.html b/client/src/app/views/features/features-detail/features-summary/features-summary.page.html
index 93abc9e52..eef4aba59 100644
--- a/client/src/app/views/features/features-detail/features-summary/features-summary.page.html
+++ b/client/src/app/views/features/features-detail/features-summary/features-summary.page.html
@@ -1,9 +1,16 @@
 <ng-container *ngIf=" (feature$ | ngrxPush) as feature">
   <nz-row [nzGutter]="[8,16]">
     <ng-container [ngSwitch]="feature.featureInstance.__typename">
-      <span *ngSwitchCase="'Gene'">
-        <cvc-genes-summary [gene]="feature.featureInstance"></cvc-genes-summary>
-      </span>
+      <!--<span *ngSwitchCase="'Gene'">-->
+      <!--<cvc-genes-summary-->
+      <!--[featureId]="feature.id"-->
+      <!--[gene]="feature.featureInstance"></cvc-genes-summary>-->
+      <!--</span>-->
+      <!--<span *ngSwitchCase="'Factor'">-->
+      <!--<cvc-factor-summary-->
+      <!--[featureId]="feature.id"-->
+      <!--[factor]="feature.featureInstance"></cvc-factor-summary>-->
+      <!--</span>-->
     </ng-container>
 
     <!-- variant menu row -->
diff --git a/client/src/app/views/features/features-detail/features-summary/features-summary.query.gql b/client/src/app/views/features/features-detail/features-summary/features-summary.query.gql
index 4f4c1baf0..78a6cf894 100644
--- a/client/src/app/views/features/features-detail/features-summary/features-summary.query.gql
+++ b/client/src/app/views/features/features-detail/features-summary/features-summary.query.gql
@@ -14,6 +14,9 @@ fragment FeatureSummaryFields on Feature{
     ... on Gene {
       ... GeneSummaryFields
     }
+    ... on Factor {
+      ... FactorSummaryFields
+    }
   }
   # lastSubmittedRevisionEvent {
   #   originatingUser {
@@ -49,3 +52,29 @@ fragment GeneSummaryFields on Gene {
   }
   myGeneInfoDetails
 }
+
+fragment FactorSummaryFields on Factor {
+  id
+  name
+  description
+  featureAliases
+  ncitId
+  sources {
+    id
+    citation
+    link
+    sourceUrl
+    displayType
+    sourceType
+  }
+  ncitDetails {
+    synonyms {
+      name
+      source
+    }
+    definitions {
+      definition
+      source
+    }
+  }
+}
diff --git a/server/app/graphql/mutations/suggest_factor_revision.rb b/server/app/graphql/mutations/suggest_factor_revision.rb
new file mode 100644
index 000000000..867965de1
--- /dev/null
+++ b/server/app/graphql/mutations/suggest_factor_revision.rb
@@ -0,0 +1,82 @@
+class Mutations::SuggestFactorRevision < Mutations::MutationWithOrg
+  description 'Suggest a Revision to a Feature entity of instance type "Factor".'
+
+  argument :id, Int, required: true,
+    description: 'The ID of the Feature of instance type "Factor" to suggest a Revision to.'
+
+  argument :fields, Types::Revisions::FactorFields, required: true,
+    description: <<~DOC.strip
+      The desired state of the Factors's editable fields if the change were applied.
+      If no change is desired for a particular field, pass in the current value of that field.
+    DOC
+
+  argument :comment, String, required: true,
+    validates: { length: { minimum: 10 } },
+    description: 'Text describing the reason for the change. Will be attached to the Revision as a comment.'
+
+  field :factor, Types::Entities::FactorType, null: false,
+    description: 'The Gene the user has proposed a Revision to.'
+
+  field :results, [Types::Revisions::RevisionResult], null: false,
+    description: <<~DOC.strip
+      A list of Revisions generated as a result of this suggestion.
+      If an existing Revision exactly matches the proposed one, it will be returned instead.
+      This is indicated via the 'newlyCreated' Boolean.
+      Revisions are stored on a per-field basis.
+      The changesetId can be used to group Revisions proposed at the same time.
+    DOC
+
+  attr_reader :factor
+
+  def ready?(organization_id: nil, id:, fields:, **kwargs)
+    validate_user_logged_in
+    validate_user_org(organization_id)
+
+    factor = Feature.find_by(id: id)&.feature_instance
+    if factor.nil?
+      raise GraphQL::ExecutionError, "Feature with id #{id} doesn't exist."
+    elsif !factor.is_a?(Features::Factor)
+      raise GraphQL::ExecutionError, "Feature with id #{id} is not a Factor feature."
+    end
+
+    @factor = factor
+
+    existing_source_ids = Source.where(id: fields.source_ids).pluck(:id)
+    if existing_source_ids.size != fields.source_ids.size
+      raise GraphQL::ExecutionError, "Provided source ids: #{fields.source_ids.join(', ')} but only #{existing_source_ids.join(', ')} exist."
+    end
+
+    return true
+  end
+
+  def authorized?(organization_id: nil, **kwargs)
+    validate_user_acting_as_org(user: context[:current_user], organization_id: organization_id)
+    return true
+  end
+
+  def resolve(fields:, id:, organization_id: nil, comment:)
+    updated_factor = InputAdaptors::FactorInputAdaptor.new(factor_input_object: fields).perform
+    cmd = Activities::SuggestRevisionSet.new(
+      existing_obj: factor,
+      updated_obj: updated_factor,
+      originating_user: context[:current_user],
+      organization_id: organization_id,
+      note: comment
+    )
+    res = cmd.perform
+
+    if res.succeeded?
+      {
+        factor: factor,
+        results: res.revision_results
+      }
+    else
+      raise GraphQL::ExecutionError, res.errors.join(', ')
+    end
+  end
+end
+
+
+
+
+
diff --git a/server/app/graphql/types/entities/feature_type.rb b/server/app/graphql/types/entities/feature_type.rb
index eccf2fe2b..1e759f18d 100644
--- a/server/app/graphql/types/entities/feature_type.rb
+++ b/server/app/graphql/types/entities/feature_type.rb
@@ -11,7 +11,7 @@ class FeatureType < Types::BaseObject
     field :id, Int, null: false
     field :name, String, null: false
     field :full_name, String, null: true
-    field :description, String, null: false
+    field :description, String, null: true
     field :feature_aliases, [String], null: false
     field :sources, [Types::Entities::SourceType], null: false
     field :variants, resolver: Resolvers::Variants
diff --git a/server/app/models/features/factor.rb b/server/app/models/features/factor.rb
index db217cbf1..9ecd7410c 100644
--- a/server/app/models/features/factor.rb
+++ b/server/app/models/features/factor.rb
@@ -12,8 +12,12 @@ def display_name
 
     def editable_fields
       [
+        :name,
+        :full_name,
         :description,
-        :source_ids
+        :ncit_id,
+        :source_ids,
+        :feature_alias_ids
       ]
     end
   end
diff --git a/server/app/models/ncit_details.rb b/server/app/models/ncit_details.rb
index f4d3875d1..529c7e741 100644
--- a/server/app/models/ncit_details.rb
+++ b/server/app/models/ncit_details.rb
@@ -33,7 +33,7 @@ def parse_response(resp)
     end
 
     return {
-      synonyms: data["synonyms"] || [],
+      synonyms: data["synonyms"]&.select { |s| s["type"] == "FULL_SYN" } || [],
       definitions: data["definitions"] || []
     }
   end

From 58fe8345f25a1c83bdcb6bdd88476ae35e4bc61c Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Tue, 30 Jan 2024 16:10:49 -0600
Subject: [PATCH 074/125] use new switch feature that narrows types

---
 .../features-summary.page.html                | 32 +++++++++++--------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/client/src/app/views/features/features-detail/features-summary/features-summary.page.html b/client/src/app/views/features/features-detail/features-summary/features-summary.page.html
index eef4aba59..061077946 100644
--- a/client/src/app/views/features/features-detail/features-summary/features-summary.page.html
+++ b/client/src/app/views/features/features-detail/features-summary/features-summary.page.html
@@ -1,17 +1,21 @@
-<ng-container *ngIf=" (feature$ | ngrxPush) as feature">
-  <nz-row [nzGutter]="[8,16]">
-    <ng-container [ngSwitch]="feature.featureInstance.__typename">
-      <!--<span *ngSwitchCase="'Gene'">-->
-      <!--<cvc-genes-summary-->
-      <!--[featureId]="feature.id"-->
-      <!--[gene]="feature.featureInstance"></cvc-genes-summary>-->
-      <!--</span>-->
-      <!--<span *ngSwitchCase="'Factor'">-->
-      <!--<cvc-factor-summary-->
-      <!--[featureId]="feature.id"-->
-      <!--[factor]="feature.featureInstance"></cvc-factor-summary>-->
-      <!--</span>-->
-    </ng-container>
+<ng-container *ngIf="feature$ | ngrxPush as feature">
+  <nz-row [nzGutter]="[8, 16]">
+    @switch (feature.featureInstance.__typename) {
+      @case ('Gene') {
+        <span>
+          <cvc-genes-summary
+            [featureId]="feature.id"
+            [gene]="feature.featureInstance"></cvc-genes-summary>
+        </span>
+      }
+      @case ('Factor') {
+        <span>
+          <cvc-factor-summary
+            [featureId]="feature.id"
+            [factor]="feature.featureInstance"></cvc-factor-summary>
+        </span>
+      }
+    }
 
     <!-- variant menu row -->
     <nz-col [nzSpan]="24">

From 8394ea96e6d1bc065873947ec0605c9540f0aa29 Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Tue, 30 Jan 2024 16:13:12 -0600
Subject: [PATCH 075/125] update prettier to be aware of angular 17 parser

---
 client/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/package.json b/client/package.json
index bd2f1e5eb..41644f0ad 100644
--- a/client/package.json
+++ b/client/package.json
@@ -65,7 +65,7 @@
     "graphql": "^16.8.1",
     "mustache": "^4.2.0",
     "ngx-json-viewer": "^3.0.2",
-    "prettier": "^2.5.1",
+    "prettier": "^3.2.4",
     "svg-to-ts": "^9.0.0",
     "svgo": "^3.0.2",
     "ts-node": "~10.9.1",

From b494c0e9ccf6e5cc5132359d1907caec87b24387 Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Wed, 31 Jan 2024 15:34:34 -0600
Subject: [PATCH 076/125] get feature browse filtering working by feature type.
 stub in factor summary page

---
 .../factor-summary/factor-summary.page.html   | 17 ++--
 .../factor-summary/factor-summary.page.ts     |  2 +
 .../ncit-details/ncit-details.component.html  | 30 ++++++
 .../ncit-details/ncit-details.component.less  | 15 +++
 .../ncit-details/ncit-details.component.ts    | 42 ++++++++
 .../features-table.component.html             | 31 ++++++
 .../features-table.component.ts               | 16 +++-
 .../features-table/features-table.module.ts   |  2 +
 .../features-table/features-table.query.gql   |  3 +
 .../src/app/generated/civic.apollo-helpers.ts |  4 +-
 client/src/app/generated/civic.apollo.ts      | 37 ++++---
 client/src/app/generated/server.model.graphql |  3 +
 client/src/app/generated/server.schema.json   | 44 +++++++++
 .../src/app/graphql/graphql.type-policies.ts  | 13 +--
 client/src/app/layout/layout.component.html   |  2 +-
 .../features-summary.query.gql                |  6 +-
 .../app/graphql/resolvers/browse_features.rb  |  7 ++
 .../browse_tables/browse_feature_type.rb      |  2 +
 ..._feature_browse_table_rows_to_version_3.rb |  8 ++
 server/db/schema.rb                           | 96 ++++++++++---------
 .../views/feature_browse_table_rows_v03.sql   | 47 +++++++++
 21 files changed, 349 insertions(+), 78 deletions(-)
 create mode 100644 client/src/app/components/factors/ncit-details/ncit-details.component.html
 create mode 100644 client/src/app/components/factors/ncit-details/ncit-details.component.less
 create mode 100644 client/src/app/components/factors/ncit-details/ncit-details.component.ts
 create mode 100644 server/db/migrate/20240131205334_update_feature_browse_table_rows_to_version_3.rb
 create mode 100644 server/db/views/feature_browse_table_rows_v03.sql

diff --git a/client/src/app/components/factors/factor-summary/factor-summary.page.html b/client/src/app/components/factors/factor-summary/factor-summary.page.html
index 6954cde6a..440a5da55 100644
--- a/client/src/app/components/factors/factor-summary/factor-summary.page.html
+++ b/client/src/app/components/factors/factor-summary/factor-summary.page.html
@@ -1,7 +1,7 @@
-<nz-row [nzGutter]="[8,16]">
+<nz-row [nzGutter]="[8, 16]">
   <nz-col nzSpan="12">
     <!-- LEFT COLUMN -->
-    <nz-row [nzGutter]="[8,8]">
+    <nz-row [nzGutter]="[8, 8]">
       <!-- factor description, sources block -->
       <nz-col nzSpan="24">
         <!-- description, sources -->
@@ -59,9 +59,9 @@
           <nz-descriptions-item
             nzTitle="Aliases"
             *ngIf="factor.featureAliases.length > 0; else noAliases">
-            <nz-tag *ngFor="let alias of factor.featureAliases"
-              >{{ alias }}</nz-tag
-            >
+            <nz-tag *ngFor="let alias of factor.featureAliases">{{
+              alias
+            }}</nz-tag>
           </nz-descriptions-item>
           <ng-template #noAliases>
             <span
@@ -77,7 +77,10 @@
             nzTitle="Resources">
             <cvc-tag-list>
               <cvc-link-tag
-                [href]="'https://ncithesaurus.nci.nih.gov/ncitbrowser/ConceptReport.jsp?dictionary=NCI_Thesaurus&ns=ncit&code=' + factor.ncitId"
+                [href]="
+                  'https://ncithesaurus.nci.nih.gov/ncitbrowser/ConceptReport.jsp?dictionary=NCI_Thesaurus&ns=ncit&code=' +
+                  factor.ncitId
+                "
                 [tooltip]="'View ' + factor.name + ' in the NCI Thesaurus'">
                 NCIt
               </cvc-link-tag>
@@ -91,6 +94,6 @@
   <!-- last revision submitted/accepted, mygeneinfo col -->
   <nz-col nzSpan="12">
     <!-- ncit info -->
-    NCI STUFF HERE
+    <cvc-ncit-details [ncitDetails]="factor.ncitDetails"></cvc-ncit-details>
   </nz-col>
 </nz-row>
diff --git a/client/src/app/components/factors/factor-summary/factor-summary.page.ts b/client/src/app/components/factors/factor-summary/factor-summary.page.ts
index 65e6f386a..9aef81cc7 100644
--- a/client/src/app/components/factors/factor-summary/factor-summary.page.ts
+++ b/client/src/app/components/factors/factor-summary/factor-summary.page.ts
@@ -15,6 +15,7 @@ import { NzGridModule } from 'ng-zorro-antd/grid'
 import { NzSpaceModule } from 'ng-zorro-antd/space'
 import { NzTagModule } from 'ng-zorro-antd/tag'
 import { NzTypographyModule } from 'ng-zorro-antd/typography'
+import { CvcNcitDetailsComponent } from '../ncit-details/ncit-details.component'
 
 @Component({
   standalone: true,
@@ -33,6 +34,7 @@ import { NzTypographyModule } from 'ng-zorro-antd/typography'
     CvcTagListModule,
     CvcSourceTagModule,
     CvcLinkTagModule,
+    CvcNcitDetailsComponent,
   ],
 })
 export class FactorSummaryComponent implements OnInit {
diff --git a/client/src/app/components/factors/ncit-details/ncit-details.component.html b/client/src/app/components/factors/ncit-details/ncit-details.component.html
new file mode 100644
index 000000000..0296eab02
--- /dev/null
+++ b/client/src/app/components/factors/ncit-details/ncit-details.component.html
@@ -0,0 +1,30 @@
+@if (ncitDetails) {
+  <nz-card nzTitle="NCI Thesaurus">
+    <nz-col [nzSpan]="24">
+      <nz-descriptions
+        nzTitle="Synonyms"
+        nzSize="small"
+        [nzBordered]="true"
+        [nzColumn]="2">
+        @for (synonym of synonymsBySource.keys(); track $index) {
+          <nz-descriptions-item
+            [nzTitle]="synonym"
+            [nzSpan]="2">
+            <cvc-tag-list>
+              @for (source of synonymsBySource.get(synonym); track $index) {
+                <nz-tag>{{ source }}</nz-tag>
+              }
+            </cvc-tag-list>
+          </nz-descriptions-item>
+        }
+      </nz-descriptions>
+    </nz-col>
+  </nz-card>
+}
+<ng-template #noValue>
+  <span
+    nz-typography
+    nzType="secondary">
+    Not Found
+  </span>
+</ng-template>
diff --git a/client/src/app/components/factors/ncit-details/ncit-details.component.less b/client/src/app/components/factors/ncit-details/ncit-details.component.less
new file mode 100644
index 000000000..30681b7cc
--- /dev/null
+++ b/client/src/app/components/factors/ncit-details/ncit-details.component.less
@@ -0,0 +1,15 @@
+:host {
+  display: block;
+}
+
+nz-card {
+  width: 100%;
+}
+
+.key-col {
+  text-align: right;
+  font-weight: bold;
+}
+.button-col {
+  text-align: right;
+}
diff --git a/client/src/app/components/factors/ncit-details/ncit-details.component.ts b/client/src/app/components/factors/ncit-details/ncit-details.component.ts
new file mode 100644
index 000000000..dedc3985f
--- /dev/null
+++ b/client/src/app/components/factors/ncit-details/ncit-details.component.ts
@@ -0,0 +1,42 @@
+import { CommonModule } from '@angular/common'
+import { Component, Input, OnInit } from '@angular/core'
+import { CvcTagListModule } from '@app/components/shared/tag-list/tag-list.module'
+import { Maybe, NcitDetailsFragment } from '@app/generated/civic.apollo'
+import { NzCardModule } from 'ng-zorro-antd/card'
+import { NzDescriptionsModule } from 'ng-zorro-antd/descriptions'
+import { NzGridModule } from 'ng-zorro-antd/grid'
+import { NzTagModule } from 'ng-zorro-antd/tag'
+
+@Component({
+  standalone: true,
+  selector: 'cvc-ncit-details',
+  templateUrl: './ncit-details.component.html',
+  styleUrls: ['./ncit-details.component.less'],
+  imports: [
+    CommonModule,
+
+    NzDescriptionsModule,
+    NzCardModule,
+    NzTagModule,
+    NzGridModule,
+
+    CvcTagListModule,
+  ],
+})
+export class CvcNcitDetailsComponent implements OnInit {
+  @Input() ncitDetails: Maybe<NcitDetailsFragment>
+
+  synonymsBySource = new Map<string, string[]>()
+
+  ngOnInit(): void {
+    if (this.ncitDetails) {
+      this.ncitDetails.synonyms.forEach((s) => {
+        if (!this.synonymsBySource.has(s.name)) {
+          this.synonymsBySource.set(s.name, [])
+        }
+        const list = this.synonymsBySource.get(s.name)
+        list?.push(s.source)
+      })
+    }
+  }
+}
diff --git a/client/src/app/components/features/features-table/features-table.component.html b/client/src/app/components/features/features-table/features-table.component.html
index 931b2fc1d..06c90fa0e 100644
--- a/client/src/app/components/features/features-table/features-table.component.html
+++ b/client/src/app/components/features/features-table/features-table.component.html
@@ -53,6 +53,11 @@
           [nzSortFn]="true">
           Name
         </th>
+        <th
+          nzLeft
+          nzWidth="70px">
+          Type
+        </th>
         <th
           nzLeft
           nzWidth="200px">
@@ -125,6 +130,24 @@
               filterChange$.next()
             "></cvc-clearable-input-filter>
         </th>
+        <th nzLeft>
+          <nz-select
+            nzAllowClear
+            nzSize="small"
+            [nzDropdownMatchSelectWidth]="false"
+            nzPlaceHolder="Type"
+            (ngModelChange)="filterChange$.next()"
+            [(ngModel)]="typeInput">
+            <nz-option
+              [nzValue]="featureTypes.Gene"
+              nzLabel="Gene">
+            </nz-option>
+            <nz-option
+              [nzValue]="featureTypes.Factor"
+              nzLabel="Factor">
+            </nz-option>
+          </nz-select>
+        </th>
         <th nzLeft>
           <cvc-clearable-input-filter
             [(inputModel)]="aliasInput"
@@ -161,6 +184,14 @@
           <td nzLeft>
             <cvc-feature-tag [feature]="feature"></cvc-feature-tag>
           </td>
+          <td>
+            <span
+              nz-typography
+              nz
+              nzType="secondary">
+              {{ feature.featureInstanceType }}
+            </span>
+          </td>
           <td nzLeft>
             <cvc-plain-tag-overflow
               [tags]="feature.featureAliases"
diff --git a/client/src/app/components/features/features-table/features-table.component.ts b/client/src/app/components/features/features-table/features-table.component.ts
index d30fd9522..c98e28ebd 100644
--- a/client/src/app/components/features/features-table/features-table.component.ts
+++ b/client/src/app/components/features/features-table/features-table.component.ts
@@ -18,6 +18,7 @@ import {
   BrowseFeaturesGQL,
   BrowseFeaturesQuery,
   BrowseFeaturesQueryVariables,
+  FeatureInstanceTypes,
   FeaturesSortColumns,
   Maybe,
   PageInfo,
@@ -33,7 +34,6 @@ import {
   filter,
   map,
   skip,
-  take,
   withLatestFrom,
 } from 'rxjs/operators'
 import { pluck } from 'rxjs-etc/operators'
@@ -90,11 +90,17 @@ export class CvcFeaturesTableComponent implements OnInit {
   therapyInput: Maybe<string>
   nameInput: Maybe<string>
   aliasInput: Maybe<string>
+  typeInput: Maybe<FeatureInstanceTypes>
+
+  featureTypes = FeatureInstanceTypes
 
   sortColumns: typeof FeaturesSortColumns = FeaturesSortColumns
 
   private debouncedQuery = new Subject<void>()
-  constructor(private query: BrowseFeaturesGQL, private cdr: ChangeDetectorRef) {
+  constructor(
+    private query: BrowseFeaturesGQL,
+    private cdr: ChangeDetectorRef
+  ) {
     this.noMoreRows$ = new BehaviorSubject<boolean>(false)
     this.scrollEvent$ = new BehaviorSubject<ScrollEvent>('stop')
     this.sortChange$ = new Subject<SortDirectionEvent>()
@@ -191,6 +197,7 @@ export class CvcFeaturesTableComponent implements OnInit {
         featureAlias: this.aliasInput,
         diseaseName: this.diseaseInput,
         therapyName: this.therapyInput,
+        featureType: this.typeInput,
       })
       .then(() => this.scrollIndex$.next(0))
 
@@ -202,7 +209,10 @@ export class CvcFeaturesTableComponent implements OnInit {
   }
 
   // virtual scroll helpers
-  trackByIndex(_: number, data: Maybe<BrowseFeaturesFieldsFragment>): Maybe<number> {
+  trackByIndex(
+    _: number,
+    data: Maybe<BrowseFeaturesFieldsFragment>
+  ): Maybe<number> {
     return data?.id
   }
 }
diff --git a/client/src/app/components/features/features-table/features-table.module.ts b/client/src/app/components/features/features-table/features-table.module.ts
index 9d97c3ad2..c12914dc7 100644
--- a/client/src/app/components/features/features-table/features-table.module.ts
+++ b/client/src/app/components/features/features-table/features-table.module.ts
@@ -22,6 +22,7 @@ import { NzToolTipModule } from 'ng-zorro-antd/tooltip'
 import { NzTypographyModule } from 'ng-zorro-antd/typography'
 import { CvcFeatureTagModule } from '../feature-tag/feature-tag.module'
 import { CvcFeaturesTableComponent } from './features-table.component'
+import { NzSelectModule } from 'ng-zorro-antd/select'
 
 @NgModule({
   declarations: [CvcFeaturesTableComponent],
@@ -40,6 +41,7 @@ import { CvcFeaturesTableComponent } from './features-table.component'
     NzTagModule,
     NzToolTipModule,
     NzTypographyModule,
+    NzSelectModule,
 
     CvcAutoHeightCardModule,
     CvcAutoHeightTableModule,
diff --git a/client/src/app/components/features/features-table/features-table.query.gql b/client/src/app/components/features/features-table/features-table.query.gql
index c9c427981..f794d455d 100644
--- a/client/src/app/components/features/features-table/features-table.query.gql
+++ b/client/src/app/components/features/features-table/features-table.query.gql
@@ -3,6 +3,7 @@ query BrowseFeatures(
   $therapyName: String
   $featureAlias: String
   $diseaseName: String
+  $featureType: FeatureInstanceTypes
   $sortBy: FeaturesSort
   $first: Int
   $last: Int
@@ -14,6 +15,7 @@ query BrowseFeatures(
     therapyName: $therapyName
     featureAlias: $featureAlias
     diseaseName: $diseaseName
+    featureType: $featureType
     sortBy: $sortBy
     first: $first
     last: $last
@@ -59,4 +61,5 @@ fragment BrowseFeaturesFields on BrowseFeature {
   evidenceItemCount
   assertionCount
   molecularProfileCount
+  featureInstanceType
 }
diff --git a/client/src/app/generated/civic.apollo-helpers.ts b/client/src/app/generated/civic.apollo-helpers.ts
index d47e451a7..0698986fc 100644
--- a/client/src/app/generated/civic.apollo-helpers.ts
+++ b/client/src/app/generated/civic.apollo-helpers.ts
@@ -188,13 +188,15 @@ export type BrowseDiseaseEdgeFieldPolicy = {
 	cursor?: FieldPolicy<any> | FieldReadFunction<any>,
 	node?: FieldPolicy<any> | FieldReadFunction<any>
 };
-export type BrowseFeatureKeySpecifier = ('assertionCount' | 'description' | 'diseases' | 'evidenceItemCount' | 'featureAliases' | 'flagged' | 'flags' | 'id' | 'link' | 'molecularProfileCount' | 'name' | 'therapies' | 'variantCount' | BrowseFeatureKeySpecifier)[];
+export type BrowseFeatureKeySpecifier = ('assertionCount' | 'description' | 'diseases' | 'evidenceItemCount' | 'featureAliases' | 'featureInstanceId' | 'featureInstanceType' | 'flagged' | 'flags' | 'id' | 'link' | 'molecularProfileCount' | 'name' | 'therapies' | 'variantCount' | BrowseFeatureKeySpecifier)[];
 export type BrowseFeatureFieldPolicy = {
 	assertionCount?: FieldPolicy<any> | FieldReadFunction<any>,
 	description?: FieldPolicy<any> | FieldReadFunction<any>,
 	diseases?: FieldPolicy<any> | FieldReadFunction<any>,
 	evidenceItemCount?: FieldPolicy<any> | FieldReadFunction<any>,
 	featureAliases?: FieldPolicy<any> | FieldReadFunction<any>,
+	featureInstanceId?: FieldPolicy<any> | FieldReadFunction<any>,
+	featureInstanceType?: FieldPolicy<any> | FieldReadFunction<any>,
 	flagged?: FieldPolicy<any> | FieldReadFunction<any>,
 	flags?: FieldPolicy<any> | FieldReadFunction<any>,
 	id?: FieldPolicy<any> | FieldReadFunction<any>,
diff --git a/client/src/app/generated/civic.apollo.ts b/client/src/app/generated/civic.apollo.ts
index 221b25165..73f0b579e 100644
--- a/client/src/app/generated/civic.apollo.ts
+++ b/client/src/app/generated/civic.apollo.ts
@@ -535,6 +535,8 @@ export type BrowseFeature = Flaggable & {
   diseases?: Maybe<Array<Disease>>;
   evidenceItemCount: Scalars['Int'];
   featureAliases?: Maybe<Array<Scalars['String']>>;
+  featureInstanceId: Scalars['Int'];
+  featureInstanceType: FeatureInstanceTypes;
   flagged: Scalars['Boolean'];
   /** List and filter flags. */
   flags: FlagConnection;
@@ -3782,6 +3784,7 @@ export type QueryBrowseFeaturesArgs = {
   diseaseName?: InputMaybe<Scalars['String']>;
   featureAlias?: InputMaybe<Scalars['String']>;
   featureName?: InputMaybe<Scalars['String']>;
+  featureType?: InputMaybe<FeatureInstanceTypes>;
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   sortBy?: InputMaybe<FeaturesSort>;
@@ -6346,6 +6349,7 @@ export type BrowseFeaturesQueryVariables = Exact<{
   therapyName?: InputMaybe<Scalars['String']>;
   featureAlias?: InputMaybe<Scalars['String']>;
   diseaseName?: InputMaybe<Scalars['String']>;
+  featureType?: InputMaybe<FeatureInstanceTypes>;
   sortBy?: InputMaybe<FeaturesSort>;
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
@@ -6354,9 +6358,9 @@ export type BrowseFeaturesQueryVariables = Exact<{
 }>;
 
 
-export type BrowseFeaturesQuery = { __typename: 'Query', browseFeatures: { __typename: 'BrowseFeatureConnection', lastUpdated: any, totalCount: number, filteredCount: number, pageCount: number, edges: Array<{ __typename: 'BrowseFeatureEdge', cursor: string, node?: { __typename: 'BrowseFeature', id: number, name: string, link: string, flagged: boolean, featureAliases?: Array<string> | undefined, variantCount: number, evidenceItemCount: number, assertionCount: number, molecularProfileCount: number, diseases?: Array<{ __typename: 'Disease', name: string, id: number, link: string }> | undefined, therapies?: Array<{ __typename: 'Therapy', name: string, id: number, link: string }> | undefined } | undefined }>, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasPreviousPage: boolean, hasNextPage: boolean } } };
+export type BrowseFeaturesQuery = { __typename: 'Query', browseFeatures: { __typename: 'BrowseFeatureConnection', lastUpdated: any, totalCount: number, filteredCount: number, pageCount: number, edges: Array<{ __typename: 'BrowseFeatureEdge', cursor: string, node?: { __typename: 'BrowseFeature', id: number, name: string, link: string, flagged: boolean, featureAliases?: Array<string> | undefined, variantCount: number, evidenceItemCount: number, assertionCount: number, molecularProfileCount: number, featureInstanceType: FeatureInstanceTypes, diseases?: Array<{ __typename: 'Disease', name: string, id: number, link: string }> | undefined, therapies?: Array<{ __typename: 'Therapy', name: string, id: number, link: string }> | undefined } | undefined }>, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasPreviousPage: boolean, hasNextPage: boolean } } };
 
-export type BrowseFeaturesFieldsFragment = { __typename: 'BrowseFeature', id: number, name: string, link: string, flagged: boolean, featureAliases?: Array<string> | undefined, variantCount: number, evidenceItemCount: number, assertionCount: number, molecularProfileCount: number, diseases?: Array<{ __typename: 'Disease', name: string, id: number, link: string }> | undefined, therapies?: Array<{ __typename: 'Therapy', name: string, id: number, link: string }> | undefined };
+export type BrowseFeaturesFieldsFragment = { __typename: 'BrowseFeature', id: number, name: string, link: string, flagged: boolean, featureAliases?: Array<string> | undefined, variantCount: number, evidenceItemCount: number, assertionCount: number, molecularProfileCount: number, featureInstanceType: FeatureInstanceTypes, diseases?: Array<{ __typename: 'Disease', name: string, id: number, link: string }> | undefined, therapies?: Array<{ __typename: 'Therapy', name: string, id: number, link: string }> | undefined };
 
 export type FlagListQueryVariables = Exact<{
   flaggable?: InputMaybe<FlaggableInput>;
@@ -7639,6 +7643,8 @@ export type GeneSummaryFieldsFragment = { __typename: 'Gene', id: number, descri
 
 export type FactorSummaryFieldsFragment = { __typename: 'Factor', id: number, name: string, description?: string | undefined, featureAliases: Array<string>, ncitId?: string | undefined, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceUrl?: string | undefined, displayType: string, sourceType: SourceSource }>, ncitDetails?: { __typename: 'NcitDetails', synonyms: Array<{ __typename: 'NcitSynonym', name: string, source: string }>, definitions: Array<{ __typename: 'NcitDefinition', definition: string, source: string }> } | undefined };
 
+export type NcitDetailsFragment = { __typename: 'NcitDetails', synonyms: Array<{ __typename: 'NcitSynonym', name: string, source: string }>, definitions: Array<{ __typename: 'NcitDefinition', definition: string, source: string }> };
+
 export type MolecularProfileDetailQueryVariables = Exact<{
   mpId: Scalars['Int'];
 }>;
@@ -8382,6 +8388,7 @@ export const BrowseFeaturesFieldsFragmentDoc = gql`
   evidenceItemCount
   assertionCount
   molecularProfileCount
+  featureInstanceType
 }
     `;
 export const FlagFragmentDoc = gql`
@@ -9889,6 +9896,18 @@ export const GeneSummaryFieldsFragmentDoc = gql`
   myGeneInfoDetails
 }
     `;
+export const NcitDetailsFragmentDoc = gql`
+    fragment NcitDetails on NcitDetails {
+  synonyms {
+    name
+    source
+  }
+  definitions {
+    definition
+    source
+  }
+}
+    `;
 export const FactorSummaryFieldsFragmentDoc = gql`
     fragment FactorSummaryFields on Factor {
   id
@@ -9905,17 +9924,10 @@ export const FactorSummaryFieldsFragmentDoc = gql`
     sourceType
   }
   ncitDetails {
-    synonyms {
-      name
-      source
-    }
-    definitions {
-      definition
-      source
-    }
+    ...NcitDetails
   }
 }
-    `;
+    ${NcitDetailsFragmentDoc}`;
 export const FeatureSummaryFieldsFragmentDoc = gql`
     fragment FeatureSummaryFields on Feature {
   id
@@ -11090,12 +11102,13 @@ export const FeaturePopoverDocument = gql`
     }
   }
 export const BrowseFeaturesDocument = gql`
-    query BrowseFeatures($featureName: String, $therapyName: String, $featureAlias: String, $diseaseName: String, $sortBy: FeaturesSort, $first: Int, $last: Int, $before: String, $after: String) {
+    query BrowseFeatures($featureName: String, $therapyName: String, $featureAlias: String, $diseaseName: String, $featureType: FeatureInstanceTypes, $sortBy: FeaturesSort, $first: Int, $last: Int, $before: String, $after: String) {
   browseFeatures(
     featureName: $featureName
     therapyName: $therapyName
     featureAlias: $featureAlias
     diseaseName: $diseaseName
+    featureType: $featureType
     sortBy: $sortBy
     first: $first
     last: $last
diff --git a/client/src/app/generated/server.model.graphql b/client/src/app/generated/server.model.graphql
index 278a28a8e..9a02fa80b 100644
--- a/client/src/app/generated/server.model.graphql
+++ b/client/src/app/generated/server.model.graphql
@@ -884,6 +884,8 @@ type BrowseFeature implements Flaggable {
   diseases: [Disease!]
   evidenceItemCount: Int!
   featureAliases: [String!]
+  featureInstanceId: Int!
+  featureInstanceType: FeatureInstanceTypes!
   flagged: Boolean!
 
   """
@@ -5991,6 +5993,7 @@ type Query {
     diseaseName: String
     featureAlias: String
     featureName: String
+    featureType: FeatureInstanceTypes
 
     """
     Returns the first _n_ elements from the list.
diff --git a/client/src/app/generated/server.schema.json b/client/src/app/generated/server.schema.json
index 7fedfe9ad..6740bc5bf 100644
--- a/client/src/app/generated/server.schema.json
+++ b/client/src/app/generated/server.schema.json
@@ -4060,6 +4060,38 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "featureInstanceId",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "featureInstanceType",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "ENUM",
+                  "name": "FeatureInstanceTypes",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "flagged",
               "description": null,
@@ -28070,6 +28102,18 @@
                   "isDeprecated": false,
                   "deprecationReason": null
                 },
+                {
+                  "name": "featureType",
+                  "description": null,
+                  "type": {
+                    "kind": "ENUM",
+                    "name": "FeatureInstanceTypes",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
                 {
                   "name": "sortBy",
                   "description": null,
diff --git a/client/src/app/graphql/graphql.type-policies.ts b/client/src/app/graphql/graphql.type-policies.ts
index e4c8d4e8d..dcee47563 100644
--- a/client/src/app/graphql/graphql.type-policies.ts
+++ b/client/src/app/graphql/graphql.type-policies.ts
@@ -14,10 +14,11 @@ export const CvcTypePolicies: TypePolicies = {
   },
   Query: {
     fields: {
-      browseGenes: relayStylePagination([
-        'entrezSymbol',
+      browseFeatures: relayStylePagination([
+        'name',
+        'featureInstanceType',
         'therapayName',
-        'geneAlias',
+        'featureAlias',
         'diseaseName',
       ]),
       browseVariants: relayStylePagination([
@@ -52,7 +53,7 @@ export const CvcTypePolicies: TypePolicies = {
         'journal',
         'clinicalTrialId',
         'id',
-        'openAccess'
+        'openAccess',
       ]),
       sourceSuggestions: relayStylePagination([
         'sourceType',
@@ -73,9 +74,9 @@ export const CvcTypePolicies: TypePolicies = {
         'originatingUserId',
         'eventType',
       ]),
-      variants: relayStylePagination(['geneId', 'name']),
+      variants: relayStylePagination(['featureId', 'name']),
       molecularProfiles: relayStylePagination([
-        'geneId',
+        'featureId',
         'name',
         'evidenceStatusFilter',
       ]),
diff --git a/client/src/app/layout/layout.component.html b/client/src/app/layout/layout.component.html
index 8016323b9..93027cca4 100644
--- a/client/src/app/layout/layout.component.html
+++ b/client/src/app/layout/layout.component.html
@@ -78,7 +78,7 @@
             <i
               nz-icon
               nzType="civic-feature"></i>
-            <span> <a routerLink="/features">Features</a> </span>
+            <a routerLink="/features">Features</a>
           </li>
 
           <li
diff --git a/client/src/app/views/features/features-detail/features-summary/features-summary.query.gql b/client/src/app/views/features/features-detail/features-summary/features-summary.query.gql
index 78a6cf894..b6f42789a 100644
--- a/client/src/app/views/features/features-detail/features-summary/features-summary.query.gql
+++ b/client/src/app/views/features/features-detail/features-summary/features-summary.query.gql
@@ -68,6 +68,11 @@ fragment FactorSummaryFields on Factor {
     sourceType
   }
   ncitDetails {
+    ...NcitDetails
+  }
+}
+
+fragment NcitDetails on NcitDetails {
     synonyms {
       name
       source
@@ -76,5 +81,4 @@ fragment FactorSummaryFields on Factor {
       definition
       source
     }
-  }
 }
diff --git a/server/app/graphql/resolvers/browse_features.rb b/server/app/graphql/resolvers/browse_features.rb
index 86b06ee25..036a4b9d9 100644
--- a/server/app/graphql/resolvers/browse_features.rb
+++ b/server/app/graphql/resolvers/browse_features.rb
@@ -13,6 +13,13 @@ class Resolvers::BrowseFeatures < GraphQL::Schema::Resolver
   option(:feature_alias, type: String)    { |scope, value| scope.where(array_query_for_column('alias_names'), "#{value}%") }
   option(:disease_name, type: String)  { |scope, value| scope.where(json_name_query_for_column('diseases'), "%#{value}%") }
   option(:therapy_name, type: String)     { |scope, value| scope.where(json_name_query_for_column('therapies'), "%#{value}%") }
+  option(:feature_type, type: Types::FeatureInstanceTypes) do |scope, value|
+    if value
+      scope.where(feature_instance_type: value)
+    else
+      scope
+    end
+  end
 
   option :sort_by, type: Types::BrowseTables::FeaturesSortType do |scope, value|
     case value.column
diff --git a/server/app/graphql/types/browse_tables/browse_feature_type.rb b/server/app/graphql/types/browse_tables/browse_feature_type.rb
index 3e93164ff..c10bde9d2 100644
--- a/server/app/graphql/types/browse_tables/browse_feature_type.rb
+++ b/server/app/graphql/types/browse_tables/browse_feature_type.rb
@@ -14,6 +14,8 @@ class BrowseFeatureType < Types::BaseObject
     field :evidence_item_count, Int, null: false
     field :assertion_count, Int, null: false
     field :molecular_profile_count, Int, null: false
+    field :feature_instance_type, Types::FeatureInstanceTypes, null: false
+    field :feature_instance_id, Int, null: false
 
     def link
       Rails.application.routes.url_helpers.url_for("/features/#{object.id}")
diff --git a/server/db/migrate/20240131205334_update_feature_browse_table_rows_to_version_3.rb b/server/db/migrate/20240131205334_update_feature_browse_table_rows_to_version_3.rb
new file mode 100644
index 000000000..15b9ab5b7
--- /dev/null
+++ b/server/db/migrate/20240131205334_update_feature_browse_table_rows_to_version_3.rb
@@ -0,0 +1,8 @@
+class UpdateFeatureBrowseTableRowsToVersion3 < ActiveRecord::Migration[6.1]
+  def change
+    update_view :feature_browse_table_rows,
+      version: 3,
+      revert_to_version: 2,
+      materialized: true
+  end
+end
diff --git a/server/db/schema.rb b/server/db/schema.rb
index 43b468af3..d018eaf23 100644
--- a/server/db/schema.rb
+++ b/server/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2024_01_30_000329) do
+ActiveRecord::Schema.define(version: 2024_01_31_205334) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -1180,52 +1180,6 @@
        JOIN evidence_items ei ON (((mp.id = ei.molecular_profile_id) AND (ei.deleted = false) AND ((ei.status)::text <> 'rejected'::text))))
     GROUP BY mp.id;
   SQL
-  create_view "feature_browse_table_rows", materialized: true, sql_definition: <<-SQL
-      SELECT outer_features.id,
-      outer_features.name,
-      outer_features.flagged,
-      array_agg(DISTINCT feature_aliases.name ORDER BY feature_aliases.name) AS alias_names,
-      json_agg(DISTINCT jsonb_build_object('name', diseases.name, 'id', diseases.id, 'total', disease_count.total)) FILTER (WHERE (diseases.name IS NOT NULL)) AS diseases,
-      json_agg(DISTINCT jsonb_build_object('name', therapies.name, 'id', therapies.id, 'total', therapy_count.total)) FILTER (WHERE (therapies.name IS NOT NULL)) AS therapies,
-      count(DISTINCT variants.id) AS variant_count,
-      count(DISTINCT evidence_items.id) AS evidence_item_count,
-      count(DISTINCT assertions.id) AS assertion_count,
-      count(DISTINCT molecular_profiles.id) AS molecular_profile_count
-     FROM ((((((((((((features outer_features
-       LEFT JOIN feature_aliases_features ON ((feature_aliases_features.feature_id = outer_features.id)))
-       LEFT JOIN feature_aliases ON ((feature_aliases.id = feature_aliases_features.feature_alias_id)))
-       JOIN variants ON ((variants.feature_id = outer_features.id)))
-       JOIN molecular_profiles_variants ON ((molecular_profiles_variants.variant_id = variants.id)))
-       JOIN molecular_profiles ON ((molecular_profiles.id = molecular_profiles_variants.molecular_profile_id)))
-       JOIN evidence_items ON ((evidence_items.molecular_profile_id = molecular_profiles.id)))
-       LEFT JOIN diseases ON ((diseases.id = evidence_items.disease_id)))
-       LEFT JOIN evidence_items_therapies ON ((evidence_items_therapies.evidence_item_id = evidence_items.id)))
-       LEFT JOIN therapies ON ((therapies.id = evidence_items_therapies.therapy_id)))
-       LEFT JOIN assertions ON ((assertions.molecular_profile_id = molecular_profiles.id)))
-       LEFT JOIN LATERAL ( SELECT therapies_1.id AS therapy_id,
-              count(DISTINCT evidence_items_1.id) AS total
-             FROM (((((evidence_items evidence_items_1
-               JOIN molecular_profiles molecular_profiles_1 ON ((molecular_profiles_1.id = evidence_items_1.molecular_profile_id)))
-               JOIN molecular_profiles_variants molecular_profiles_variants_1 ON ((molecular_profiles_variants_1.molecular_profile_id = molecular_profiles_1.id)))
-               JOIN variants variants_1 ON ((variants_1.id = molecular_profiles_variants_1.variant_id)))
-               JOIN evidence_items_therapies evidence_items_therapies_1 ON ((evidence_items_therapies_1.evidence_item_id = evidence_items_1.id)))
-               JOIN therapies therapies_1 ON ((therapies_1.id = evidence_items_therapies_1.therapy_id)))
-            WHERE (variants_1.feature_id = outer_features.id)
-            GROUP BY therapies_1.id) therapy_count ON ((therapies.id = therapy_count.therapy_id)))
-       LEFT JOIN LATERAL ( SELECT diseases_1.id AS disease_id,
-              count(DISTINCT evidence_items_1.id) AS total
-             FROM ((((evidence_items evidence_items_1
-               JOIN molecular_profiles molecular_profiles_1 ON ((molecular_profiles_1.id = evidence_items_1.molecular_profile_id)))
-               JOIN molecular_profiles_variants molecular_profiles_variants_1 ON ((molecular_profiles_variants_1.molecular_profile_id = molecular_profiles_1.id)))
-               JOIN variants variants_1 ON ((variants_1.id = molecular_profiles_variants_1.variant_id)))
-               JOIN diseases diseases_1 ON ((diseases_1.id = evidence_items_1.disease_id)))
-            WHERE (variants_1.feature_id = outer_features.id)
-            GROUP BY diseases_1.id) disease_count ON ((diseases.id = disease_count.disease_id)))
-    WHERE (((evidence_items.status)::text <> 'rejected'::text) AND (molecular_profiles.deprecated = false) AND (variants.deprecated = false))
-    GROUP BY outer_features.id, outer_features.name;
-  SQL
-  add_index "feature_browse_table_rows", ["id"], name: "index_feature_browse_table_rows_on_id", unique: true
-
   create_view "disease_browse_table_rows", materialized: true, sql_definition: <<-SQL
       SELECT diseases.id,
       diseases.name,
@@ -1338,4 +1292,52 @@
   SQL
   add_index "molecular_profile_browse_table_rows", ["id"], name: "index_molecular_profile_browse_table_rows_on_id", unique: true
 
+  create_view "feature_browse_table_rows", materialized: true, sql_definition: <<-SQL
+      SELECT outer_features.id,
+      outer_features.name,
+      outer_features.flagged,
+      outer_features.feature_instance_type,
+      outer_features.feature_instance_id,
+      array_agg(DISTINCT feature_aliases.name ORDER BY feature_aliases.name) AS alias_names,
+      json_agg(DISTINCT jsonb_build_object('name', diseases.name, 'id', diseases.id, 'total', disease_count.total)) FILTER (WHERE (diseases.name IS NOT NULL)) AS diseases,
+      json_agg(DISTINCT jsonb_build_object('name', therapies.name, 'id', therapies.id, 'total', therapy_count.total)) FILTER (WHERE (therapies.name IS NOT NULL)) AS therapies,
+      count(DISTINCT variants.id) AS variant_count,
+      count(DISTINCT evidence_items.id) AS evidence_item_count,
+      count(DISTINCT assertions.id) AS assertion_count,
+      count(DISTINCT molecular_profiles.id) AS molecular_profile_count
+     FROM ((((((((((((features outer_features
+       LEFT JOIN feature_aliases_features ON ((feature_aliases_features.feature_id = outer_features.id)))
+       LEFT JOIN feature_aliases ON ((feature_aliases.id = feature_aliases_features.feature_alias_id)))
+       JOIN variants ON ((variants.feature_id = outer_features.id)))
+       JOIN molecular_profiles_variants ON ((molecular_profiles_variants.variant_id = variants.id)))
+       JOIN molecular_profiles ON ((molecular_profiles.id = molecular_profiles_variants.molecular_profile_id)))
+       JOIN evidence_items ON ((evidence_items.molecular_profile_id = molecular_profiles.id)))
+       LEFT JOIN diseases ON ((diseases.id = evidence_items.disease_id)))
+       LEFT JOIN evidence_items_therapies ON ((evidence_items_therapies.evidence_item_id = evidence_items.id)))
+       LEFT JOIN therapies ON ((therapies.id = evidence_items_therapies.therapy_id)))
+       LEFT JOIN assertions ON ((assertions.molecular_profile_id = molecular_profiles.id)))
+       LEFT JOIN LATERAL ( SELECT therapies_1.id AS therapy_id,
+              count(DISTINCT evidence_items_1.id) AS total
+             FROM (((((evidence_items evidence_items_1
+               JOIN molecular_profiles molecular_profiles_1 ON ((molecular_profiles_1.id = evidence_items_1.molecular_profile_id)))
+               JOIN molecular_profiles_variants molecular_profiles_variants_1 ON ((molecular_profiles_variants_1.molecular_profile_id = molecular_profiles_1.id)))
+               JOIN variants variants_1 ON ((variants_1.id = molecular_profiles_variants_1.variant_id)))
+               JOIN evidence_items_therapies evidence_items_therapies_1 ON ((evidence_items_therapies_1.evidence_item_id = evidence_items_1.id)))
+               JOIN therapies therapies_1 ON ((therapies_1.id = evidence_items_therapies_1.therapy_id)))
+            WHERE (variants_1.feature_id = outer_features.id)
+            GROUP BY therapies_1.id) therapy_count ON ((therapies.id = therapy_count.therapy_id)))
+       LEFT JOIN LATERAL ( SELECT diseases_1.id AS disease_id,
+              count(DISTINCT evidence_items_1.id) AS total
+             FROM ((((evidence_items evidence_items_1
+               JOIN molecular_profiles molecular_profiles_1 ON ((molecular_profiles_1.id = evidence_items_1.molecular_profile_id)))
+               JOIN molecular_profiles_variants molecular_profiles_variants_1 ON ((molecular_profiles_variants_1.molecular_profile_id = molecular_profiles_1.id)))
+               JOIN variants variants_1 ON ((variants_1.id = molecular_profiles_variants_1.variant_id)))
+               JOIN diseases diseases_1 ON ((diseases_1.id = evidence_items_1.disease_id)))
+            WHERE (variants_1.feature_id = outer_features.id)
+            GROUP BY diseases_1.id) disease_count ON ((diseases.id = disease_count.disease_id)))
+    WHERE (((evidence_items.status)::text <> 'rejected'::text) AND (molecular_profiles.deprecated = false) AND (variants.deprecated = false))
+    GROUP BY outer_features.id, outer_features.name;
+  SQL
+  add_index "feature_browse_table_rows", ["id"], name: "index_feature_browse_table_rows_on_id", unique: true
+
 end
diff --git a/server/db/views/feature_browse_table_rows_v03.sql b/server/db/views/feature_browse_table_rows_v03.sql
new file mode 100644
index 000000000..f4f568544
--- /dev/null
+++ b/server/db/views/feature_browse_table_rows_v03.sql
@@ -0,0 +1,47 @@
+SELECT outer_features.id,
+  outer_features.name,
+  outer_features.flagged,
+  outer_features.feature_instance_type,
+  outer_features.feature_instance_id,
+  array_agg(distinct(feature_aliases.name) order by feature_aliases.name) as alias_names,
+  json_agg(distinct jsonb_build_object('name', diseases.name, 'id', diseases.id, 'total', disease_count.total))  FILTER (WHERE diseases.name IS NOT NULL) as diseases,
+  json_agg(distinct jsonb_build_object('name', therapies.name, 'id', therapies.id, 'total', therapy_count.total))  FILTER (WHERE therapies.name IS NOT NULL) as therapies,
+  count(distinct(variants.id)) as variant_count,
+  count(distinct(evidence_items.id)) as evidence_item_count,
+  count(distinct(assertions.id)) as assertion_count,
+  count(distinct(molecular_profiles.id)) as molecular_profile_count
+FROM features outer_features
+LEFT OUTER JOIN feature_aliases_features ON feature_aliases_features.feature_id = outer_features.id
+LEFT OUTER JOIN feature_aliases ON feature_aliases.id = feature_aliases_features.feature_alias_id
+INNER JOIN variants ON variants.feature_id = outer_features.id
+INNER JOIN molecular_profiles_variants ON molecular_profiles_variants.variant_id = variants.id
+INNER JOIN molecular_profiles ON molecular_profiles.id = molecular_profiles_variants.molecular_profile_id
+INNER JOIN evidence_items ON evidence_items.molecular_profile_id = molecular_profiles.id
+LEFT OUTER JOIN diseases ON diseases.id = evidence_items.disease_id
+LEFT OUTER JOIN evidence_items_therapies ON evidence_items_therapies.evidence_item_id = evidence_items.id
+LEFT OUTER JOIN therapies ON therapies.id = evidence_items_therapies.therapy_id
+LEFT OUTER JOIN assertions on assertions.molecular_profile_id = molecular_profiles.id
+LEFT JOIN LATERAL (SELECT therapies.id as therapy_id, COUNT(DISTINCT(evidence_items.id)) as total
+  FROM evidence_items
+  INNER JOIN molecular_profiles ON molecular_profiles.id = evidence_items.molecular_profile_id
+  INNER JOIN molecular_profiles_variants ON molecular_profiles_variants.molecular_profile_id = molecular_profiles.id
+  INNER JOIN variants ON variants.id = molecular_profiles_variants.variant_id
+  INNER JOIN evidence_items_therapies ON evidence_items_therapies.evidence_item_id = evidence_items.id
+  INNER JOIN therapies ON therapies.id = evidence_items_therapies.therapy_id
+  WHERE variants.feature_id = outer_features.id
+  GROUP BY therapies.id
+) therapy_count on therapies.id = therapy_count.therapy_id
+
+LEFT JOIN LATERAL (SELECT diseases.id as disease_id, COUNT(DISTINCT(evidence_items.id)) as total
+  FROM evidence_items
+  INNER JOIN molecular_profiles ON molecular_profiles.id = evidence_items.molecular_profile_id
+  INNER JOIN molecular_profiles_variants ON molecular_profiles_variants.molecular_profile_id = molecular_profiles.id
+  INNER JOIN variants ON variants.id = molecular_profiles_variants.variant_id
+  INNER JOIN diseases ON diseases.id = evidence_items.disease_id
+  WHERE variants.feature_id = outer_features.id
+  GROUP BY diseases.id
+) disease_count on diseases.id = disease_count.disease_id
+WHERE evidence_items.status != 'rejected'
+  AND molecular_profiles.deprecated = 'f'
+  AND variants.deprecated = 'f'
+GROUP BY outer_features.id, outer_features.name;

From 4c8400910c7c0ab328676ed3024582c7bc05903a Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Wed, 31 Jan 2024 16:39:55 -0600
Subject: [PATCH 077/125] work on layout of factor summary page

---
 .../factor-summary/factor-summary.page.html   | 13 ++---
 .../ncit-details/ncit-details.component.html  | 52 +++++++++++++------
 .../ncit-details/ncit-details.component.less  |  2 +
 .../ncit-details/ncit-details.component.ts    |  2 +
 .../models/concerns/is_feature_instance.rb    |  8 +--
 5 files changed, 51 insertions(+), 26 deletions(-)

diff --git a/client/src/app/components/factors/factor-summary/factor-summary.page.html b/client/src/app/components/factors/factor-summary/factor-summary.page.html
index 440a5da55..a38e581d7 100644
--- a/client/src/app/components/factors/factor-summary/factor-summary.page.html
+++ b/client/src/app/components/factors/factor-summary/factor-summary.page.html
@@ -56,12 +56,13 @@
           </nz-descriptions-item>
 
           <!-- aliases -->
-          <nz-descriptions-item
-            nzTitle="Aliases"
-            *ngIf="factor.featureAliases.length > 0; else noAliases">
-            <nz-tag *ngFor="let alias of factor.featureAliases">{{
-              alias
-            }}</nz-tag>
+          <nz-descriptions-item nzTitle="Aliases">
+            <ng-container
+              *ngIf="factor.featureAliases.length > 0; else noAliases">
+              <nz-tag *ngFor="let alias of factor.featureAliases">{{
+                alias
+              }}</nz-tag>
+            </ng-container>
           </nz-descriptions-item>
           <ng-template #noAliases>
             <span
diff --git a/client/src/app/components/factors/ncit-details/ncit-details.component.html b/client/src/app/components/factors/ncit-details/ncit-details.component.html
index 0296eab02..05860ed15 100644
--- a/client/src/app/components/factors/ncit-details/ncit-details.component.html
+++ b/client/src/app/components/factors/ncit-details/ncit-details.component.html
@@ -1,23 +1,43 @@
 @if (ncitDetails) {
   <nz-card nzTitle="NCI Thesaurus">
     <nz-col [nzSpan]="24">
-      <nz-descriptions
-        nzTitle="Synonyms"
-        nzSize="small"
-        [nzBordered]="true"
-        [nzColumn]="2">
-        @for (synonym of synonymsBySource.keys(); track $index) {
-          <nz-descriptions-item
-            [nzTitle]="synonym"
-            [nzSpan]="2">
-            <cvc-tag-list>
-              @for (source of synonymsBySource.get(synonym); track $index) {
-                <nz-tag>{{ source }}</nz-tag>
-              }
-            </cvc-tag-list>
-          </nz-descriptions-item>
+      <nz-space nzDirection="vertical">
+        @if (ncitDetails.definitions.length > 0) {
+          <nz-descriptions
+            *nzSpaceItem
+            nzTitle="Definitions"
+            nzSize="small"
+            nzLayout="vertical"
+            [nzBordered]="true"
+            [nzColumn]="1">
+            @for (definition of ncitDetails.definitions; track $index) {
+              <nz-descriptions-item
+                [nzTitle]="definition.source"
+                [nzSpan]="1">
+                {{ definition.definition }}
+              </nz-descriptions-item>
+            }
+          </nz-descriptions>
         }
-      </nz-descriptions>
+        <nz-descriptions
+          *nzSpaceItem
+          nzTitle="Synonyms"
+          nzSize="small"
+          [nzBordered]="true"
+          [nzColumn]="2">
+          @for (synonym of synonymsBySource.keys(); track $index) {
+            <nz-descriptions-item
+              [nzTitle]="synonym"
+              [nzSpan]="2">
+              <cvc-tag-list>
+                @for (source of synonymsBySource.get(synonym); track $index) {
+                  <nz-tag>{{ source }}</nz-tag>
+                }
+              </cvc-tag-list>
+            </nz-descriptions-item>
+          }
+        </nz-descriptions>
+      </nz-space>
     </nz-col>
   </nz-card>
 }
diff --git a/client/src/app/components/factors/ncit-details/ncit-details.component.less b/client/src/app/components/factors/ncit-details/ncit-details.component.less
index 30681b7cc..947e37c82 100644
--- a/client/src/app/components/factors/ncit-details/ncit-details.component.less
+++ b/client/src/app/components/factors/ncit-details/ncit-details.component.less
@@ -1,3 +1,5 @@
+@import "themes/overrides/descriptions-overrides.less";
+
 :host {
   display: block;
 }
diff --git a/client/src/app/components/factors/ncit-details/ncit-details.component.ts b/client/src/app/components/factors/ncit-details/ncit-details.component.ts
index dedc3985f..e6337cca5 100644
--- a/client/src/app/components/factors/ncit-details/ncit-details.component.ts
+++ b/client/src/app/components/factors/ncit-details/ncit-details.component.ts
@@ -5,6 +5,7 @@ import { Maybe, NcitDetailsFragment } from '@app/generated/civic.apollo'
 import { NzCardModule } from 'ng-zorro-antd/card'
 import { NzDescriptionsModule } from 'ng-zorro-antd/descriptions'
 import { NzGridModule } from 'ng-zorro-antd/grid'
+import { NzSpaceModule } from 'ng-zorro-antd/space'
 import { NzTagModule } from 'ng-zorro-antd/tag'
 
 @Component({
@@ -19,6 +20,7 @@ import { NzTagModule } from 'ng-zorro-antd/tag'
     NzCardModule,
     NzTagModule,
     NzGridModule,
+    NzSpaceModule,
 
     CvcTagListModule,
   ],
diff --git a/server/app/models/concerns/is_feature_instance.rb b/server/app/models/concerns/is_feature_instance.rb
index ffbc048ab..cca6dff54 100644
--- a/server/app/models/concerns/is_feature_instance.rb
+++ b/server/app/models/concerns/is_feature_instance.rb
@@ -2,11 +2,11 @@ module IsFeatureInstance
   extend ActiveSupport::Concern
 
   included do
-    has_one :feature, as: :feature_instance, touch: true
+    has_one :feature, as: :feature_instance, touch: true, autosave: true
 
-    delegate :name, to: :feature
-    delegate :description, to: :feature
-    delegate :full_name, to: :feature
+    delegate :name, :name=, to: :feature
+    delegate :description, :description=, to: :feature
+    delegate :full_name, :full_name=, to: :feature
     delegate :feature_aliases, to: :feature
     delegate :sources, to: :feature
     delegate :source_ids, to: :feature

From fcc543436c8e621461bd3ce7c08c3d809c66be9b Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Thu, 1 Feb 2024 10:30:42 -0600
Subject: [PATCH 078/125] use tabs for ncit data

---
 .../ncit-details/ncit-details.component.html  | 89 +++++++++++--------
 .../ncit-details/ncit-details.component.ts    |  4 +-
 2 files changed, 55 insertions(+), 38 deletions(-)

diff --git a/client/src/app/components/factors/ncit-details/ncit-details.component.html b/client/src/app/components/factors/ncit-details/ncit-details.component.html
index 05860ed15..5dedcefd0 100644
--- a/client/src/app/components/factors/ncit-details/ncit-details.component.html
+++ b/client/src/app/components/factors/ncit-details/ncit-details.component.html
@@ -1,43 +1,60 @@
 @if (ncitDetails) {
   <nz-card nzTitle="NCI Thesaurus">
     <nz-col [nzSpan]="24">
-      <nz-space nzDirection="vertical">
-        @if (ncitDetails.definitions.length > 0) {
-          <nz-descriptions
-            *nzSpaceItem
-            nzTitle="Definitions"
-            nzSize="small"
-            nzLayout="vertical"
-            [nzBordered]="true"
-            [nzColumn]="1">
-            @for (definition of ncitDetails.definitions; track $index) {
-              <nz-descriptions-item
-                [nzTitle]="definition.source"
-                [nzSpan]="1">
-                {{ definition.definition }}
-              </nz-descriptions-item>
-            }
-          </nz-descriptions>
-        }
-        <nz-descriptions
-          *nzSpaceItem
-          nzTitle="Synonyms"
-          nzSize="small"
-          [nzBordered]="true"
-          [nzColumn]="2">
-          @for (synonym of synonymsBySource.keys(); track $index) {
-            <nz-descriptions-item
-              [nzTitle]="synonym"
-              [nzSpan]="2">
-              <cvc-tag-list>
-                @for (source of synonymsBySource.get(synonym); track $index) {
-                  <nz-tag>{{ source }}</nz-tag>
-                }
-              </cvc-tag-list>
-            </nz-descriptions-item>
+      <nz-tabset [nzAnimated]="false">
+        <nz-tab nzTitle="Definitions">
+          @if (ncitDetails.definitions.length > 0) {
+            <nz-descriptions
+              nzSize="small"
+              nzLayout="vertical"
+              [nzBordered]="true"
+              [nzColumn]="1">
+              @for (definition of ncitDetails.definitions; track $index) {
+                <nz-descriptions-item
+                  [nzTitle]="definition.source"
+                  [nzSpan]="1">
+                  {{ definition.definition }}
+                </nz-descriptions-item>
+              }
+            </nz-descriptions>
+          } @else {
+            <span
+              nz-typography
+              nzType="secondary">
+              None
+            </span>
           }
-        </nz-descriptions>
-      </nz-space>
+        </nz-tab>
+        <nz-tab nzTitle="Synonyms">
+          @if (ncitDetails.synonyms.length > 0) {
+            <nz-descriptions
+              nzSize="small"
+              [nzBordered]="true"
+              [nzColumn]="2">
+              @for (synonym of synonymsBySource.keys(); track $index) {
+                <nz-descriptions-item
+                  [nzTitle]="synonym"
+                  [nzSpan]="2">
+                  <cvc-tag-list>
+                    @for (
+                      source of synonymsBySource.get(synonym);
+                      track $index
+                    ) {
+                      <nz-tag>{{ source }}</nz-tag>
+                    }
+                  </cvc-tag-list>
+                </nz-descriptions-item>
+              }
+            </nz-descriptions>
+          } @else {
+            <span
+              nz-typography
+              nzType="secondary">
+              None
+            </span>
+          }
+        </nz-tab>
+      </nz-tabset>
     </nz-col>
   </nz-card>
 }
diff --git a/client/src/app/components/factors/ncit-details/ncit-details.component.ts b/client/src/app/components/factors/ncit-details/ncit-details.component.ts
index e6337cca5..930b27e07 100644
--- a/client/src/app/components/factors/ncit-details/ncit-details.component.ts
+++ b/client/src/app/components/factors/ncit-details/ncit-details.component.ts
@@ -5,7 +5,7 @@ import { Maybe, NcitDetailsFragment } from '@app/generated/civic.apollo'
 import { NzCardModule } from 'ng-zorro-antd/card'
 import { NzDescriptionsModule } from 'ng-zorro-antd/descriptions'
 import { NzGridModule } from 'ng-zorro-antd/grid'
-import { NzSpaceModule } from 'ng-zorro-antd/space'
+import { NzTabsModule } from 'ng-zorro-antd/tabs'
 import { NzTagModule } from 'ng-zorro-antd/tag'
 
 @Component({
@@ -20,7 +20,7 @@ import { NzTagModule } from 'ng-zorro-antd/tag'
     NzCardModule,
     NzTagModule,
     NzGridModule,
-    NzSpaceModule,
+    NzTabsModule,
 
     CvcTagListModule,
   ],

From f5585da476a470295d2fbf8b802aeb5126fda4c9 Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Thu, 1 Feb 2024 11:35:42 -0600
Subject: [PATCH 079/125] update variant group db view to join on features

---
 .../variant-groups-table.component.html       |  8 ++--
 .../variant-groups-table.component.ts         | 11 +++--
 .../variant-groups-table.query.gql            |  6 +--
 .../src/app/generated/civic.apollo-helpers.ts |  4 +-
 client/src/app/generated/civic.apollo.ts      | 16 ++++----
 client/src/app/generated/server.model.graphql |  4 +-
 client/src/app/generated/server.schema.json   |  4 +-
 .../resolvers/browse_variant_groups.rb        |  4 +-
 .../browse_variant_group_type.rb              |  2 +-
 ...nt_group_browse_table_rows_to_version_3.rb |  8 ++++
 server/db/schema.rb                           | 40 +++++++++----------
 .../variant_group_browse_table_rows_v03.sql   | 15 +++++++
 12 files changed, 74 insertions(+), 48 deletions(-)
 create mode 100644 server/db/migrate/20240201173057_update_variant_group_browse_table_rows_to_version_3.rb
 create mode 100644 server/db/views/variant_group_browse_table_rows_v03.sql

diff --git a/client/src/app/components/variant-groups/variant-groups-table/variant-groups-table.component.html b/client/src/app/components/variant-groups/variant-groups-table/variant-groups-table.component.html
index a230fbf88..316516952 100644
--- a/client/src/app/components/variant-groups/variant-groups-table/variant-groups-table.component.html
+++ b/client/src/app/components/variant-groups/variant-groups-table/variant-groups-table.component.html
@@ -54,7 +54,7 @@
           Name
         </th>
         <th nzWidth="600px">Variants</th>
-        <th nzWidth="150px">Genes</th>
+        <th nzWidth="150px">Features</th>
         <th
           nzWidth="75px"
           nzRight
@@ -101,7 +101,7 @@
         </th>
         <th>
           <cvc-clearable-input-filter
-            [(inputModel)]="geneNameInput"
+            [(inputModel)]="featureNameInput"
             (inputModelChange)="
               filterChange$.next()
             "></cvc-clearable-input-filter>
@@ -132,8 +132,8 @@
             <ng-container [ngTemplateOutlet]="variantNames"></ng-container>
           </td>
           <td>
-            <span *ngFor="let gene of vg.geneNames; last as isLast">
-              {{ gene }}{{ isLast ? '' : ', ' }}
+            <span *ngFor="let feature of vg.featureNames; last as isLast">
+              {{ feature }}{{ isLast ? '' : ', ' }}
             </span>
           </td>
           <td
diff --git a/client/src/app/components/variant-groups/variant-groups-table/variant-groups-table.component.ts b/client/src/app/components/variant-groups/variant-groups-table/variant-groups-table.component.ts
index cca4d55b2..dd42d42d2 100644
--- a/client/src/app/components/variant-groups/variant-groups-table/variant-groups-table.component.ts
+++ b/client/src/app/components/variant-groups/variant-groups-table/variant-groups-table.component.ts
@@ -42,7 +42,7 @@ import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy'
 
 export interface VariantGroupTableUserFilters {
   nameInput?: Maybe<string>
-  geneNameInput?: Maybe<string>
+  featureNameInput?: Maybe<string>
   variantNameInput?: Maybe<string>
 }
 
@@ -88,7 +88,7 @@ export class CvcVariantGroupsTableComponent implements OnInit {
 
   //filters
   nameInput: Maybe<string>
-  geneNameInput: Maybe<string>
+  featureNameInput: Maybe<string>
   variantNameInput: Maybe<string>
 
   sortColumns = VariantGroupsSortColumns
@@ -191,7 +191,7 @@ export class CvcVariantGroupsTableComponent implements OnInit {
     this.queryRef
       .refetch({
         name: this.nameInput,
-        geneNames: this.geneNameInput,
+        featureNames: this.featureNameInput,
         variantNames: this.variantNameInput,
       })
       .then(() => this.scrollIndex$.next(0))
@@ -200,7 +200,10 @@ export class CvcVariantGroupsTableComponent implements OnInit {
   }
 
   // virtual scroll helpers
-  trackByIndex(_: number, data: Maybe<BrowseVariantGroupRowFieldsFragment>): Maybe<number> {
+  trackByIndex(
+    _: number,
+    data: Maybe<BrowseVariantGroupRowFieldsFragment>
+  ): Maybe<number> {
     return data?.id
   }
 }
diff --git a/client/src/app/components/variant-groups/variant-groups-table/variant-groups-table.query.gql b/client/src/app/components/variant-groups/variant-groups-table/variant-groups-table.query.gql
index 4c139c44e..f0f856e24 100644
--- a/client/src/app/components/variant-groups/variant-groups-table/variant-groups-table.query.gql
+++ b/client/src/app/components/variant-groups/variant-groups-table/variant-groups-table.query.gql
@@ -5,7 +5,7 @@ query BrowseVariantGroups(
   $after: String
   $sortBy: VariantGroupsSort
   $name: String
-  $geneNames: String
+  $featureNames: String
   $variantNames: String
 ) {
   browseVariantGroups(
@@ -15,7 +15,7 @@ query BrowseVariantGroups(
     after: $after
     sortBy: $sortBy
     name: $name
-    geneNames: $geneNames
+    featureNames: $featureNames
     variantNames: $variantNames
   ) {
     pageInfo {
@@ -41,7 +41,7 @@ fragment BrowseVariantGroupRowFields on BrowseVariantGroup {
   id
   name
   link
-  geneNames
+  featureNames
   variantNames
   variantCount
   evidenceItemCount
diff --git a/client/src/app/generated/civic.apollo-helpers.ts b/client/src/app/generated/civic.apollo-helpers.ts
index 0698986fc..b77b3d53f 100644
--- a/client/src/app/generated/civic.apollo-helpers.ts
+++ b/client/src/app/generated/civic.apollo-helpers.ts
@@ -361,10 +361,10 @@ export type BrowseVariantEdgeFieldPolicy = {
 	cursor?: FieldPolicy<any> | FieldReadFunction<any>,
 	node?: FieldPolicy<any> | FieldReadFunction<any>
 };
-export type BrowseVariantGroupKeySpecifier = ('evidenceItemCount' | 'geneNames' | 'id' | 'link' | 'name' | 'variantCount' | 'variantNames' | BrowseVariantGroupKeySpecifier)[];
+export type BrowseVariantGroupKeySpecifier = ('evidenceItemCount' | 'featureNames' | 'id' | 'link' | 'name' | 'variantCount' | 'variantNames' | BrowseVariantGroupKeySpecifier)[];
 export type BrowseVariantGroupFieldPolicy = {
 	evidenceItemCount?: FieldPolicy<any> | FieldReadFunction<any>,
-	geneNames?: FieldPolicy<any> | FieldReadFunction<any>,
+	featureNames?: FieldPolicy<any> | FieldReadFunction<any>,
 	id?: FieldPolicy<any> | FieldReadFunction<any>,
 	link?: FieldPolicy<any> | FieldReadFunction<any>,
 	name?: FieldPolicy<any> | FieldReadFunction<any>,
diff --git a/client/src/app/generated/civic.apollo.ts b/client/src/app/generated/civic.apollo.ts
index 73f0b579e..c75498355 100644
--- a/client/src/app/generated/civic.apollo.ts
+++ b/client/src/app/generated/civic.apollo.ts
@@ -801,7 +801,7 @@ export type BrowseVariantEdge = {
 export type BrowseVariantGroup = {
   __typename: 'BrowseVariantGroup';
   evidenceItemCount: Scalars['Int'];
-  geneNames: Array<Scalars['String']>;
+  featureNames: Array<Scalars['String']>;
   id: Scalars['Int'];
   link: Scalars['String'];
   name: Scalars['String'];
@@ -3829,8 +3829,8 @@ export type QueryBrowseSourcesArgs = {
 export type QueryBrowseVariantGroupsArgs = {
   after?: InputMaybe<Scalars['String']>;
   before?: InputMaybe<Scalars['String']>;
+  featureNames?: InputMaybe<Scalars['String']>;
   first?: InputMaybe<Scalars['Int']>;
-  geneNames?: InputMaybe<Scalars['String']>;
   last?: InputMaybe<Scalars['Int']>;
   name?: InputMaybe<Scalars['String']>;
   sortBy?: InputMaybe<VariantGroupsSort>;
@@ -6796,14 +6796,14 @@ export type BrowseVariantGroupsQueryVariables = Exact<{
   after?: InputMaybe<Scalars['String']>;
   sortBy?: InputMaybe<VariantGroupsSort>;
   name?: InputMaybe<Scalars['String']>;
-  geneNames?: InputMaybe<Scalars['String']>;
+  featureNames?: InputMaybe<Scalars['String']>;
   variantNames?: InputMaybe<Scalars['String']>;
 }>;
 
 
-export type BrowseVariantGroupsQuery = { __typename: 'Query', browseVariantGroups: { __typename: 'BrowseVariantGroupConnection', totalCount: number, filteredCount: number, pageCount: number, lastUpdated: any, pageInfo: { __typename: 'PageInfo', endCursor?: string | undefined, hasNextPage: boolean, startCursor?: string | undefined, hasPreviousPage: boolean }, edges: Array<{ __typename: 'BrowseVariantGroupEdge', cursor: string, node?: { __typename: 'BrowseVariantGroup', id: number, name: string, link: string, geneNames: Array<string>, variantNames: Array<string>, variantCount: number, evidenceItemCount: number } | undefined }> } };
+export type BrowseVariantGroupsQuery = { __typename: 'Query', browseVariantGroups: { __typename: 'BrowseVariantGroupConnection', totalCount: number, filteredCount: number, pageCount: number, lastUpdated: any, pageInfo: { __typename: 'PageInfo', endCursor?: string | undefined, hasNextPage: boolean, startCursor?: string | undefined, hasPreviousPage: boolean }, edges: Array<{ __typename: 'BrowseVariantGroupEdge', cursor: string, node?: { __typename: 'BrowseVariantGroup', id: number, name: string, link: string, featureNames: Array<string>, variantNames: Array<string>, variantCount: number, evidenceItemCount: number } | undefined }> } };
 
-export type BrowseVariantGroupRowFieldsFragment = { __typename: 'BrowseVariantGroup', id: number, name: string, link: string, geneNames: Array<string>, variantNames: Array<string>, variantCount: number, evidenceItemCount: number };
+export type BrowseVariantGroupRowFieldsFragment = { __typename: 'BrowseVariantGroup', id: number, name: string, link: string, featureNames: Array<string>, variantNames: Array<string>, variantCount: number, evidenceItemCount: number };
 
 export type VariantTypePopoverQueryVariables = Exact<{
   variantTypeId: Scalars['Int'];
@@ -8966,7 +8966,7 @@ export const BrowseVariantGroupRowFieldsFragmentDoc = gql`
   id
   name
   link
-  geneNames
+  featureNames
   variantNames
   variantCount
   evidenceItemCount
@@ -12293,7 +12293,7 @@ export const VariantGroupPopoverDocument = gql`
     }
   }
 export const BrowseVariantGroupsDocument = gql`
-    query BrowseVariantGroups($first: Int, $last: Int, $before: String, $after: String, $sortBy: VariantGroupsSort, $name: String, $geneNames: String, $variantNames: String) {
+    query BrowseVariantGroups($first: Int, $last: Int, $before: String, $after: String, $sortBy: VariantGroupsSort, $name: String, $featureNames: String, $variantNames: String) {
   browseVariantGroups(
     first: $first
     last: $last
@@ -12301,7 +12301,7 @@ export const BrowseVariantGroupsDocument = gql`
     after: $after
     sortBy: $sortBy
     name: $name
-    geneNames: $geneNames
+    featureNames: $featureNames
     variantNames: $variantNames
   ) {
     pageInfo {
diff --git a/client/src/app/generated/server.model.graphql b/client/src/app/generated/server.model.graphql
index 9a02fa80b..e1df2c161 100644
--- a/client/src/app/generated/server.model.graphql
+++ b/client/src/app/generated/server.model.graphql
@@ -1337,7 +1337,7 @@ type BrowseVariantEdge {
 
 type BrowseVariantGroup {
   evidenceItemCount: Int!
-  geneNames: [String!]!
+  featureNames: [String!]!
   id: Int!
   link: String!
   name: String!
@@ -6077,12 +6077,12 @@ type Query {
     Returns the elements in the list that come before the specified cursor.
     """
     before: String
+    featureNames: String
 
     """
     Returns the first _n_ elements from the list.
     """
     first: Int
-    geneNames: String
 
     """
     Returns the last _n_ elements from the list.
diff --git a/client/src/app/generated/server.schema.json b/client/src/app/generated/server.schema.json
index 6740bc5bf..8c3d1bb34 100644
--- a/client/src/app/generated/server.schema.json
+++ b/client/src/app/generated/server.schema.json
@@ -6338,7 +6338,7 @@
               "deprecationReason": null
             },
             {
-              "name": "geneNames",
+              "name": "featureNames",
               "description": null,
               "args": [],
               "type": {
@@ -28550,7 +28550,7 @@
                   "deprecationReason": null
                 },
                 {
-                  "name": "geneNames",
+                  "name": "featureNames",
                   "description": null,
                   "type": {
                     "kind": "SCALAR",
diff --git a/server/app/graphql/resolvers/browse_variant_groups.rb b/server/app/graphql/resolvers/browse_variant_groups.rb
index 20b5c7f8d..f800c97a3 100644
--- a/server/app/graphql/resolvers/browse_variant_groups.rb
+++ b/server/app/graphql/resolvers/browse_variant_groups.rb
@@ -13,8 +13,8 @@ class Resolvers::BrowseVariantGroups < GraphQL::Schema::Resolver
     scope.where('name ILIKE ?', "%#{value}%")
   end
 
-  option(:gene_names, type: String) do |scope, value|
-    scope.where("array_to_string(gene_names, '|') ILIKE ?", "%#{value}%")
+  option(:feature_names, type: String) do |scope, value|
+    scope.where("array_to_string(feature_names, '|') ILIKE ?", "%#{value}%")
   end
 
   option(:variant_names, type: String) do |scope, value|
diff --git a/server/app/graphql/types/browse_tables/browse_variant_group_type.rb b/server/app/graphql/types/browse_tables/browse_variant_group_type.rb
index a0e8a3e18..7e696f3c5 100644
--- a/server/app/graphql/types/browse_tables/browse_variant_group_type.rb
+++ b/server/app/graphql/types/browse_tables/browse_variant_group_type.rb
@@ -6,7 +6,7 @@ class BrowseVariantGroupType < Types::BaseObject
     field :name, String, null: false
     field :link, String, null: false
     field :variant_names, [String], null: false
-    field :gene_names, [String], null: false
+    field :feature_names, [String], null: false
     field :variant_count, Int, null: false
     field :evidence_item_count, Int, null: false
 
diff --git a/server/db/migrate/20240201173057_update_variant_group_browse_table_rows_to_version_3.rb b/server/db/migrate/20240201173057_update_variant_group_browse_table_rows_to_version_3.rb
new file mode 100644
index 000000000..d4314150b
--- /dev/null
+++ b/server/db/migrate/20240201173057_update_variant_group_browse_table_rows_to_version_3.rb
@@ -0,0 +1,8 @@
+class UpdateVariantGroupBrowseTableRowsToVersion3 < ActiveRecord::Migration[6.1]
+  def change
+    update_view :variant_group_browse_table_rows,
+      version: 3,
+      revert_to_version: 2,
+      materialized: true
+  end
+end
diff --git a/server/db/schema.rb b/server/db/schema.rb
index d018eaf23..07480eb92 100644
--- a/server/db/schema.rb
+++ b/server/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2024_01_31_205334) do
+ActiveRecord::Schema.define(version: 2024_02_01_173057) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -1056,25 +1056,6 @@
        JOIN evidence_items ei ON (((mp.id = ei.molecular_profile_id) AND (ei.deleted = false))))
     GROUP BY mp.id;
   SQL
-  create_view "variant_group_browse_table_rows", materialized: true, sql_definition: <<-SQL
-      SELECT variant_groups.id,
-      variant_groups.name,
-      array_agg(DISTINCT variants.name) AS variant_names,
-      array_agg(DISTINCT genes.name) AS gene_names,
-      count(DISTINCT variants.id) AS variant_count,
-      count(DISTINCT evidence_items.id) AS evidence_item_count
-     FROM ((((((variant_groups
-       JOIN variant_group_variants ON ((variant_group_variants.variant_group_id = variant_groups.id)))
-       JOIN variants ON ((variant_group_variants.variant_id = variants.id)))
-       JOIN genes ON ((variants.gene_id = genes.id)))
-       LEFT JOIN molecular_profiles_variants ON ((molecular_profiles_variants.variant_id = variants.id)))
-       LEFT JOIN molecular_profiles ON ((molecular_profiles.id = molecular_profiles_variants.molecular_profile_id)))
-       LEFT JOIN evidence_items ON ((evidence_items.molecular_profile_id = molecular_profiles.id)))
-    WHERE ((evidence_items.status)::text <> 'rejected'::text)
-    GROUP BY variant_groups.id, variant_groups.name;
-  SQL
-  add_index "variant_group_browse_table_rows", ["id"], name: "index_variant_group_browse_table_rows_on_id", unique: true
-
   create_view "gene_browse_table_rows", materialized: true, sql_definition: <<-SQL
       SELECT outer_genes.id,
       outer_genes.name,
@@ -1340,4 +1321,23 @@
   SQL
   add_index "feature_browse_table_rows", ["id"], name: "index_feature_browse_table_rows_on_id", unique: true
 
+  create_view "variant_group_browse_table_rows", materialized: true, sql_definition: <<-SQL
+      SELECT variant_groups.id,
+      variant_groups.name,
+      array_agg(DISTINCT variants.name) AS variant_names,
+      array_agg(DISTINCT features.name) AS feature_names,
+      count(DISTINCT variants.id) AS variant_count,
+      count(DISTINCT evidence_items.id) AS evidence_item_count
+     FROM ((((((variant_groups
+       JOIN variant_group_variants ON ((variant_group_variants.variant_group_id = variant_groups.id)))
+       JOIN variants ON ((variant_group_variants.variant_id = variants.id)))
+       JOIN features ON ((variants.feature_id = features.id)))
+       LEFT JOIN molecular_profiles_variants ON ((molecular_profiles_variants.variant_id = variants.id)))
+       LEFT JOIN molecular_profiles ON ((molecular_profiles.id = molecular_profiles_variants.molecular_profile_id)))
+       LEFT JOIN evidence_items ON ((evidence_items.molecular_profile_id = molecular_profiles.id)))
+    WHERE ((evidence_items.status)::text <> 'rejected'::text)
+    GROUP BY variant_groups.id, variant_groups.name;
+  SQL
+  add_index "variant_group_browse_table_rows", ["id"], name: "index_variant_group_browse_table_rows_on_id", unique: true
+
 end
diff --git a/server/db/views/variant_group_browse_table_rows_v03.sql b/server/db/views/variant_group_browse_table_rows_v03.sql
new file mode 100644
index 000000000..b762ee868
--- /dev/null
+++ b/server/db/views/variant_group_browse_table_rows_v03.sql
@@ -0,0 +1,15 @@
+select variant_groups.id,
+variant_groups.name,
+array_agg(DISTINCT(variants.name)) as variant_names,
+array_agg(DISTINCT(features.name)) as feature_names,
+COUNT(DISTINCT(variants.id)) as variant_count,
+COUNT(DISTINCT(evidence_items.id)) as evidence_item_count
+FROM variant_groups
+INNER JOIN variant_group_variants ON variant_group_variants.variant_group_id = variant_groups.id
+INNER JOIN variants ON variant_group_variants.variant_id = variants.id
+INNER JOIN features ON variants.feature_id = features.id
+LEFT OUTER JOIN molecular_profiles_variants on molecular_profiles_variants.variant_id = variants.id
+LEFT OUTER JOIN molecular_profiles on molecular_profiles.id = molecular_profiles_variants.molecular_profile_id
+LEFT OUTER JOIN evidence_items on evidence_items.molecular_profile_id = molecular_profiles.id
+WHERE evidence_items.status != 'rejected'
+GROUP BY variant_groups.id, variant_groups.name

From 9871365a4ab66b63a8cf59b80bd14fd075018f5b Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Thu, 1 Feb 2024 12:23:59 -0600
Subject: [PATCH 080/125] stubbed in feature create/deprecated activities,
 feature create mutation working

---
 .../src/app/generated/civic.apollo-helpers.ts |  32 ++
 client/src/app/generated/civic.apollo.ts      |  50 +-
 .../src/app/generated/civic.possible-types.ts |   2 +
 client/src/app/generated/server.model.graphql |  91 +++
 client/src/app/generated/server.schema.json   | 528 ++++++++++++++++++
 .../app/graphql/mutations/create_feature.rb   |  66 +++
 .../app/graphql/mutations/create_variant.rb   |   4 +-
 .../create_feature_activity_type.rb           |   5 +
 .../deprecate_feature_activity_type.rb        |   5 +
 .../types/createable_feature_types_type.rb    |   6 +
 .../graphql/types/events/event_action_type.rb |   2 +
 .../types/interfaces/activity_interface.rb    |   8 +-
 .../types/interfaces/event_origin_object.rb   |   2 +
 server/app/graphql/types/mutation_type.rb     |   1 +
 server/app/models/actions/create_feature.rb   |  30 +
 .../app/models/activities/create_feature.rb   |  46 ++
 server/app/models/create_feature_activity.rb  |  10 +
 .../app/models/deprecate_feature_activity.rb  |  10 +
 server/app/models/feature.rb                  |   2 +
 19 files changed, 890 insertions(+), 10 deletions(-)
 create mode 100644 server/app/graphql/mutations/create_feature.rb
 create mode 100644 server/app/graphql/types/activities/create_feature_activity_type.rb
 create mode 100644 server/app/graphql/types/activities/deprecate_feature_activity_type.rb
 create mode 100644 server/app/graphql/types/createable_feature_types_type.rb
 create mode 100644 server/app/models/actions/create_feature.rb
 create mode 100644 server/app/models/activities/create_feature.rb
 create mode 100644 server/app/models/create_feature_activity.rb
 create mode 100644 server/app/models/deprecate_feature_activity.rb

diff --git a/client/src/app/generated/civic.apollo-helpers.ts b/client/src/app/generated/civic.apollo-helpers.ts
index b77b3d53f..827eeb8c1 100644
--- a/client/src/app/generated/civic.apollo-helpers.ts
+++ b/client/src/app/generated/civic.apollo-helpers.ts
@@ -560,6 +560,18 @@ export type CreateComplexMolecularProfileActivityFieldPolicy = {
 	user?: FieldPolicy<any> | FieldReadFunction<any>,
 	verbiage?: FieldPolicy<any> | FieldReadFunction<any>
 };
+export type CreateFeatureActivityKeySpecifier = ('createdAt' | 'events' | 'id' | 'note' | 'organization' | 'parsedNote' | 'subject' | 'user' | 'verbiage' | CreateFeatureActivityKeySpecifier)[];
+export type CreateFeatureActivityFieldPolicy = {
+	createdAt?: FieldPolicy<any> | FieldReadFunction<any>,
+	events?: FieldPolicy<any> | FieldReadFunction<any>,
+	id?: FieldPolicy<any> | FieldReadFunction<any>,
+	note?: FieldPolicy<any> | FieldReadFunction<any>,
+	organization?: FieldPolicy<any> | FieldReadFunction<any>,
+	parsedNote?: FieldPolicy<any> | FieldReadFunction<any>,
+	subject?: FieldPolicy<any> | FieldReadFunction<any>,
+	user?: FieldPolicy<any> | FieldReadFunction<any>,
+	verbiage?: FieldPolicy<any> | FieldReadFunction<any>
+};
 export type CreateMolecularProfilePayloadKeySpecifier = ('clientMutationId' | 'molecularProfile' | CreateMolecularProfilePayloadKeySpecifier)[];
 export type CreateMolecularProfilePayloadFieldPolicy = {
 	clientMutationId?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -614,6 +626,18 @@ export type DeprecateComplexMolecularProfilePayloadFieldPolicy = {
 	clientMutationId?: FieldPolicy<any> | FieldReadFunction<any>,
 	molecularProfile?: FieldPolicy<any> | FieldReadFunction<any>
 };
+export type DeprecateFeatureActivityKeySpecifier = ('createdAt' | 'events' | 'id' | 'note' | 'organization' | 'parsedNote' | 'subject' | 'user' | 'verbiage' | DeprecateFeatureActivityKeySpecifier)[];
+export type DeprecateFeatureActivityFieldPolicy = {
+	createdAt?: FieldPolicy<any> | FieldReadFunction<any>,
+	events?: FieldPolicy<any> | FieldReadFunction<any>,
+	id?: FieldPolicy<any> | FieldReadFunction<any>,
+	note?: FieldPolicy<any> | FieldReadFunction<any>,
+	organization?: FieldPolicy<any> | FieldReadFunction<any>,
+	parsedNote?: FieldPolicy<any> | FieldReadFunction<any>,
+	subject?: FieldPolicy<any> | FieldReadFunction<any>,
+	user?: FieldPolicy<any> | FieldReadFunction<any>,
+	verbiage?: FieldPolicy<any> | FieldReadFunction<any>
+};
 export type DeprecateVariantActivityKeySpecifier = ('createdAt' | 'events' | 'id' | 'molecularProfiles' | 'note' | 'organization' | 'parsedNote' | 'subject' | 'user' | 'verbiage' | DeprecateVariantActivityKeySpecifier)[];
 export type DeprecateVariantActivityFieldPolicy = {
 	createdAt?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -2315,6 +2339,10 @@ export type StrictTypedTypePolicies = {
 		keyFields?: false | CreateComplexMolecularProfileActivityKeySpecifier | (() => undefined | CreateComplexMolecularProfileActivityKeySpecifier),
 		fields?: CreateComplexMolecularProfileActivityFieldPolicy,
 	},
+	CreateFeatureActivity?: Omit<TypePolicy, "fields" | "keyFields"> & {
+		keyFields?: false | CreateFeatureActivityKeySpecifier | (() => undefined | CreateFeatureActivityKeySpecifier),
+		fields?: CreateFeatureActivityFieldPolicy,
+	},
 	CreateMolecularProfilePayload?: Omit<TypePolicy, "fields" | "keyFields"> & {
 		keyFields?: false | CreateMolecularProfilePayloadKeySpecifier | (() => undefined | CreateMolecularProfilePayloadKeySpecifier),
 		fields?: CreateMolecularProfilePayloadFieldPolicy,
@@ -2339,6 +2367,10 @@ export type StrictTypedTypePolicies = {
 		keyFields?: false | DeprecateComplexMolecularProfilePayloadKeySpecifier | (() => undefined | DeprecateComplexMolecularProfilePayloadKeySpecifier),
 		fields?: DeprecateComplexMolecularProfilePayloadFieldPolicy,
 	},
+	DeprecateFeatureActivity?: Omit<TypePolicy, "fields" | "keyFields"> & {
+		keyFields?: false | DeprecateFeatureActivityKeySpecifier | (() => undefined | DeprecateFeatureActivityKeySpecifier),
+		fields?: DeprecateFeatureActivityFieldPolicy,
+	},
 	DeprecateVariantActivity?: Omit<TypePolicy, "fields" | "keyFields"> & {
 		keyFields?: false | DeprecateVariantActivityKeySpecifier | (() => undefined | DeprecateVariantActivityKeySpecifier),
 		fields?: DeprecateVariantActivityFieldPolicy,
diff --git a/client/src/app/generated/civic.apollo.ts b/client/src/app/generated/civic.apollo.ts
index c75498355..b2b5c848c 100644
--- a/client/src/app/generated/civic.apollo.ts
+++ b/client/src/app/generated/civic.apollo.ts
@@ -1136,6 +1136,19 @@ export type CreateComplexMolecularProfileActivity = ActivityInterface & {
   verbiage: Scalars['String'];
 };
 
+export type CreateFeatureActivity = ActivityInterface & {
+  __typename: 'CreateFeatureActivity';
+  createdAt: Scalars['ISO8601DateTime'];
+  events: Array<Event>;
+  id: Scalars['Int'];
+  note?: Maybe<Scalars['String']>;
+  organization?: Maybe<Organization>;
+  parsedNote: Array<CommentBodySegment>;
+  subject: EventSubject;
+  user: User;
+  verbiage: Scalars['String'];
+};
+
 /** Autogenerated input type of CreateMolecularProfile */
 export type CreateMolecularProfileInput = {
   /** A unique identifier for the client performing the mutation. */
@@ -1270,6 +1283,19 @@ export type DeprecateComplexMolecularProfilePayload = {
   molecularProfile?: Maybe<MolecularProfile>;
 };
 
+export type DeprecateFeatureActivity = ActivityInterface & {
+  __typename: 'DeprecateFeatureActivity';
+  createdAt: Scalars['ISO8601DateTime'];
+  events: Array<Event>;
+  id: Scalars['Int'];
+  note?: Maybe<Scalars['String']>;
+  organization?: Maybe<Organization>;
+  parsedNote: Array<CommentBodySegment>;
+  subject: EventSubject;
+  user: User;
+  verbiage: Scalars['String'];
+};
+
 export type DeprecateVariantActivity = ActivityInterface & {
   __typename: 'DeprecateVariantActivity';
   createdAt: Scalars['ISO8601DateTime'];
@@ -1426,8 +1452,10 @@ export enum EventAction {
   Commented = 'COMMENTED',
   ComplexMolecularProfileCreated = 'COMPLEX_MOLECULAR_PROFILE_CREATED',
   CuratedSourceSuggestion = 'CURATED_SOURCE_SUGGESTION',
+  DeprecatedFeature = 'DEPRECATED_FEATURE',
   DeprecatedMolecularProfile = 'DEPRECATED_MOLECULAR_PROFILE',
   DeprecatedVariant = 'DEPRECATED_VARIANT',
+  FeatureCreated = 'FEATURE_CREATED',
   Flagged = 'FLAGGED',
   FlagResolved = 'FLAG_RESOLVED',
   PublicationSuggested = 'PUBLICATION_SUGGESTED',
@@ -6049,7 +6077,7 @@ export type ActivityCardQueryVariables = Exact<{
 }>;
 
 
-export type ActivityCardQuery = { __typename: 'Query', activity?: { __typename: 'AcceptRevisionsActivity', id: number, verbiage: string } | { __typename: 'CommentActivity', id: number, verbiage: string } | { __typename: 'CreateComplexMolecularProfileActivity', id: number, verbiage: string } | { __typename: 'CreateVariantActivity', id: number, verbiage: string } | { __typename: 'DeprecateComplexMolecularProfileActivity', id: number, verbiage: string } | { __typename: 'DeprecateVariantActivity', id: number, verbiage: string } | { __typename: 'FlagEntityActivity', id: number, verbiage: string } | { __typename: 'ModerateAssertionActivity', id: number, verbiage: string } | { __typename: 'ModerateEvidenceItemActivity', id: number, verbiage: string } | { __typename: 'RejectRevisionsActivity', id: number, verbiage: string } | { __typename: 'ResolveFlagActivity', id: number, verbiage: string } | { __typename: 'SubmitAssertionActivity', id: number, verbiage: string } | { __typename: 'SubmitEvidenceItemActivity', id: number, verbiage: string } | { __typename: 'SuggestRevisionSetActivity', id: number, verbiage: string } | { __typename: 'SuggestSourceActivity', id: number, verbiage: string } | { __typename: 'UpdateSourceSuggestionStatusActivity', id: number, verbiage: string } | undefined };
+export type ActivityCardQuery = { __typename: 'Query', activity?: { __typename: 'AcceptRevisionsActivity', id: number, verbiage: string } | { __typename: 'CommentActivity', id: number, verbiage: string } | { __typename: 'CreateComplexMolecularProfileActivity', id: number, verbiage: string } | { __typename: 'CreateFeatureActivity', id: number, verbiage: string } | { __typename: 'CreateVariantActivity', id: number, verbiage: string } | { __typename: 'DeprecateComplexMolecularProfileActivity', id: number, verbiage: string } | { __typename: 'DeprecateFeatureActivity', id: number, verbiage: string } | { __typename: 'DeprecateVariantActivity', id: number, verbiage: string } | { __typename: 'FlagEntityActivity', id: number, verbiage: string } | { __typename: 'ModerateAssertionActivity', id: number, verbiage: string } | { __typename: 'ModerateEvidenceItemActivity', id: number, verbiage: string } | { __typename: 'RejectRevisionsActivity', id: number, verbiage: string } | { __typename: 'ResolveFlagActivity', id: number, verbiage: string } | { __typename: 'SubmitAssertionActivity', id: number, verbiage: string } | { __typename: 'SubmitEvidenceItemActivity', id: number, verbiage: string } | { __typename: 'SuggestRevisionSetActivity', id: number, verbiage: string } | { __typename: 'SuggestSourceActivity', id: number, verbiage: string } | { __typename: 'UpdateSourceSuggestionStatusActivity', id: number, verbiage: string } | undefined };
 
 type ActivityCard_AcceptRevisionsActivity_Fragment = { __typename: 'AcceptRevisionsActivity', id: number, verbiage: string };
 
@@ -6057,10 +6085,14 @@ type ActivityCard_CommentActivity_Fragment = { __typename: 'CommentActivity', id
 
 type ActivityCard_CreateComplexMolecularProfileActivity_Fragment = { __typename: 'CreateComplexMolecularProfileActivity', id: number, verbiage: string };
 
+type ActivityCard_CreateFeatureActivity_Fragment = { __typename: 'CreateFeatureActivity', id: number, verbiage: string };
+
 type ActivityCard_CreateVariantActivity_Fragment = { __typename: 'CreateVariantActivity', id: number, verbiage: string };
 
 type ActivityCard_DeprecateComplexMolecularProfileActivity_Fragment = { __typename: 'DeprecateComplexMolecularProfileActivity', id: number, verbiage: string };
 
+type ActivityCard_DeprecateFeatureActivity_Fragment = { __typename: 'DeprecateFeatureActivity', id: number, verbiage: string };
+
 type ActivityCard_DeprecateVariantActivity_Fragment = { __typename: 'DeprecateVariantActivity', id: number, verbiage: string };
 
 type ActivityCard_FlagEntityActivity_Fragment = { __typename: 'FlagEntityActivity', id: number, verbiage: string };
@@ -6083,7 +6115,7 @@ type ActivityCard_SuggestSourceActivity_Fragment = { __typename: 'SuggestSourceA
 
 type ActivityCard_UpdateSourceSuggestionStatusActivity_Fragment = { __typename: 'UpdateSourceSuggestionStatusActivity', id: number, verbiage: string };
 
-export type ActivityCardFragment = ActivityCard_AcceptRevisionsActivity_Fragment | ActivityCard_CommentActivity_Fragment | ActivityCard_CreateComplexMolecularProfileActivity_Fragment | ActivityCard_CreateVariantActivity_Fragment | ActivityCard_DeprecateComplexMolecularProfileActivity_Fragment | ActivityCard_DeprecateVariantActivity_Fragment | ActivityCard_FlagEntityActivity_Fragment | ActivityCard_ModerateAssertionActivity_Fragment | ActivityCard_ModerateEvidenceItemActivity_Fragment | ActivityCard_RejectRevisionsActivity_Fragment | ActivityCard_ResolveFlagActivity_Fragment | ActivityCard_SubmitAssertionActivity_Fragment | ActivityCard_SubmitEvidenceItemActivity_Fragment | ActivityCard_SuggestRevisionSetActivity_Fragment | ActivityCard_SuggestSourceActivity_Fragment | ActivityCard_UpdateSourceSuggestionStatusActivity_Fragment;
+export type ActivityCardFragment = ActivityCard_AcceptRevisionsActivity_Fragment | ActivityCard_CommentActivity_Fragment | ActivityCard_CreateComplexMolecularProfileActivity_Fragment | ActivityCard_CreateFeatureActivity_Fragment | ActivityCard_CreateVariantActivity_Fragment | ActivityCard_DeprecateComplexMolecularProfileActivity_Fragment | ActivityCard_DeprecateFeatureActivity_Fragment | ActivityCard_DeprecateVariantActivity_Fragment | ActivityCard_FlagEntityActivity_Fragment | ActivityCard_ModerateAssertionActivity_Fragment | ActivityCard_ModerateEvidenceItemActivity_Fragment | ActivityCard_RejectRevisionsActivity_Fragment | ActivityCard_ResolveFlagActivity_Fragment | ActivityCard_SubmitAssertionActivity_Fragment | ActivityCard_SubmitEvidenceItemActivity_Fragment | ActivityCard_SuggestRevisionSetActivity_Fragment | ActivityCard_SuggestSourceActivity_Fragment | ActivityCard_UpdateSourceSuggestionStatusActivity_Fragment;
 
 export type ActivityFeedQueryVariables = Exact<{
   first?: InputMaybe<Scalars['Int']>;
@@ -6094,9 +6126,9 @@ export type ActivityFeedQueryVariables = Exact<{
 }>;
 
 
-export type ActivityFeedQuery = { __typename: 'Query', activities: { __typename: 'ActivityInterfaceConnection', pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, edges: Array<{ __typename: 'ActivityInterfaceEdge', cursor: string, node?: { __typename: 'AcceptRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CommentActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CreateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CreateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'DeprecateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'DeprecateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'FlagEntityActivity', id: number, verbiage: string, createdAt: any, flag: { __typename: 'Flag', id: number, name: string, link: string }, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ModerateAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ModerateEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'RejectRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ResolveFlagActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SubmitAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SubmitEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SuggestRevisionSetActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SuggestSourceActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'UpdateSourceSuggestionStatusActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | undefined }> } };
+export type ActivityFeedQuery = { __typename: 'Query', activities: { __typename: 'ActivityInterfaceConnection', pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, edges: Array<{ __typename: 'ActivityInterfaceEdge', cursor: string, node?: { __typename: 'AcceptRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CommentActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CreateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CreateFeatureActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CreateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'DeprecateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'DeprecateFeatureActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'DeprecateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'FlagEntityActivity', id: number, verbiage: string, createdAt: any, flag: { __typename: 'Flag', id: number, name: string, link: string }, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ModerateAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ModerateEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'RejectRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ResolveFlagActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SubmitAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SubmitEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SuggestRevisionSetActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SuggestSourceActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'UpdateSourceSuggestionStatusActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | undefined }> } };
 
-export type ActivityFeedFragment = { __typename: 'ActivityInterfaceConnection', pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, edges: Array<{ __typename: 'ActivityInterfaceEdge', cursor: string, node?: { __typename: 'AcceptRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CommentActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CreateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CreateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'DeprecateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'DeprecateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'FlagEntityActivity', id: number, verbiage: string, createdAt: any, flag: { __typename: 'Flag', id: number, name: string, link: string }, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ModerateAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ModerateEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'RejectRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ResolveFlagActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SubmitAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SubmitEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SuggestRevisionSetActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SuggestSourceActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'UpdateSourceSuggestionStatusActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | undefined }> };
+export type ActivityFeedFragment = { __typename: 'ActivityInterfaceConnection', pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, edges: Array<{ __typename: 'ActivityInterfaceEdge', cursor: string, node?: { __typename: 'AcceptRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CommentActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CreateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CreateFeatureActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CreateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'DeprecateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'DeprecateFeatureActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'DeprecateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'FlagEntityActivity', id: number, verbiage: string, createdAt: any, flag: { __typename: 'Flag', id: number, name: string, link: string }, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ModerateAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ModerateEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'RejectRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ResolveFlagActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SubmitAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SubmitEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SuggestRevisionSetActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SuggestSourceActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'UpdateSourceSuggestionStatusActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | undefined }> };
 
 type ActivityFeedNode_AcceptRevisionsActivity_Fragment = { __typename: 'AcceptRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
@@ -6104,10 +6136,14 @@ type ActivityFeedNode_CommentActivity_Fragment = { __typename: 'CommentActivity'
 
 type ActivityFeedNode_CreateComplexMolecularProfileActivity_Fragment = { __typename: 'CreateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
+type ActivityFeedNode_CreateFeatureActivity_Fragment = { __typename: 'CreateFeatureActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+
 type ActivityFeedNode_CreateVariantActivity_Fragment = { __typename: 'CreateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
 type ActivityFeedNode_DeprecateComplexMolecularProfileActivity_Fragment = { __typename: 'DeprecateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
+type ActivityFeedNode_DeprecateFeatureActivity_Fragment = { __typename: 'DeprecateFeatureActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+
 type ActivityFeedNode_DeprecateVariantActivity_Fragment = { __typename: 'DeprecateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
 type ActivityFeedNode_FlagEntityActivity_Fragment = { __typename: 'FlagEntityActivity', id: number, verbiage: string, createdAt: any, flag: { __typename: 'Flag', id: number, name: string, link: string }, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
@@ -6130,7 +6166,7 @@ type ActivityFeedNode_SuggestSourceActivity_Fragment = { __typename: 'SuggestSou
 
 type ActivityFeedNode_UpdateSourceSuggestionStatusActivity_Fragment = { __typename: 'UpdateSourceSuggestionStatusActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-export type ActivityFeedNodeFragment = ActivityFeedNode_AcceptRevisionsActivity_Fragment | ActivityFeedNode_CommentActivity_Fragment | ActivityFeedNode_CreateComplexMolecularProfileActivity_Fragment | ActivityFeedNode_CreateVariantActivity_Fragment | ActivityFeedNode_DeprecateComplexMolecularProfileActivity_Fragment | ActivityFeedNode_DeprecateVariantActivity_Fragment | ActivityFeedNode_FlagEntityActivity_Fragment | ActivityFeedNode_ModerateAssertionActivity_Fragment | ActivityFeedNode_ModerateEvidenceItemActivity_Fragment | ActivityFeedNode_RejectRevisionsActivity_Fragment | ActivityFeedNode_ResolveFlagActivity_Fragment | ActivityFeedNode_SubmitAssertionActivity_Fragment | ActivityFeedNode_SubmitEvidenceItemActivity_Fragment | ActivityFeedNode_SuggestRevisionSetActivity_Fragment | ActivityFeedNode_SuggestSourceActivity_Fragment | ActivityFeedNode_UpdateSourceSuggestionStatusActivity_Fragment;
+export type ActivityFeedNodeFragment = ActivityFeedNode_AcceptRevisionsActivity_Fragment | ActivityFeedNode_CommentActivity_Fragment | ActivityFeedNode_CreateComplexMolecularProfileActivity_Fragment | ActivityFeedNode_CreateFeatureActivity_Fragment | ActivityFeedNode_CreateVariantActivity_Fragment | ActivityFeedNode_DeprecateComplexMolecularProfileActivity_Fragment | ActivityFeedNode_DeprecateFeatureActivity_Fragment | ActivityFeedNode_DeprecateVariantActivity_Fragment | ActivityFeedNode_FlagEntityActivity_Fragment | ActivityFeedNode_ModerateAssertionActivity_Fragment | ActivityFeedNode_ModerateEvidenceItemActivity_Fragment | ActivityFeedNode_RejectRevisionsActivity_Fragment | ActivityFeedNode_ResolveFlagActivity_Fragment | ActivityFeedNode_SubmitAssertionActivity_Fragment | ActivityFeedNode_SubmitEvidenceItemActivity_Fragment | ActivityFeedNode_SuggestRevisionSetActivity_Fragment | ActivityFeedNode_SuggestSourceActivity_Fragment | ActivityFeedNode_UpdateSourceSuggestionStatusActivity_Fragment;
 
 export type AssertionPopoverQueryVariables = Exact<{
   assertionId: Scalars['Int'];
@@ -6584,9 +6620,9 @@ export type RevisionsQueryVariables = Exact<{
 }>;
 
 
-export type RevisionsQuery = { __typename: 'Query', revisions: { __typename: 'RevisionConnection', totalCount: number, unfilteredCountForSubject?: number | undefined, uniqueRevisors: Array<{ __typename: 'User', username: string, id: number, profileImagePath?: string | undefined }>, uniqueResolvers: Array<{ __typename: 'User', username: string, id: number, profileImagePath?: string | undefined }>, revisedFieldNames: Array<{ __typename: 'FieldName', name: string, displayName: string }>, pageInfo: { __typename: 'PageInfo', hasNextPage: boolean, hasPreviousPage: boolean, endCursor?: string | undefined, startCursor?: string | undefined }, edges: Array<{ __typename: 'RevisionEdge', node?: { __typename: 'Revision', id: number, revisionSetId: number, createdAt: any, fieldName: string, currentValue?: any | undefined, suggestedValue?: any | undefined, status: RevisionStatus, linkoutData: { __typename: 'LinkoutData', name: string, diffValue: { __typename: 'ObjectFieldDiff', currentObjects: Array<{ __typename: 'ModeratedObjectField', id: number, displayName?: string | undefined, displayType?: string | undefined, entityType: string, link?: string | undefined, deleted: boolean, deprecated?: boolean | undefined, feature?: { __typename: 'LinkableFeature', link: string, id: number, name: string } | undefined }>, addedObjects: Array<{ __typename: 'ModeratedObjectField', id: number, displayName?: string | undefined, displayType?: string | undefined, entityType: string, link?: string | undefined, deleted: boolean, deprecated?: boolean | undefined, feature?: { __typename: 'LinkableFeature', link: string, id: number, name: string } | undefined }>, removedObjects: Array<{ __typename: 'ModeratedObjectField', id: number, displayName?: string | undefined, displayType?: string | undefined, entityType: string, link?: string | undefined, deleted: boolean, deprecated?: boolean | undefined, feature?: { __typename: 'LinkableFeature', link: string, id: number, name: string } | undefined }>, keptObjects: Array<{ __typename: 'ModeratedObjectField', id: number, displayName?: string | undefined, displayType?: string | undefined, entityType: string, link?: string | undefined, deleted: boolean, deprecated?: boolean | undefined, feature?: { __typename: 'LinkableFeature', link: string, id: number, name: string } | undefined }>, suggestedObjects: Array<{ __typename: 'ModeratedObjectField', id: number, displayName?: string | undefined, displayType?: string | undefined, entityType: string, link?: string | undefined, deleted: boolean, deprecated?: boolean | undefined, feature?: { __typename: 'LinkableFeature', link: string, id: number, name: string } | undefined }> } | { __typename: 'ScalarFieldDiff', left: string, right: string } }, creationActivity?: { __typename: 'SuggestRevisionSetActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, resolutionActivity?: { __typename: 'AcceptRevisionsActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'CommentActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'CreateComplexMolecularProfileActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'CreateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'DeprecateComplexMolecularProfileActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'DeprecateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'FlagEntityActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'ModerateAssertionActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'ModerateEvidenceItemActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'RejectRevisionsActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'ResolveFlagActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'SubmitAssertionActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'SubmitEvidenceItemActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'SuggestRevisionSetActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'SuggestSourceActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'UpdateSourceSuggestionStatusActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined } | undefined }> } };
+export type RevisionsQuery = { __typename: 'Query', revisions: { __typename: 'RevisionConnection', totalCount: number, unfilteredCountForSubject?: number | undefined, uniqueRevisors: Array<{ __typename: 'User', username: string, id: number, profileImagePath?: string | undefined }>, uniqueResolvers: Array<{ __typename: 'User', username: string, id: number, profileImagePath?: string | undefined }>, revisedFieldNames: Array<{ __typename: 'FieldName', name: string, displayName: string }>, pageInfo: { __typename: 'PageInfo', hasNextPage: boolean, hasPreviousPage: boolean, endCursor?: string | undefined, startCursor?: string | undefined }, edges: Array<{ __typename: 'RevisionEdge', node?: { __typename: 'Revision', id: number, revisionSetId: number, createdAt: any, fieldName: string, currentValue?: any | undefined, suggestedValue?: any | undefined, status: RevisionStatus, linkoutData: { __typename: 'LinkoutData', name: string, diffValue: { __typename: 'ObjectFieldDiff', currentObjects: Array<{ __typename: 'ModeratedObjectField', id: number, displayName?: string | undefined, displayType?: string | undefined, entityType: string, link?: string | undefined, deleted: boolean, deprecated?: boolean | undefined, feature?: { __typename: 'LinkableFeature', link: string, id: number, name: string } | undefined }>, addedObjects: Array<{ __typename: 'ModeratedObjectField', id: number, displayName?: string | undefined, displayType?: string | undefined, entityType: string, link?: string | undefined, deleted: boolean, deprecated?: boolean | undefined, feature?: { __typename: 'LinkableFeature', link: string, id: number, name: string } | undefined }>, removedObjects: Array<{ __typename: 'ModeratedObjectField', id: number, displayName?: string | undefined, displayType?: string | undefined, entityType: string, link?: string | undefined, deleted: boolean, deprecated?: boolean | undefined, feature?: { __typename: 'LinkableFeature', link: string, id: number, name: string } | undefined }>, keptObjects: Array<{ __typename: 'ModeratedObjectField', id: number, displayName?: string | undefined, displayType?: string | undefined, entityType: string, link?: string | undefined, deleted: boolean, deprecated?: boolean | undefined, feature?: { __typename: 'LinkableFeature', link: string, id: number, name: string } | undefined }>, suggestedObjects: Array<{ __typename: 'ModeratedObjectField', id: number, displayName?: string | undefined, displayType?: string | undefined, entityType: string, link?: string | undefined, deleted: boolean, deprecated?: boolean | undefined, feature?: { __typename: 'LinkableFeature', link: string, id: number, name: string } | undefined }> } | { __typename: 'ScalarFieldDiff', left: string, right: string } }, creationActivity?: { __typename: 'SuggestRevisionSetActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, resolutionActivity?: { __typename: 'AcceptRevisionsActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'CommentActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'CreateComplexMolecularProfileActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'CreateFeatureActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'CreateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'DeprecateComplexMolecularProfileActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'DeprecateFeatureActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'DeprecateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'FlagEntityActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'ModerateAssertionActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'ModerateEvidenceItemActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'RejectRevisionsActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'ResolveFlagActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'SubmitAssertionActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'SubmitEvidenceItemActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'SuggestRevisionSetActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'SuggestSourceActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'UpdateSourceSuggestionStatusActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined } | undefined }> } };
 
-export type RevisionFragment = { __typename: 'Revision', id: number, revisionSetId: number, createdAt: any, fieldName: string, currentValue?: any | undefined, suggestedValue?: any | undefined, status: RevisionStatus, linkoutData: { __typename: 'LinkoutData', name: string, diffValue: { __typename: 'ObjectFieldDiff', currentObjects: Array<{ __typename: 'ModeratedObjectField', id: number, displayName?: string | undefined, displayType?: string | undefined, entityType: string, link?: string | undefined, deleted: boolean, deprecated?: boolean | undefined, feature?: { __typename: 'LinkableFeature', link: string, id: number, name: string } | undefined }>, addedObjects: Array<{ __typename: 'ModeratedObjectField', id: number, displayName?: string | undefined, displayType?: string | undefined, entityType: string, link?: string | undefined, deleted: boolean, deprecated?: boolean | undefined, feature?: { __typename: 'LinkableFeature', link: string, id: number, name: string } | undefined }>, removedObjects: Array<{ __typename: 'ModeratedObjectField', id: number, displayName?: string | undefined, displayType?: string | undefined, entityType: string, link?: string | undefined, deleted: boolean, deprecated?: boolean | undefined, feature?: { __typename: 'LinkableFeature', link: string, id: number, name: string } | undefined }>, keptObjects: Array<{ __typename: 'ModeratedObjectField', id: number, displayName?: string | undefined, displayType?: string | undefined, entityType: string, link?: string | undefined, deleted: boolean, deprecated?: boolean | undefined, feature?: { __typename: 'LinkableFeature', link: string, id: number, name: string } | undefined }>, suggestedObjects: Array<{ __typename: 'ModeratedObjectField', id: number, displayName?: string | undefined, displayType?: string | undefined, entityType: string, link?: string | undefined, deleted: boolean, deprecated?: boolean | undefined, feature?: { __typename: 'LinkableFeature', link: string, id: number, name: string } | undefined }> } | { __typename: 'ScalarFieldDiff', left: string, right: string } }, creationActivity?: { __typename: 'SuggestRevisionSetActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, resolutionActivity?: { __typename: 'AcceptRevisionsActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'CommentActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'CreateComplexMolecularProfileActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'CreateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'DeprecateComplexMolecularProfileActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'DeprecateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'FlagEntityActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'ModerateAssertionActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'ModerateEvidenceItemActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'RejectRevisionsActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'ResolveFlagActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'SubmitAssertionActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'SubmitEvidenceItemActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'SuggestRevisionSetActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'SuggestSourceActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'UpdateSourceSuggestionStatusActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined };
+export type RevisionFragment = { __typename: 'Revision', id: number, revisionSetId: number, createdAt: any, fieldName: string, currentValue?: any | undefined, suggestedValue?: any | undefined, status: RevisionStatus, linkoutData: { __typename: 'LinkoutData', name: string, diffValue: { __typename: 'ObjectFieldDiff', currentObjects: Array<{ __typename: 'ModeratedObjectField', id: number, displayName?: string | undefined, displayType?: string | undefined, entityType: string, link?: string | undefined, deleted: boolean, deprecated?: boolean | undefined, feature?: { __typename: 'LinkableFeature', link: string, id: number, name: string } | undefined }>, addedObjects: Array<{ __typename: 'ModeratedObjectField', id: number, displayName?: string | undefined, displayType?: string | undefined, entityType: string, link?: string | undefined, deleted: boolean, deprecated?: boolean | undefined, feature?: { __typename: 'LinkableFeature', link: string, id: number, name: string } | undefined }>, removedObjects: Array<{ __typename: 'ModeratedObjectField', id: number, displayName?: string | undefined, displayType?: string | undefined, entityType: string, link?: string | undefined, deleted: boolean, deprecated?: boolean | undefined, feature?: { __typename: 'LinkableFeature', link: string, id: number, name: string } | undefined }>, keptObjects: Array<{ __typename: 'ModeratedObjectField', id: number, displayName?: string | undefined, displayType?: string | undefined, entityType: string, link?: string | undefined, deleted: boolean, deprecated?: boolean | undefined, feature?: { __typename: 'LinkableFeature', link: string, id: number, name: string } | undefined }>, suggestedObjects: Array<{ __typename: 'ModeratedObjectField', id: number, displayName?: string | undefined, displayType?: string | undefined, entityType: string, link?: string | undefined, deleted: boolean, deprecated?: boolean | undefined, feature?: { __typename: 'LinkableFeature', link: string, id: number, name: string } | undefined }> } | { __typename: 'ScalarFieldDiff', left: string, right: string } }, creationActivity?: { __typename: 'SuggestRevisionSetActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, resolutionActivity?: { __typename: 'AcceptRevisionsActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'CommentActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'CreateComplexMolecularProfileActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'CreateFeatureActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'CreateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'DeprecateComplexMolecularProfileActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'DeprecateFeatureActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'DeprecateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'FlagEntityActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'ModerateAssertionActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'ModerateEvidenceItemActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'RejectRevisionsActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'ResolveFlagActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'SubmitAssertionActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'SubmitEvidenceItemActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'SuggestRevisionSetActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'SuggestSourceActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | { __typename: 'UpdateSourceSuggestionStatusActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined };
 
 export type ContributorAvatarsQueryVariables = Exact<{
   subscribable: SubscribableInput;
diff --git a/client/src/app/generated/civic.possible-types.ts b/client/src/app/generated/civic.possible-types.ts
index b58377532..5a5b63403 100644
--- a/client/src/app/generated/civic.possible-types.ts
+++ b/client/src/app/generated/civic.possible-types.ts
@@ -10,8 +10,10 @@
       "AcceptRevisionsActivity",
       "CommentActivity",
       "CreateComplexMolecularProfileActivity",
+      "CreateFeatureActivity",
       "CreateVariantActivity",
       "DeprecateComplexMolecularProfileActivity",
+      "DeprecateFeatureActivity",
       "DeprecateVariantActivity",
       "FlagEntityActivity",
       "ModerateAssertionActivity",
diff --git a/client/src/app/generated/server.model.graphql b/client/src/app/generated/server.model.graphql
index e1df2c161..847e23b8b 100644
--- a/client/src/app/generated/server.model.graphql
+++ b/client/src/app/generated/server.model.graphql
@@ -1800,6 +1800,66 @@ type CreateComplexMolecularProfileActivity implements ActivityInterface {
   verbiage: String!
 }
 
+type CreateFeatureActivity implements ActivityInterface {
+  createdAt: ISO8601DateTime!
+  events: [Event!]!
+  id: Int!
+  note: String
+  organization: Organization
+  parsedNote: [CommentBodySegment!]!
+  subject: EventSubject!
+  user: User!
+  verbiage: String!
+}
+
+"""
+Autogenerated input type of CreateFeature
+"""
+input CreateFeatureInput {
+  """
+  A unique identifier for the client performing the mutation.
+  """
+  clientMutationId: String
+
+  """
+  The Type of Feature you are creating
+  """
+  featureType: CreateableFeatureTypes!
+
+  """
+  The name of the feature to create.
+  """
+  name: String!
+
+  """
+  The ID of the organization to credit the user's contributions to.
+  If the user belongs to a single organization or no organizations, this field is not required.
+  This field is required if the user belongs to more than one organization.
+  The user must belong to the organization provided.
+  """
+  organizationId: Int
+}
+
+"""
+Autogenerated return type of CreateFeature
+"""
+type CreateFeaturePayload {
+  """
+  A unique identifier for the client performing the mutation.
+  """
+  clientMutationId: String
+
+  """
+  The newly created Feature.
+  """
+  feature: Feature!
+
+  """
+  True if the feature was newly created. False if the returned variant was already in the database.
+  """
+  new: Boolean!
+}
+
 """
 Autogenerated input type of CreateMolecularProfile
 """
@@ -1904,6 +1964,13 @@ type CreateVariantPayload {
   variant: Variant!
 }
 
+"""
+Enum representing Feature types that can be user-created
+"""
+enum CreateableFeatureTypes {
+  FACTOR
+}
+
 type DataRelease {
   acceptedAndSubmittedVariantsVcf: DownloadableFile
   acceptedVariantsVcf: DownloadableFile
@@ -1993,6 +2060,18 @@ type DeprecateComplexMolecularProfilePayload {
   molecularProfile: MolecularProfile
 }
 
+type DeprecateFeatureActivity implements ActivityInterface {
+  createdAt: ISO8601DateTime!
+  events: [Event!]!
+  id: Int!
+  note: String
+  organization: Organization
+  parsedNote: [CommentBodySegment!]!
+  subject: EventSubject!
+  user: User!
+  verbiage: String!
+}
+
 type DeprecateVariantActivity implements ActivityInterface {
   createdAt: ISO8601DateTime!
   events: [Event!]!
@@ -2208,8 +2287,10 @@ enum EventAction {
   COMMENTED
   COMPLEX_MOLECULAR_PROFILE_CREATED
   CURATED_SOURCE_SUGGESTION
+  DEPRECATED_FEATURE
   DEPRECATED_MOLECULAR_PROFILE
   DEPRECATED_VARIANT
+  FEATURE_CREATED
   FLAGGED
   FLAG_RESOLVED
   PUBLICATION_SUGGESTED
@@ -4866,6 +4947,16 @@ type Mutation {
     input: AddTherapyInput!
   ): AddTherapyPayload
 
+  """
+  Create a new Feature in the database.
+  """
+  createFeature(
+    """
+    Parameters for CreateFeature
+    """
+    input: CreateFeatureInput!
+  ): CreateFeaturePayload
+
   """
   Create a new Molecular Profile in order to attach Evidence Items to it.
   """
diff --git a/client/src/app/generated/server.schema.json b/client/src/app/generated/server.schema.json
index 8c3d1bb34..007758154 100644
--- a/client/src/app/generated/server.schema.json
+++ b/client/src/app/generated/server.schema.json
@@ -644,6 +644,11 @@
               "name": "CreateComplexMolecularProfileActivity",
               "ofType": null
             },
+            {
+              "kind": "OBJECT",
+              "name": "CreateFeatureActivity",
+              "ofType": null
+            },
             {
               "kind": "OBJECT",
               "name": "CreateVariantActivity",
@@ -654,6 +659,11 @@
               "name": "DeprecateComplexMolecularProfileActivity",
               "ofType": null
             },
+            {
+              "kind": "OBJECT",
+              "name": "DeprecateFeatureActivity",
+              "ofType": null
+            },
             {
               "kind": "OBJECT",
               "name": "DeprecateVariantActivity",
@@ -9254,6 +9264,297 @@
           "enumValues": null,
           "possibleTypes": null
         },
+        {
+          "kind": "OBJECT",
+          "name": "CreateFeatureActivity",
+          "description": null,
+          "fields": [
+            {
+              "name": "createdAt",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "ISO8601DateTime",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "events",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "Event",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "id",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "note",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "organization",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Organization",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "parsedNote",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "UNION",
+                      "name": "CommentBodySegment",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "subject",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "INTERFACE",
+                  "name": "EventSubject",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "user",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "User",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "verbiage",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [
+            {
+              "kind": "INTERFACE",
+              "name": "ActivityInterface",
+              "ofType": null
+            }
+          ],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "CreateFeatureInput",
+          "description": "Autogenerated input type of CreateFeature",
+          "fields": null,
+          "inputFields": [
+            {
+              "name": "organizationId",
+              "description": "The ID of the organization to credit the user's contributions to.\nIf the user belongs to a single organization or no organizations, this field is not required.\nThis field is required if the user belongs to more than one organization.\nThe user must belong to the organization provided.",
+              "type": {
+                "kind": "SCALAR",
+                "name": "Int",
+                "ofType": null
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "name",
+              "description": "The name of the feature to create.",
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "featureType",
+              "description": "The Type of Feature you are creating",
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "ENUM",
+                  "name": "CreateableFeatureTypes",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "clientMutationId",
+              "description": "A unique identifier for the client performing the mutation.",
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "CreateFeaturePayload",
+          "description": "Autogenerated return type of CreateFeature",
+          "fields": [
+            {
+              "name": "clientMutationId",
+              "description": "A unique identifier for the client performing the mutation.",
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "feature",
+              "description": "The newly created Feature.",
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "Feature",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "new",
+              "description": "True if the feature was newly created. False if the returned variant was already in the database.",
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Boolean",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
         {
           "kind": "INPUT_OBJECT",
           "name": "CreateMolecularProfileInput",
@@ -9667,6 +9968,23 @@
           "enumValues": null,
           "possibleTypes": null
         },
+        {
+          "kind": "ENUM",
+          "name": "CreateableFeatureTypes",
+          "description": "Enum representing Feature types that can be user-created",
+          "fields": null,
+          "inputFields": null,
+          "interfaces": null,
+          "enumValues": [
+            {
+              "name": "FACTOR",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "possibleTypes": null
+        },
         {
           "kind": "OBJECT",
           "name": "DataRelease",
@@ -10143,6 +10461,175 @@
           "enumValues": null,
           "possibleTypes": null
         },
+        {
+          "kind": "OBJECT",
+          "name": "DeprecateFeatureActivity",
+          "description": null,
+          "fields": [
+            {
+              "name": "createdAt",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "ISO8601DateTime",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "events",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "Event",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "id",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "note",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "organization",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Organization",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "parsedNote",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "UNION",
+                      "name": "CommentBodySegment",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "subject",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "INTERFACE",
+                  "name": "EventSubject",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "user",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "User",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "verbiage",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [
+            {
+              "kind": "INTERFACE",
+              "name": "ActivityInterface",
+              "ofType": null
+            }
+          ],
+          "enumValues": null,
+          "possibleTypes": null
+        },
         {
           "kind": "OBJECT",
           "name": "DeprecateVariantActivity",
@@ -11419,6 +11906,18 @@
               "description": null,
               "isDeprecated": false,
               "deprecationReason": null
+            },
+            {
+              "name": "FEATURE_CREATED",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "DEPRECATED_FEATURE",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
             }
           ],
           "possibleTypes": null
@@ -22769,6 +23268,35 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "createFeature",
+              "description": "Create a new Feature in the database.",
+              "args": [
+                {
+                  "name": "input",
+                  "description": "Parameters for CreateFeature",
+                  "type": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "INPUT_OBJECT",
+                      "name": "CreateFeatureInput",
+                      "ofType": null
+                    }
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                }
+              ],
+              "type": {
+                "kind": "OBJECT",
+                "name": "CreateFeaturePayload",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "createMolecularProfile",
               "description": "Create a new Molecular Profile in order to attach Evidence Items to it.",
diff --git a/server/app/graphql/mutations/create_feature.rb b/server/app/graphql/mutations/create_feature.rb
new file mode 100644
index 000000000..d7c1f5816
--- /dev/null
+++ b/server/app/graphql/mutations/create_feature.rb
@@ -0,0 +1,66 @@
+class Mutations::CreateFeature < Mutations::MutationWithOrg
+  description 'Create a new Feature in the database.'
+
+  argument :name, String, required: true,
+    description: 'The name of the feature to create.',
+    validates: { allow_blank: false }
+
+  argument :feature_type, Types::CreateableFeatureTypesType, required: true,
+    description: 'The Type of Feature you are creating'
+
+  field :feature, Types::Entities::FeatureType, null: false,
+    description: 'The newly created Feature.'
+
+  field :new, Boolean, null: false,
+    description: 'True if the feature was newly created. False if the returned variant was already in the database.'
+
+  def ready?(organization_id: nil, **kwargs)
+    validate_user_logged_in
+    validate_user_org(organization_id)
+
+    return true
+  end
+
+  def authorized?(organization_id: nil, **kwargs)
+    validate_user_acting_as_org(user: context[:current_user], organization_id: organization_id)
+    return true
+  end
+
+  def resolve(name:, feature_type:, organization_id: nil)
+
+    existing_feature = Feature.left_joins(:feature_aliases).where(feature_instance_type: feature_type.to_s)
+      .where('features.name ILIKE ?', name)
+      .or(
+          Feature.where(feature_instance_type: feature_type.to_s)
+            .left_joins(:feature_aliases)
+            .where('feature_aliases.name ILIKE ?', name)
+         )
+      .first
+
+    if existing_feature.present?
+      return {
+        feature: existing_feature,
+        new: false,
+      }
+
+    else
+      cmd = Activities::CreateFeature.new(
+        feature_name: name,
+        feature_instance_type: feature_type,
+        originating_user: context[:current_user],
+        organization_id: organization_id,
+      )
+
+      res = cmd.perform
+
+      if res.succeeded?
+        return {
+          feature: res.feature,
+          new: true,
+        }
+      else
+        raise GraphQL::ExecutionError, res.errors.join(', ')
+      end
+    end
+  end
+end
diff --git a/server/app/graphql/mutations/create_variant.rb b/server/app/graphql/mutations/create_variant.rb
index 5b63ade21..5242b5cca 100644
--- a/server/app/graphql/mutations/create_variant.rb
+++ b/server/app/graphql/mutations/create_variant.rb
@@ -34,9 +34,9 @@ def authorized?(organization_id: nil, **kwargs)
   end
 
   def resolve(name:, feature_id:, organization_id: nil)
-    existing_variant = Variant.joins(:variant_aliases).where(feature_id: feature_id)
+    existing_variant = Variant.left_joins(:variant_aliases).where(feature_id: feature_id)
       .where('variants.name ILIKE ?', name)
-      .or(Variant.joins(:variant_aliases).where(feature_id: feature_id).where('variant_aliases.name ILIKE ?', name))
+      .or(Variant.left_joins(:variant_aliases).where(feature_id: feature_id).where('variant_aliases.name ILIKE ?', name))
       .first
 
     if existing_variant.present?
diff --git a/server/app/graphql/types/activities/create_feature_activity_type.rb b/server/app/graphql/types/activities/create_feature_activity_type.rb
new file mode 100644
index 000000000..428f74d81
--- /dev/null
+++ b/server/app/graphql/types/activities/create_feature_activity_type.rb
@@ -0,0 +1,5 @@
+module Types::Activities
+  class CreateFeatureActivityType < Types::BaseObject
+    implements Types::Interfaces::ActivityInterface
+  end
+end
diff --git a/server/app/graphql/types/activities/deprecate_feature_activity_type.rb b/server/app/graphql/types/activities/deprecate_feature_activity_type.rb
new file mode 100644
index 000000000..fa27dce21
--- /dev/null
+++ b/server/app/graphql/types/activities/deprecate_feature_activity_type.rb
@@ -0,0 +1,5 @@
+module Types::Activities
+  class DeprecateFeatureActivityType < Types::BaseObject
+    implements Types::Interfaces::ActivityInterface
+  end
+end
diff --git a/server/app/graphql/types/createable_feature_types_type.rb b/server/app/graphql/types/createable_feature_types_type.rb
new file mode 100644
index 000000000..51cc11ffc
--- /dev/null
+++ b/server/app/graphql/types/createable_feature_types_type.rb
@@ -0,0 +1,6 @@
+module Types
+  class CreateableFeatureTypesType < Types::BaseEnum
+    description 'Enum representing Feature types that can be user-created'
+    value 'FACTOR', value: Features::Factor
+  end
+end
diff --git a/server/app/graphql/types/events/event_action_type.rb b/server/app/graphql/types/events/event_action_type.rb
index 6efb42d27..465b8fae7 100644
--- a/server/app/graphql/types/events/event_action_type.rb
+++ b/server/app/graphql/types/events/event_action_type.rb
@@ -23,6 +23,8 @@ class EventActionType < Types::BaseEnum
     value 'DEPRECATED_MOLECULAR_PROFILE', value: 'deprecated molecular profile'
     value 'VARIANT_CREATED', value: 'variant created'
     value 'COMPLEX_MOLECULAR_PROFILE_CREATED', value: 'complex molecular profile created'
+    value 'FEATURE_CREATED', value: 'feature created'
+    value 'DEPRECATED_FEATURE', value: 'deprecated feature'
   end
 end
 
diff --git a/server/app/graphql/types/interfaces/activity_interface.rb b/server/app/graphql/types/interfaces/activity_interface.rb
index 54b9be6ec..2f4a88fef 100644
--- a/server/app/graphql/types/interfaces/activity_interface.rb
+++ b/server/app/graphql/types/interfaces/activity_interface.rb
@@ -56,7 +56,9 @@ def hash_key_from_object(object)
       Types::Activities::AcceptRevisionsActivityType,
       Types::Activities::CreateVariantActivityType,
       Types::Activities::DeprecateComplexMolecularProfileActivityType,
-      Types::Activities::CreateComplexMolecularProfileActivityType
+      Types::Activities::CreateComplexMolecularProfileActivityType,
+      Types::Activities::CreateFeatureActivityType,
+      Types::Activities::DeprecateFeatureActivityType,
     )
 
     definition_methods do
@@ -94,6 +96,10 @@ def resolve_type(object, context)
           Types::Activities::DeprecateComplexMolecularProfileActivityType
         when CreateComplexMolecularProfileActivity
           Types::Activities::CreateComplexMolecularProfileActivityType
+        when CreateFeatureActivity
+          Types::Activities::CreateFeatureActivityType
+        when DeprecateFeatureActivity
+          Types::Activities::DeprecateFeatureActivityType
         else
           raise "Unexpected Activity type #{object.class}"
         end
diff --git a/server/app/graphql/types/interfaces/event_origin_object.rb b/server/app/graphql/types/interfaces/event_origin_object.rb
index 9835c3b43..2cb945bcc 100644
--- a/server/app/graphql/types/interfaces/event_origin_object.rb
+++ b/server/app/graphql/types/interfaces/event_origin_object.rb
@@ -40,6 +40,8 @@ def resolve_type(object, context)
           Types::Entities::VariantType
         when MolecularProfile
           Types::Entities::MolecularProfileType
+        when Feature
+          Types::Entities::FeatureType
         else
           raise "Unexpected EventOriginObject type: #{object.class}"
         end
diff --git a/server/app/graphql/types/mutation_type.rb b/server/app/graphql/types/mutation_type.rb
index 8b136e968..24fb0eb68 100644
--- a/server/app/graphql/types/mutation_type.rb
+++ b/server/app/graphql/types/mutation_type.rb
@@ -53,5 +53,6 @@ class MutationType < Types::BaseObject
     field :add_disease, mutation: Mutations::AddDisease
     field :add_therapy, mutation: Mutations::AddTherapy
     field :create_variant, mutation: Mutations::CreateVariant
+    field :create_feature, mutation: Mutations::CreateFeature
   end
 end
diff --git a/server/app/models/actions/create_feature.rb b/server/app/models/actions/create_feature.rb
new file mode 100644
index 000000000..81b909d52
--- /dev/null
+++ b/server/app/models/actions/create_feature.rb
@@ -0,0 +1,30 @@
+module Actions
+  class CreateFeature
+    include Actions::Transactional
+
+    attr_reader :feature, :originating_user, :organization_id
+
+    def initialize(feature_name:, feature_instance_type:, originating_user:, organization_id: nil)
+      feature_instance = feature_instance_type.new()
+      @feature = Feature.new(name: feature_name, feature_instance: feature_instance)
+      @originating_user = originating_user
+      @organization_id = organization_id
+    end
+
+    private
+    def execute
+      feature.save!
+
+      event = Event.new(
+        action: 'feature created',
+        originating_user: originating_user,
+        subject: feature,
+        organization_id: organization_id,
+        originating_object: feature
+      )
+
+      events << event
+
+    end
+  end
+end
diff --git a/server/app/models/activities/create_feature.rb b/server/app/models/activities/create_feature.rb
new file mode 100644
index 000000000..d6f36f9d4
--- /dev/null
+++ b/server/app/models/activities/create_feature.rb
@@ -0,0 +1,46 @@
+module Activities
+  class CreateFeature < Base
+    attr_reader :feature_name, :feature_instance_type, :feature
+
+    def initialize(originating_user:, organization_id:, feature_name:, feature_instance_type:)
+      super(organization_id: organization_id, user: originating_user)
+      @feature_name = feature_name
+      @feature_instance_type = feature_instance_type
+    end
+
+    private
+    def create_activity
+      @activity = CreateFeatureActivity.new(
+        user: user,
+        organization: organization,
+      )
+    end
+
+    def call_actions
+      cmd = Actions::CreateFeature.new(
+        feature_name: feature_name,
+        feature_instance_type: feature_instance_type,
+        originating_user: user,
+        organization_id: organization&.id
+      )
+
+      cmd.perform
+
+      if !cmd.succeeded?
+        raise StandardError.new(cmd.errors.join(', '))
+      end
+
+      @feature = cmd.feature
+      events << cmd.events
+    end
+
+    def linked_entities
+      nil
+    end
+
+    def after_actions
+      activity.subject = feature
+      activity.save!
+    end
+  end
+end
diff --git a/server/app/models/create_feature_activity.rb b/server/app/models/create_feature_activity.rb
new file mode 100644
index 000000000..416a12295
--- /dev/null
+++ b/server/app/models/create_feature_activity.rb
@@ -0,0 +1,10 @@
+class CreateFeatureActivity < Activity
+
+  def feature
+    self.subject
+  end
+
+  def generate_verbiage
+    "created #{feature.feature_instance_type.demodulize}"
+  end
+end
diff --git a/server/app/models/deprecate_feature_activity.rb b/server/app/models/deprecate_feature_activity.rb
new file mode 100644
index 000000000..4b87eeaf0
--- /dev/null
+++ b/server/app/models/deprecate_feature_activity.rb
@@ -0,0 +1,10 @@
+class DeprecateFeatureActivity < Activity
+
+  def feature
+    self.subject
+  end
+
+  def generate_verbiage
+    "deprecated #{feature.feature_instance_type.demodulize}"
+  end
+end
diff --git a/server/app/models/feature.rb b/server/app/models/feature.rb
index 3d7db5b5f..98a6d5ee9 100644
--- a/server/app/models/feature.rb
+++ b/server/app/models/feature.rb
@@ -14,6 +14,8 @@ class Feature < ApplicationRecord
   searchkick highlight: [:name, :aliases, :feature_type], callbacks: :async
   scope :search_import, -> { includes(:feature_aliases) }
 
+  validates :name, presence: true, uniqueness: { scope: :feature_instance_type }
+
   def search_data
     {
       name: name,

From 7aae2c6032a47e95fb0de70db891bb7a073b8edf Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Thu, 1 Feb 2024 16:36:11 -0600
Subject: [PATCH 081/125] show actual id for ncit linkout

---
 .../components/factors/factor-summary/factor-summary.page.html  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/app/components/factors/factor-summary/factor-summary.page.html b/client/src/app/components/factors/factor-summary/factor-summary.page.html
index a38e581d7..1755dc229 100644
--- a/client/src/app/components/factors/factor-summary/factor-summary.page.html
+++ b/client/src/app/components/factors/factor-summary/factor-summary.page.html
@@ -83,7 +83,7 @@
                   factor.ncitId
                 "
                 [tooltip]="'View ' + factor.name + ' in the NCI Thesaurus'">
-                NCIt
+                NCIt: {{ factor.ncitId }}
               </cvc-link-tag>
             </cvc-tag-list>
           </nz-descriptions-item>

From 5d1943c1aaef04ba962ad056c6d4e23f12062ce9 Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Thu, 1 Feb 2024 21:36:02 -0600
Subject: [PATCH 082/125] allow for deprecating features

---
 client/src/app/generated/server.model.graphql |  91 ++++
 client/src/app/generated/server.schema.json   | 426 ++++++++++++++++++
 .../graphql/mutations/deprecate_feature.rb    |  86 ++++
 .../deprecate_feature_activity_type.rb        |  11 +
 .../graphql/types/entities/feature_type.rb    |   4 +
 .../types/feature_deprecation_reason_type.rb  |   7 +
 server/app/graphql/types/mutation_type.rb     |   1 +
 .../types/variant_deprecation_reason_type.rb  |   1 +
 .../app/models/actions/deprecate_feature.rb   |  60 +++
 .../models/activities/deprecate_feature.rb    |  41 ++
 .../app/models/deprecate_feature_activity.rb  |   2 +
 server/app/models/feature.rb                  |  12 +
 server/app/models/variant.rb                  |   2 +-
 ...240201182724_add_deprecated_to_features.rb |   6 +
 server/db/schema.rb                           |   4 +-
 15 files changed, 752 insertions(+), 2 deletions(-)
 create mode 100644 server/app/graphql/mutations/deprecate_feature.rb
 create mode 100644 server/app/graphql/types/feature_deprecation_reason_type.rb
 create mode 100644 server/app/models/actions/deprecate_feature.rb
 create mode 100644 server/app/models/activities/deprecate_feature.rb
 create mode 100644 server/db/migrate/20240201182724_add_deprecated_to_features.rb

diff --git a/client/src/app/generated/server.model.graphql b/client/src/app/generated/server.model.graphql
index 847e23b8b..772f8c62f 100644
--- a/client/src/app/generated/server.model.graphql
+++ b/client/src/app/generated/server.model.graphql
@@ -2064,14 +2064,75 @@ type DeprecateFeatureActivity implements ActivityInterface {
   createdAt: ISO8601DateTime!
   events: [Event!]!
   id: Int!
+  molecularProfiles: [MolecularProfile!]!
   note: String
   organization: Organization
   parsedNote: [CommentBodySegment!]!
   subject: EventSubject!
   user: User!
+  variants: [Variant!]!
   verbiage: String!
 }
 
+"""
+Autogenerated input type of DeprecateFeature
+"""
+input DeprecateFeatureInput {
+  """
+  A unique identifier for the client performing the mutation.
+  """
+  clientMutationId: String
+
+  """
+  Text giving more context for deprecation this feature.
+  """
+  comment: String!
+
+  """
+  The reason for deprecation this feature.
+  """
+  deprecationReason: FeatureDeprecationReason!
+
+  """
+  The CIViC ID of the feature to deprecate.
+  """
+  featureId: Int!
+
+  """
+  The ID of the organization to credit the user's contributions to.
+  If the user belongs to a single organization or no organizations, this field is not required.
+  This field is required if the user belongs to more than one organization.
+  The user must belong to the organization provided.
+  """
+  organizationId: Int
+}
+
+"""
+Autogenerated return type of DeprecateFeature
+"""
+type DeprecateFeaturePayload {
+  """
+  A unique identifier for the client performing the mutation.
+  """
+  clientMutationId: String
+
+  """
+  The deprecated Feature.
+  """
+  feature: Feature
+
+  """
+  The molecular profiles linked to this feature's variants that weren't already
+  deprecated and have been newly deprecated by running this mutation.
+  """
+  newlyDeprecatedMolecularProfiles: [MolecularProfile!]
+
+  """
+  The variants linked to this feature that are newly deprecated.
+  """
+  newlyDeprecatedVariants: [Variant!]
+}
+
 type DeprecateVariantActivity implements ActivityInterface {
   createdAt: ISO8601DateTime!
   events: [Event!]!
@@ -2926,6 +2987,10 @@ type Factor implements Commentable & EventSubject & Flaggable & MolecularProfile
     """
     sortBy: DateSort
   ): CommentConnection!
+  creationActivity: CreateFeatureActivity
+  deprecated: Boolean!
+  deprecationActivity: DeprecateFeatureActivity
+  deprecationReason: FeatureDeprecationReason
   description: String
 
   """
@@ -3158,6 +3223,10 @@ type Feature implements Commentable & EventSubject & Flaggable & MolecularProfil
     """
     sortBy: DateSort
   ): CommentConnection!
+  creationActivity: CreateFeatureActivity
+  deprecated: Boolean!
+  deprecationActivity: DeprecateFeatureActivity
+  deprecationReason: FeatureDeprecationReason
   description: String
 
   """
@@ -3330,6 +3399,12 @@ type Feature implements Commentable & EventSubject & Flaggable & MolecularProfil
   ): VariantConnection!
 }
 
+enum FeatureDeprecationReason {
+  DUPLICATE
+  INVALID
+  OTHER
+}
+
 """
 The specific type of a feature instance
 """
@@ -3733,6 +3808,10 @@ type Gene implements Commentable & EventSubject & Flaggable & MolecularProfileCo
     """
     sortBy: DateSort
   ): CommentConnection!
+  creationActivity: CreateFeatureActivity
+  deprecated: Boolean!
+  deprecationActivity: DeprecateFeatureActivity
+  deprecationReason: FeatureDeprecationReason
   description: String
   entrezId: Int!
 
@@ -4987,6 +5066,17 @@ type Mutation {
     input: DeprecateComplexMolecularProfileInput!
   ): DeprecateComplexMolecularProfilePayload
 
+  """
+  Deprecate a feature to prevent it from being used in the future and implicitly
+  deprecate all the variants and molecular profiles linked to this feature.
+  """
+  deprecateFeature(
+    """
+    Parameters for DeprecateFeature
+    """
+    input: DeprecateFeatureInput!
+  ): DeprecateFeaturePayload
+
   """
   Deprecate a variant to prevent it from being used in the future and implicitly
   deprecate all the molecular profiles linked to this variant.
@@ -9588,6 +9678,7 @@ type VariantConnection {
 
 enum VariantDeprecationReason {
   DUPLICATE
+  FEATURE_DEPRECATED
   INVALID
   OTHER
 }
diff --git a/client/src/app/generated/server.schema.json b/client/src/app/generated/server.schema.json
index 007758154..a2c091e4d 100644
--- a/client/src/app/generated/server.schema.json
+++ b/client/src/app/generated/server.schema.json
@@ -10522,6 +10522,30 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "molecularProfiles",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "MolecularProfile",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "note",
               "description": null,
@@ -10602,6 +10626,30 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "variants",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "Variant",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "verbiage",
               "description": null,
@@ -10630,6 +10678,164 @@
           "enumValues": null,
           "possibleTypes": null
         },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "DeprecateFeatureInput",
+          "description": "Autogenerated input type of DeprecateFeature",
+          "fields": null,
+          "inputFields": [
+            {
+              "name": "organizationId",
+              "description": "The ID of the organization to credit the user's contributions to.\nIf the user belongs to a single organization or no organizations, this field is not required.\nThis field is required if the user belongs to more than one organization.\nThe user must belong to the organization provided.",
+              "type": {
+                "kind": "SCALAR",
+                "name": "Int",
+                "ofType": null
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "featureId",
+              "description": "The CIViC ID of the feature to deprecate.",
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "deprecationReason",
+              "description": "The reason for deprecation this feature.",
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "ENUM",
+                  "name": "FeatureDeprecationReason",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "comment",
+              "description": "Text giving more context for deprecation this feature.",
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "clientMutationId",
+              "description": "A unique identifier for the client performing the mutation.",
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "DeprecateFeaturePayload",
+          "description": "Autogenerated return type of DeprecateFeature",
+          "fields": [
+            {
+              "name": "clientMutationId",
+              "description": "A unique identifier for the client performing the mutation.",
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "feature",
+              "description": "The deprecated Feature.",
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Feature",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "newlyDeprecatedMolecularProfiles",
+              "description": "The molecular profiles linked to this feature's variants that weren't already deprecated and have been newly deprecated by running this mutation.",
+              "args": [],
+              "type": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "OBJECT",
+                    "name": "MolecularProfile",
+                    "ofType": null
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "newlyDeprecatedVariants",
+              "description": "The variants linked to this feature that are newly deprecated.",
+              "args": [],
+              "type": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "OBJECT",
+                    "name": "Variant",
+                    "ofType": null
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
         {
           "kind": "OBJECT",
           "name": "DeprecateVariantActivity",
@@ -14669,6 +14875,58 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "creationActivity",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "CreateFeatureActivity",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "deprecated",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Boolean",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "deprecationActivity",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "DeprecateFeatureActivity",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "deprecationReason",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "ENUM",
+                "name": "FeatureDeprecationReason",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "description",
               "description": null,
@@ -15514,6 +15772,58 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "creationActivity",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "CreateFeatureActivity",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "deprecated",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Boolean",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "deprecationActivity",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "DeprecateFeatureActivity",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "deprecationReason",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "ENUM",
+                "name": "FeatureDeprecationReason",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "description",
               "description": null,
@@ -16162,6 +16472,35 @@
           "enumValues": null,
           "possibleTypes": null
         },
+        {
+          "kind": "ENUM",
+          "name": "FeatureDeprecationReason",
+          "description": null,
+          "fields": null,
+          "inputFields": null,
+          "interfaces": null,
+          "enumValues": [
+            {
+              "name": "DUPLICATE",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "INVALID",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "OTHER",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "possibleTypes": null
+        },
         {
           "kind": "UNION",
           "name": "FeatureInstance",
@@ -17799,6 +18138,58 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "creationActivity",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "CreateFeatureActivity",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "deprecated",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Boolean",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "deprecationActivity",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "DeprecateFeatureActivity",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "deprecationReason",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "ENUM",
+                "name": "FeatureDeprecationReason",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "description",
               "description": null,
@@ -23384,6 +23775,35 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "deprecateFeature",
+              "description": "Deprecate a feature to prevent it from being used in the future and implicitly deprecate all the variants and molecular profiles linked to this feature.",
+              "args": [
+                {
+                  "name": "input",
+                  "description": "Parameters for DeprecateFeature",
+                  "type": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "INPUT_OBJECT",
+                      "name": "DeprecateFeatureInput",
+                      "ofType": null
+                    }
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                }
+              ],
+              "type": {
+                "kind": "OBJECT",
+                "name": "DeprecateFeaturePayload",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "deprecateVariant",
               "description": "Deprecate a variant to prevent it from being used in the future and implicitly deprecate all the molecular profiles linked to this variant.",
@@ -43814,6 +44234,12 @@
               "description": null,
               "isDeprecated": false,
               "deprecationReason": null
+            },
+            {
+              "name": "FEATURE_DEPRECATED",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
             }
           ],
           "possibleTypes": null
diff --git a/server/app/graphql/mutations/deprecate_feature.rb b/server/app/graphql/mutations/deprecate_feature.rb
new file mode 100644
index 000000000..8264abb7c
--- /dev/null
+++ b/server/app/graphql/mutations/deprecate_feature.rb
@@ -0,0 +1,86 @@
+class Mutations::DeprecateFeature < Mutations::MutationWithOrg
+  description 'Deprecate a feature to prevent it from being used in the future and implicitly deprecate all the variants and molecular profiles linked to this feature.'
+
+  argument :feature_id, Int,
+    required: true,
+    description: 'The CIViC ID of the feature to deprecate.'
+
+  argument :deprecation_reason, Types::FeatureDeprecationReasonType,
+    required: true,
+    description: "The reason for deprecation this feature."
+
+  argument :comment, String, required: true,
+    validates: { length: { minimum: 10 } },
+    description: 'Text giving more context for deprecation this feature.'
+
+  field :feature, Types::Entities::FeatureType, null: true,
+    description: 'The deprecated Feature.'
+
+  field :newly_deprecated_variants, [Types::Entities::VariantType], null: true,
+    description: 'The variants linked to this feature that are newly deprecated.'
+
+  field :newly_deprecated_molecular_profiles, [Types::Entities::MolecularProfileType], null: true,
+    description: 'The molecular profiles linked to this feature\'s variants that weren\'t already deprecated and have been newly deprecated by running this mutation.'
+
+  attr_reader :feature
+
+  def ready?(organization_id: nil, feature_id:, **kwargs)
+    validate_user_logged_in
+    validate_user_org(organization_id)
+
+    @feature = Feature.find_by(id: feature_id)
+    if feature.blank?
+      raise GraphQL::ExecutionError, "Feature with id #{feature_id} doesn't exist."
+    end
+
+    if feature.deprecated
+      raise GraphQL::ExecutionError, "Feature is already deprecated."
+    end
+
+    mps_with_eids = []
+    feature.variants.includes(:molecular_profiles).flat_map(&:molecular_profiles).each do |mp|
+      if mp.evidence_items.where("evidence_items.status != 'rejected'").count > 0
+        mps_with_eids.append(mp.id)
+      end
+    end
+    if mps_with_eids.size > 0
+      raise GraphQL::ExecutionError, "Feature is linked to Variants that belong to Molecular Profiles with accepted or submitted Evidence Items: #{mps_with_eids.join(', ')}. Move their Evidence Items to a different Molecular Profile and try again."
+    end
+
+    return true
+  end
+
+  def authorized?(organization_id: nil, **kwargs)
+    current_user = context[:current_user]
+
+    validate_user_acting_as_org(user: current_user, organization_id: organization_id)
+
+    if !Role.user_is_at_least_a?(current_user, :editor)
+      raise GraphQL::ExecutionError, 'User must be an editor in order to deprecate Features.'
+    end
+
+    return true
+  end
+
+  def resolve(organization_id: nil, deprecation_reason:, comment:, **kwargs)
+    cmd = Activities::DeprecateFeature.new(
+      deprecating_user: context[:current_user],
+      feature: feature,
+      organization_id: organization_id,
+      deprecation_reason: deprecation_reason,
+      note: comment
+    )
+
+    res = cmd.perform
+
+    if res.succeeded?
+      {
+        feature: feature,
+        newly_deprecated_molecular_profiles: res.newly_deprecated_molecular_profiles,
+        newly_deprecated_variants: res.newly_deprecated_variants
+      }
+    else
+      raise GraphQL::ExecutionError, res.errors.join(', ')
+    end
+  end
+end
diff --git a/server/app/graphql/types/activities/deprecate_feature_activity_type.rb b/server/app/graphql/types/activities/deprecate_feature_activity_type.rb
index fa27dce21..91671135d 100644
--- a/server/app/graphql/types/activities/deprecate_feature_activity_type.rb
+++ b/server/app/graphql/types/activities/deprecate_feature_activity_type.rb
@@ -1,5 +1,16 @@
 module Types::Activities
   class DeprecateFeatureActivityType < Types::BaseObject
     implements Types::Interfaces::ActivityInterface
+
+    field :molecular_profiles, [Types::Entities::MolecularProfileType], null: false
+    field :variants, [Types::Entities::VariantType], null: false
+
+    def molecular_profiles
+      Loaders::AssociationLoader.for(DeprecateFeatureActivity, :linked_molecular_profiles).load(object)
+    end
+
+    def variants
+      Loaders::AssociationLoader.for(DeprecateFeatureActivity, :linked_variants).load(object)
+    end
   end
 end
diff --git a/server/app/graphql/types/entities/feature_type.rb b/server/app/graphql/types/entities/feature_type.rb
index 1e759f18d..1fe7fe8fa 100644
--- a/server/app/graphql/types/entities/feature_type.rb
+++ b/server/app/graphql/types/entities/feature_type.rb
@@ -17,6 +17,10 @@ class FeatureType < Types::BaseObject
     field :variants, resolver: Resolvers::Variants
     field :link, String, null: false
     field :feature_instance, Types::FeatureInstanceType, null: false
+    field :deprecation_activity, Types::Activities::DeprecateFeatureActivityType, null: true
+    field :deprecated, Boolean, null: false
+    field :deprecation_reason, Types::FeatureDeprecationReasonType, null: true
+    field :creation_activity, Types::Activities::CreateFeatureActivityType, null: true
 
     def id
       object.id
diff --git a/server/app/graphql/types/feature_deprecation_reason_type.rb b/server/app/graphql/types/feature_deprecation_reason_type.rb
new file mode 100644
index 000000000..250423967
--- /dev/null
+++ b/server/app/graphql/types/feature_deprecation_reason_type.rb
@@ -0,0 +1,7 @@
+module Types
+  class FeatureDeprecationReasonType < Types::BaseEnum
+    value 'DUPLICATE', value: 'duplicate'
+    value 'INVALID', value: 'invalid_feature'
+    value 'OTHER', value: 'other'
+  end
+end
diff --git a/server/app/graphql/types/mutation_type.rb b/server/app/graphql/types/mutation_type.rb
index 24fb0eb68..d8d1aeaa9 100644
--- a/server/app/graphql/types/mutation_type.rb
+++ b/server/app/graphql/types/mutation_type.rb
@@ -23,6 +23,7 @@ class MutationType < Types::BaseObject
     field :resolve_flag, mutation: Mutations::ResolveFlag
 
     #deprecation
+    field :deprecate_feature, mutation: Mutations::DeprecateFeature
     field :deprecate_variant, mutation: Mutations::DeprecateVariant
     field :deprecate_complex_molecular_profile, mutation: Mutations::DeprecateComplexMolecularProfile
 
diff --git a/server/app/graphql/types/variant_deprecation_reason_type.rb b/server/app/graphql/types/variant_deprecation_reason_type.rb
index 40f76c1a2..0c3df974e 100644
--- a/server/app/graphql/types/variant_deprecation_reason_type.rb
+++ b/server/app/graphql/types/variant_deprecation_reason_type.rb
@@ -3,5 +3,6 @@ class VariantDeprecationReasonType < Types::BaseEnum
     value 'DUPLICATE', value: 'duplicate'
     value 'INVALID', value: 'invalid_variant'
     value 'OTHER', value: 'other'
+    value 'FEATURE_DEPRECATED', value: 'feature_deprecated'
   end
 end
diff --git a/server/app/models/actions/deprecate_feature.rb b/server/app/models/actions/deprecate_feature.rb
new file mode 100644
index 000000000..5d2748a62
--- /dev/null
+++ b/server/app/models/actions/deprecate_feature.rb
@@ -0,0 +1,60 @@
+module Actions
+  class DeprecateFeature
+    include Actions::Transactional
+
+    attr_reader :deprecating_user, :feature, :newly_deprecated_variants, :organization_id, :deprecation_reason, :newly_deprecated_molecular_profiles
+
+    def initialize(deprecating_user:, feature:, organization_id: nil, deprecation_reason:)
+      @deprecating_user = deprecating_user
+      @feature = feature
+      @organization_id = organization_id
+      @deprecation_reason = deprecation_reason
+      @newly_deprecated_molecular_profiles = []
+      @newly_deprecated_variants = []
+    end
+
+    private
+    def execute
+      mark_feature_as_deprecated
+      mark_variants_as_deprecated
+      create_events
+    end
+
+    def mark_feature_as_deprecated
+      feature.deprecated = true
+      feature.deprecation_reason = deprecation_reason
+      feature.save!(validate: false)
+    end
+
+    def mark_variants_as_deprecated
+      Variant.where(feature: feature, deprecated: false).each do |variant|
+        cmd = Actions::DeprecateVariant.new(
+          deprecating_user: deprecating_user,
+          variant: variant,
+          organization_id: organization_id,
+          deprecation_reason: 'feature_deprecated'
+        )
+        cmd.perform
+
+        if !cmd.succeeded?
+          raise StandardError.new(cmd.errors.join(', '))
+        end
+
+        newly_deprecated_variants << cmd.variant
+        @newly_deprecated_molecular_profiles += cmd.newly_deprecated_molecular_profiles
+        events << cmd.events
+      end
+    end
+
+    def create_events
+      events << Event.new(
+        action: 'deprecated feature',
+        originating_user: deprecating_user,
+        subject: feature,
+        originating_object: feature,
+        organization_id: organization_id,
+      )
+    end
+  end
+end
+
diff --git a/server/app/models/activities/deprecate_feature.rb b/server/app/models/activities/deprecate_feature.rb
new file mode 100644
index 000000000..487dae537
--- /dev/null
+++ b/server/app/models/activities/deprecate_feature.rb
@@ -0,0 +1,41 @@
+module Activities
+  class DeprecateFeature < Base
+    attr_reader :feature, :newly_deprecated_molecular_profiles, :newly_deprecated_variants, :deprecation_reason
+
+    def initialize(deprecating_user: , feature:, organization_id: nil, deprecation_reason:, note:)
+      super(organization_id: organization_id, user: deprecating_user, note: note)
+      @feature = feature
+      @deprecation_reason = deprecation_reason
+    end
+
+    private
+    def create_activity
+      @activity = DeprecateFeatureActivity.create!(
+        subject: feature,
+        user: user,
+        organization: organization,
+        note: note
+      )
+    end
+
+    def call_actions
+      cmd = Actions::DeprecateFeature.new(
+        deprecating_user: user,
+        feature: feature,
+        organization_id: organization&.id,
+        deprecation_reason: deprecation_reason
+      )
+      cmd.perform
+      if !cmd.succeeded?
+        raise StandardError.new(cmd.errors.join(', '))
+      end
+      events << cmd.events
+      @newly_deprecated_molecular_profiles = cmd.newly_deprecated_molecular_profiles
+      @newly_deprecated_variants = cmd.newly_deprecated_variants
+    end
+
+    def linked_entities
+      newly_deprecated_molecular_profiles + newly_deprecated_variants
+    end
+  end
+end
diff --git a/server/app/models/deprecate_feature_activity.rb b/server/app/models/deprecate_feature_activity.rb
index 4b87eeaf0..439ad0674 100644
--- a/server/app/models/deprecate_feature_activity.rb
+++ b/server/app/models/deprecate_feature_activity.rb
@@ -1,4 +1,6 @@
 class DeprecateFeatureActivity < Activity
+  has_many_linked :molecular_profiles
+  has_many_linked :variants
 
   def feature
     self.subject
diff --git a/server/app/models/feature.rb b/server/app/models/feature.rb
index 98a6d5ee9..828a7f08c 100644
--- a/server/app/models/feature.rb
+++ b/server/app/models/feature.rb
@@ -9,6 +9,18 @@ class Feature < ApplicationRecord
   has_and_belongs_to_many :feature_aliases, class_name: 'Features::FeatureAlias'
   has_and_belongs_to_many :sources
 
+  has_one :deprecation_activity,
+    as: :subject,
+    class_name: 'DeprecateFeatureActivity'
+  has_one :deprecating_user, through: :deprecation_activity, source: :user
+
+  has_one :creation_activity,
+    as: :subject,
+    class_name: 'CreateFeatureActivity'
+  has_one :creating_user, through: :creation_activity, source: :user
+
+  enum deprecation_reason: ['duplicate', 'invalid_feature', 'other']
+
   has_many :variants
 
   searchkick highlight: [:name, :aliases, :feature_type], callbacks: :async
diff --git a/server/app/models/variant.rb b/server/app/models/variant.rb
index 604a0927f..4dc7490d9 100644
--- a/server/app/models/variant.rb
+++ b/server/app/models/variant.rb
@@ -33,7 +33,7 @@ class Variant < ApplicationRecord
   has_one :creating_user, through: :creation_activity, source: :user
 
   enum reference_build: [:GRCh38, :GRCh37, :NCBI36]
-  enum deprecation_reason: ['duplicate', 'invalid_variant', 'other']
+  enum deprecation_reason: ['duplicate', 'invalid_variant', 'other', 'feature_deprecated']
 
   has_many :activities_linked_entities,
     ->() { where(entity_type: 'Variant') },
diff --git a/server/db/migrate/20240201182724_add_deprecated_to_features.rb b/server/db/migrate/20240201182724_add_deprecated_to_features.rb
new file mode 100644
index 000000000..02dee496e
--- /dev/null
+++ b/server/db/migrate/20240201182724_add_deprecated_to_features.rb
@@ -0,0 +1,6 @@
+class AddDeprecatedToFeatures < ActiveRecord::Migration[6.1]
+  def change
+    add_column :features, :deprecated, :boolean, null: false, index: true, default: false
+    add_column :features, :deprecation_reason, :integer
+  end
+end
diff --git a/server/db/schema.rb b/server/db/schema.rb
index 07480eb92..8323bca56 100644
--- a/server/db/schema.rb
+++ b/server/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2024_02_01_173057) do
+ActiveRecord::Schema.define(version: 2024_02_01_182724) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -472,6 +472,8 @@
     t.bigint "feature_instance_id", null: false
     t.boolean "flagged", default: false, null: false
     t.text "full_name"
+    t.boolean "deprecated", default: false, null: false
+    t.integer "deprecation_reason"
     t.index ["feature_instance_type", "feature_instance_id"], name: "index_features_on_feature_instance"
   end
 

From 7573eae05c2039be035187592f559f339111b9ad Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Fri, 2 Feb 2024 10:18:36 -0600
Subject: [PATCH 083/125] feature deprecation events show on event feed
 correctly

---
 .../events/event-feed/event-feed.gql          |   6 +
 .../src/app/core/pipes/event-verbiage-pipe.ts |  72 ++++++----
 .../pipes/icon-name-for-event-action-pipe.ts  |   4 +
 .../src/app/generated/civic.apollo-helpers.ts |  47 ++++++-
 client/src/app/generated/civic.apollo.ts      | 130 ++++++++++++++++--
 .../src/app/generated/civic.possible-types.ts |   3 +
 client/src/app/generated/server.model.graphql |   6 +-
 client/src/app/generated/server.schema.json   |  30 ++++
 .../graphql/types/entities/feature_type.rb    |   1 +
 9 files changed, 257 insertions(+), 42 deletions(-)

diff --git a/client/src/app/components/events/event-feed/event-feed.gql b/client/src/app/components/events/event-feed/event-feed.gql
index 513a7ac11..f3dab3438 100644
--- a/client/src/app/components/events/event-feed/event-feed.gql
+++ b/client/src/app/components/events/event-feed/event-feed.gql
@@ -123,6 +123,12 @@ fragment eventFeedNode on Event {
         name
       }
     }
+    ... on Feature {
+      deprecated
+      id
+      link
+      name
+    }
     ... on MolecularProfile {
       deprecated
     }
diff --git a/client/src/app/core/pipes/event-verbiage-pipe.ts b/client/src/app/core/pipes/event-verbiage-pipe.ts
index f409c474c..65f884dc5 100644
--- a/client/src/app/core/pipes/event-verbiage-pipe.ts
+++ b/client/src/app/core/pipes/event-verbiage-pipe.ts
@@ -32,9 +32,9 @@ export class EventVerbiagePipe implements PipeTransform {
         return 'accepted revision'
       case EventAction.RevisionRejected:
         return 'rejected revision'
-      case (EventAction.RevisionSuperseded):
+      case EventAction.RevisionSuperseded:
         return 'closed revision'
-      case (EventAction.Flagged):
+      case EventAction.Flagged:
         return 'opened new flag'
       case EventAction.FlagResolved:
         return 'resolved flag'
@@ -64,11 +64,15 @@ export class EventVerbiagePipe implements PipeTransform {
         return 'reverted assertion'
       case EventAction.DeprecatedVariant:
         return 'deprecated variant'
+      case EventAction.DeprecatedFeature:
+        return 'deprecated feature'
       case EventAction.DeprecatedMolecularProfile:
         return 'deprecated molecular profile'
-      case(EventAction.VariantCreated):
+      case EventAction.VariantCreated:
         return 'created variant'
-      case(EventAction.ComplexMolecularProfileCreated):
+      case EventAction.FeatureCreated:
+        return 'created feature'
+      case EventAction.ComplexMolecularProfileCreated:
         return 'created complex molecular profile'
       default:
         return a
@@ -85,9 +89,9 @@ export class EventVerbiagePipe implements PipeTransform {
         return 'revision accepted'
       case EventAction.RevisionRejected:
         return 'revision rejected'
-      case (EventAction.RevisionSuperseded):
+      case EventAction.RevisionSuperseded:
         return 'revision closed'
-      case (EventAction.Flagged):
+      case EventAction.Flagged:
         return 'flag opened'
       case EventAction.FlagResolved:
         return 'flag resolved'
@@ -119,9 +123,9 @@ export class EventVerbiagePipe implements PipeTransform {
         return 'variant deprecated'
       case EventAction.DeprecatedMolecularProfile:
         return 'molecular profile deprecated'
-      case(EventAction.VariantCreated):
+      case EventAction.VariantCreated:
         return 'variant created'
-      case(EventAction.ComplexMolecularProfileCreated):
+      case EventAction.ComplexMolecularProfileCreated:
         return 'complex molecular profile created'
       default:
         return a
@@ -130,21 +134,35 @@ export class EventVerbiagePipe implements PipeTransform {
 
   private contributorVerbiage(a: EventAction, count: Maybe<number>): string {
     switch (a) {
-      case (EventAction.Commented):
-        return (count == 1) ? 'left a comment on this entity' : `left ${count} comments on this entity`
-      case (EventAction.RevisionSuggested):
-        return (count == 1) ? 'suggested a revision to this entity' : `suggested ${count} revisions on this entity`
-      case (EventAction.RevisionAccepted):
-        return (count == 1) ? 'accepted a revision to this entity' : `accepted ${count} revisions on this entity`
-      case (EventAction.RevisionRejected):
-        return (count == 1) ? 'rejected a revision to this entity' : `rejected ${count} revisions on this entity`
-      case (EventAction.RevisionSuperseded):
-        return (count == 1) ? 'closed a revision to this entity' : `closed ${count} revisions on this entity`
-      case (EventAction.Flagged):
-        return (count == 1) ? 'opened new flag on this entity' : `opened ${count} new flags on this entity`
-      case (EventAction.FlagResolved):
-        return (count == 1) ? 'resolved a flag on this entity' : `resolved ${count} flags on this entity`
-      case (EventAction.AssertionSubmitted):
+      case EventAction.Commented:
+        return count == 1
+          ? 'left a comment on this entity'
+          : `left ${count} comments on this entity`
+      case EventAction.RevisionSuggested:
+        return count == 1
+          ? 'suggested a revision to this entity'
+          : `suggested ${count} revisions on this entity`
+      case EventAction.RevisionAccepted:
+        return count == 1
+          ? 'accepted a revision to this entity'
+          : `accepted ${count} revisions on this entity`
+      case EventAction.RevisionRejected:
+        return count == 1
+          ? 'rejected a revision to this entity'
+          : `rejected ${count} revisions on this entity`
+      case EventAction.RevisionSuperseded:
+        return count == 1
+          ? 'closed a revision to this entity'
+          : `closed ${count} revisions on this entity`
+      case EventAction.Flagged:
+        return count == 1
+          ? 'opened new flag on this entity'
+          : `opened ${count} new flags on this entity`
+      case EventAction.FlagResolved:
+        return count == 1
+          ? 'resolved a flag on this entity'
+          : `resolved ${count} flags on this entity`
+      case EventAction.AssertionSubmitted:
         return 'submitted this assertion'
       case EventAction.AssertionAccepted:
         return 'accepted this assertion'
@@ -172,9 +190,13 @@ export class EventVerbiagePipe implements PipeTransform {
         return 'deprecated this variant'
       case EventAction.DeprecatedMolecularProfile:
         return 'deprecated this molecular profile'
-      case(EventAction.VariantCreated):
+      case EventAction.DeprecatedFeature:
+        return 'deprecated this feature'
+      case EventAction.FeatureCreated:
+        return 'created this feature'
+      case EventAction.VariantCreated:
         return 'created this variant'
-      case(EventAction.ComplexMolecularProfileCreated):
+      case EventAction.ComplexMolecularProfileCreated:
         return 'created this complex molecular profile'
       default:
         return a
diff --git a/client/src/app/core/pipes/icon-name-for-event-action-pipe.ts b/client/src/app/core/pipes/icon-name-for-event-action-pipe.ts
index 6c384e28b..0bd2015b8 100644
--- a/client/src/app/core/pipes/icon-name-for-event-action-pipe.ts
+++ b/client/src/app/core/pipes/icon-name-for-event-action-pipe.ts
@@ -48,6 +48,10 @@ export class IconNameForEventActionPipe implements PipeTransform {
         return 'civic-assertion'
       case EventAction.DeprecatedVariant:
         return 'civic-variant'
+      case EventAction.DeprecatedFeature:
+        return 'civic-feature'
+      case EventAction.FeatureCreated:
+        return 'civic-feature'
       case EventAction.DeprecatedMolecularProfile:
         return 'civic-molecularprofile'
       case EventAction.ComplexMolecularProfileCreated:
diff --git a/client/src/app/generated/civic.apollo-helpers.ts b/client/src/app/generated/civic.apollo-helpers.ts
index 827eeb8c1..cae7075d5 100644
--- a/client/src/app/generated/civic.apollo-helpers.ts
+++ b/client/src/app/generated/civic.apollo-helpers.ts
@@ -572,6 +572,12 @@ export type CreateFeatureActivityFieldPolicy = {
 	user?: FieldPolicy<any> | FieldReadFunction<any>,
 	verbiage?: FieldPolicy<any> | FieldReadFunction<any>
 };
+export type CreateFeaturePayloadKeySpecifier = ('clientMutationId' | 'feature' | 'new' | CreateFeaturePayloadKeySpecifier)[];
+export type CreateFeaturePayloadFieldPolicy = {
+	clientMutationId?: FieldPolicy<any> | FieldReadFunction<any>,
+	feature?: FieldPolicy<any> | FieldReadFunction<any>,
+	new?: FieldPolicy<any> | FieldReadFunction<any>
+};
 export type CreateMolecularProfilePayloadKeySpecifier = ('clientMutationId' | 'molecularProfile' | CreateMolecularProfilePayloadKeySpecifier)[];
 export type CreateMolecularProfilePayloadFieldPolicy = {
 	clientMutationId?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -626,18 +632,27 @@ export type DeprecateComplexMolecularProfilePayloadFieldPolicy = {
 	clientMutationId?: FieldPolicy<any> | FieldReadFunction<any>,
 	molecularProfile?: FieldPolicy<any> | FieldReadFunction<any>
 };
-export type DeprecateFeatureActivityKeySpecifier = ('createdAt' | 'events' | 'id' | 'note' | 'organization' | 'parsedNote' | 'subject' | 'user' | 'verbiage' | DeprecateFeatureActivityKeySpecifier)[];
+export type DeprecateFeatureActivityKeySpecifier = ('createdAt' | 'events' | 'id' | 'molecularProfiles' | 'note' | 'organization' | 'parsedNote' | 'subject' | 'user' | 'variants' | 'verbiage' | DeprecateFeatureActivityKeySpecifier)[];
 export type DeprecateFeatureActivityFieldPolicy = {
 	createdAt?: FieldPolicy<any> | FieldReadFunction<any>,
 	events?: FieldPolicy<any> | FieldReadFunction<any>,
 	id?: FieldPolicy<any> | FieldReadFunction<any>,
+	molecularProfiles?: FieldPolicy<any> | FieldReadFunction<any>,
 	note?: FieldPolicy<any> | FieldReadFunction<any>,
 	organization?: FieldPolicy<any> | FieldReadFunction<any>,
 	parsedNote?: FieldPolicy<any> | FieldReadFunction<any>,
 	subject?: FieldPolicy<any> | FieldReadFunction<any>,
 	user?: FieldPolicy<any> | FieldReadFunction<any>,
+	variants?: FieldPolicy<any> | FieldReadFunction<any>,
 	verbiage?: FieldPolicy<any> | FieldReadFunction<any>
 };
+export type DeprecateFeaturePayloadKeySpecifier = ('clientMutationId' | 'feature' | 'newlyDeprecatedMolecularProfiles' | 'newlyDeprecatedVariants' | DeprecateFeaturePayloadKeySpecifier)[];
+export type DeprecateFeaturePayloadFieldPolicy = {
+	clientMutationId?: FieldPolicy<any> | FieldReadFunction<any>,
+	feature?: FieldPolicy<any> | FieldReadFunction<any>,
+	newlyDeprecatedMolecularProfiles?: FieldPolicy<any> | FieldReadFunction<any>,
+	newlyDeprecatedVariants?: FieldPolicy<any> | FieldReadFunction<any>
+};
 export type DeprecateVariantActivityKeySpecifier = ('createdAt' | 'events' | 'id' | 'molecularProfiles' | 'note' | 'organization' | 'parsedNote' | 'subject' | 'user' | 'verbiage' | DeprecateVariantActivityKeySpecifier)[];
 export type DeprecateVariantActivityFieldPolicy = {
 	createdAt?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -801,9 +816,13 @@ export type EvidenceItemsByTypeFieldPolicy = {
 	predisposingCount?: FieldPolicy<any> | FieldReadFunction<any>,
 	prognosticCount?: FieldPolicy<any> | FieldReadFunction<any>
 };
-export type FactorKeySpecifier = ('comments' | 'description' | 'events' | 'featureAliases' | 'featureInstance' | 'flagged' | 'flags' | 'fullName' | 'id' | 'lastAcceptedRevisionEvent' | 'lastCommentEvent' | 'lastSubmittedRevisionEvent' | 'link' | 'name' | 'ncitDetails' | 'ncitId' | 'revisions' | 'sources' | 'variants' | FactorKeySpecifier)[];
+export type FactorKeySpecifier = ('comments' | 'creationActivity' | 'deprecated' | 'deprecationActivity' | 'deprecationReason' | 'description' | 'events' | 'featureAliases' | 'featureInstance' | 'flagged' | 'flags' | 'fullName' | 'id' | 'lastAcceptedRevisionEvent' | 'lastCommentEvent' | 'lastSubmittedRevisionEvent' | 'link' | 'name' | 'ncitDetails' | 'ncitId' | 'revisions' | 'sources' | 'variants' | FactorKeySpecifier)[];
 export type FactorFieldPolicy = {
 	comments?: FieldPolicy<any> | FieldReadFunction<any>,
+	creationActivity?: FieldPolicy<any> | FieldReadFunction<any>,
+	deprecated?: FieldPolicy<any> | FieldReadFunction<any>,
+	deprecationActivity?: FieldPolicy<any> | FieldReadFunction<any>,
+	deprecationReason?: FieldPolicy<any> | FieldReadFunction<any>,
 	description?: FieldPolicy<any> | FieldReadFunction<any>,
 	events?: FieldPolicy<any> | FieldReadFunction<any>,
 	featureAliases?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -828,9 +847,13 @@ export type FdaCodeFieldPolicy = {
 	code?: FieldPolicy<any> | FieldReadFunction<any>,
 	description?: FieldPolicy<any> | FieldReadFunction<any>
 };
-export type FeatureKeySpecifier = ('comments' | 'description' | 'events' | 'featureAliases' | 'featureInstance' | 'flagged' | 'flags' | 'fullName' | 'id' | 'lastAcceptedRevisionEvent' | 'lastCommentEvent' | 'lastSubmittedRevisionEvent' | 'link' | 'name' | 'revisions' | 'sources' | 'variants' | FeatureKeySpecifier)[];
+export type FeatureKeySpecifier = ('comments' | 'creationActivity' | 'deprecated' | 'deprecationActivity' | 'deprecationReason' | 'description' | 'events' | 'featureAliases' | 'featureInstance' | 'flagged' | 'flags' | 'fullName' | 'id' | 'lastAcceptedRevisionEvent' | 'lastCommentEvent' | 'lastSubmittedRevisionEvent' | 'link' | 'name' | 'revisions' | 'sources' | 'variants' | FeatureKeySpecifier)[];
 export type FeatureFieldPolicy = {
 	comments?: FieldPolicy<any> | FieldReadFunction<any>,
+	creationActivity?: FieldPolicy<any> | FieldReadFunction<any>,
+	deprecated?: FieldPolicy<any> | FieldReadFunction<any>,
+	deprecationActivity?: FieldPolicy<any> | FieldReadFunction<any>,
+	deprecationReason?: FieldPolicy<any> | FieldReadFunction<any>,
 	description?: FieldPolicy<any> | FieldReadFunction<any>,
 	events?: FieldPolicy<any> | FieldReadFunction<any>,
 	featureAliases?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -916,9 +939,13 @@ export type FlaggableFieldPolicy = {
 	link?: FieldPolicy<any> | FieldReadFunction<any>,
 	name?: FieldPolicy<any> | FieldReadFunction<any>
 };
-export type GeneKeySpecifier = ('comments' | 'description' | 'entrezId' | 'events' | 'featureAliases' | 'featureInstance' | 'flagged' | 'flags' | 'fullName' | 'id' | 'lastAcceptedRevisionEvent' | 'lastCommentEvent' | 'lastSubmittedRevisionEvent' | 'link' | 'myGeneInfoDetails' | 'name' | 'revisions' | 'sources' | 'variants' | GeneKeySpecifier)[];
+export type GeneKeySpecifier = ('comments' | 'creationActivity' | 'deprecated' | 'deprecationActivity' | 'deprecationReason' | 'description' | 'entrezId' | 'events' | 'featureAliases' | 'featureInstance' | 'flagged' | 'flags' | 'fullName' | 'id' | 'lastAcceptedRevisionEvent' | 'lastCommentEvent' | 'lastSubmittedRevisionEvent' | 'link' | 'myGeneInfoDetails' | 'name' | 'revisions' | 'sources' | 'variants' | GeneKeySpecifier)[];
 export type GeneFieldPolicy = {
 	comments?: FieldPolicy<any> | FieldReadFunction<any>,
+	creationActivity?: FieldPolicy<any> | FieldReadFunction<any>,
+	deprecated?: FieldPolicy<any> | FieldReadFunction<any>,
+	deprecationActivity?: FieldPolicy<any> | FieldReadFunction<any>,
+	deprecationReason?: FieldPolicy<any> | FieldReadFunction<any>,
 	description?: FieldPolicy<any> | FieldReadFunction<any>,
 	entrezId?: FieldPolicy<any> | FieldReadFunction<any>,
 	events?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -1182,16 +1209,18 @@ export type MolecularProfileTextSegmentKeySpecifier = ('text' | MolecularProfile
 export type MolecularProfileTextSegmentFieldPolicy = {
 	text?: FieldPolicy<any> | FieldReadFunction<any>
 };
-export type MutationKeySpecifier = ('acceptRevisions' | 'addComment' | 'addDisease' | 'addRemoteCitation' | 'addTherapy' | 'createMolecularProfile' | 'createVariant' | 'deprecateComplexMolecularProfile' | 'deprecateVariant' | 'editUser' | 'flagEntity' | 'moderateAssertion' | 'moderateEvidenceItem' | 'rejectRevisions' | 'resolveFlag' | 'submitAssertion' | 'submitEvidence' | 'submitVariantGroup' | 'subscribe' | 'suggestAssertionRevision' | 'suggestEvidenceItemRevision' | 'suggestGeneRevision' | 'suggestMolecularProfileRevision' | 'suggestSource' | 'suggestVariantGroupRevision' | 'suggestVariantRevision' | 'unsubscribe' | 'updateCoi' | 'updateNotificationStatus' | 'updateSourceSuggestionStatus' | MutationKeySpecifier)[];
+export type MutationKeySpecifier = ('acceptRevisions' | 'addComment' | 'addDisease' | 'addRemoteCitation' | 'addTherapy' | 'createFeature' | 'createMolecularProfile' | 'createVariant' | 'deprecateComplexMolecularProfile' | 'deprecateFeature' | 'deprecateVariant' | 'editUser' | 'flagEntity' | 'moderateAssertion' | 'moderateEvidenceItem' | 'rejectRevisions' | 'resolveFlag' | 'submitAssertion' | 'submitEvidence' | 'submitVariantGroup' | 'subscribe' | 'suggestAssertionRevision' | 'suggestEvidenceItemRevision' | 'suggestGeneRevision' | 'suggestMolecularProfileRevision' | 'suggestSource' | 'suggestVariantGroupRevision' | 'suggestVariantRevision' | 'unsubscribe' | 'updateCoi' | 'updateNotificationStatus' | 'updateSourceSuggestionStatus' | MutationKeySpecifier)[];
 export type MutationFieldPolicy = {
 	acceptRevisions?: FieldPolicy<any> | FieldReadFunction<any>,
 	addComment?: FieldPolicy<any> | FieldReadFunction<any>,
 	addDisease?: FieldPolicy<any> | FieldReadFunction<any>,
 	addRemoteCitation?: FieldPolicy<any> | FieldReadFunction<any>,
 	addTherapy?: FieldPolicy<any> | FieldReadFunction<any>,
+	createFeature?: FieldPolicy<any> | FieldReadFunction<any>,
 	createMolecularProfile?: FieldPolicy<any> | FieldReadFunction<any>,
 	createVariant?: FieldPolicy<any> | FieldReadFunction<any>,
 	deprecateComplexMolecularProfile?: FieldPolicy<any> | FieldReadFunction<any>,
+	deprecateFeature?: FieldPolicy<any> | FieldReadFunction<any>,
 	deprecateVariant?: FieldPolicy<any> | FieldReadFunction<any>,
 	editUser?: FieldPolicy<any> | FieldReadFunction<any>,
 	flagEntity?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -2343,6 +2372,10 @@ export type StrictTypedTypePolicies = {
 		keyFields?: false | CreateFeatureActivityKeySpecifier | (() => undefined | CreateFeatureActivityKeySpecifier),
 		fields?: CreateFeatureActivityFieldPolicy,
 	},
+	CreateFeaturePayload?: Omit<TypePolicy, "fields" | "keyFields"> & {
+		keyFields?: false | CreateFeaturePayloadKeySpecifier | (() => undefined | CreateFeaturePayloadKeySpecifier),
+		fields?: CreateFeaturePayloadFieldPolicy,
+	},
 	CreateMolecularProfilePayload?: Omit<TypePolicy, "fields" | "keyFields"> & {
 		keyFields?: false | CreateMolecularProfilePayloadKeySpecifier | (() => undefined | CreateMolecularProfilePayloadKeySpecifier),
 		fields?: CreateMolecularProfilePayloadFieldPolicy,
@@ -2371,6 +2404,10 @@ export type StrictTypedTypePolicies = {
 		keyFields?: false | DeprecateFeatureActivityKeySpecifier | (() => undefined | DeprecateFeatureActivityKeySpecifier),
 		fields?: DeprecateFeatureActivityFieldPolicy,
 	},
+	DeprecateFeaturePayload?: Omit<TypePolicy, "fields" | "keyFields"> & {
+		keyFields?: false | DeprecateFeaturePayloadKeySpecifier | (() => undefined | DeprecateFeaturePayloadKeySpecifier),
+		fields?: DeprecateFeaturePayloadFieldPolicy,
+	},
 	DeprecateVariantActivity?: Omit<TypePolicy, "fields" | "keyFields"> & {
 		keyFields?: false | DeprecateVariantActivityKeySpecifier | (() => undefined | DeprecateVariantActivityKeySpecifier),
 		fields?: DeprecateVariantActivityFieldPolicy,
diff --git a/client/src/app/generated/civic.apollo.ts b/client/src/app/generated/civic.apollo.ts
index b2b5c848c..1401f4b90 100644
--- a/client/src/app/generated/civic.apollo.ts
+++ b/client/src/app/generated/civic.apollo.ts
@@ -1149,6 +1149,34 @@ export type CreateFeatureActivity = ActivityInterface & {
   verbiage: Scalars['String'];
 };
 
+/** Autogenerated input type of CreateFeature */
+export type CreateFeatureInput = {
+  /** A unique identifier for the client performing the mutation. */
+  clientMutationId?: InputMaybe<Scalars['String']>;
+  /** The Type of Feature you are creating */
+  featureType: CreateableFeatureTypes;
+  /** The name of the feature to create. */
+  name: Scalars['String'];
+  /**
+   * The ID of the organization to credit the user's contributions to.
+   * If the user belongs to a single organization or no organizations, this field is not required.
+   * This field is required if the user belongs to more than one organization.
+   * The user must belong to the organization provided.
+   */
+  organizationId?: InputMaybe<Scalars['Int']>;
+};
+
+/** Autogenerated return type of CreateFeature */
+export type CreateFeaturePayload = {
+  __typename: 'CreateFeaturePayload';
+  /** A unique identifier for the client performing the mutation. */
+  clientMutationId?: Maybe<Scalars['String']>;
+  /** The newly created Feature. */
+  feature: Feature;
+  /** True if the feature was newly created. False if the returned variant was already in the database. */
+  new: Scalars['Boolean'];
+};
+
 /** Autogenerated input type of CreateMolecularProfile */
 export type CreateMolecularProfileInput = {
   /** A unique identifier for the client performing the mutation. */
@@ -1217,6 +1245,11 @@ export type CreateVariantPayload = {
   variant: Variant;
 };
 
+/** Enum representing Feature types that can be user-created */
+export enum CreateableFeatureTypes {
+  Factor = 'FACTOR'
+}
+
 export type DataRelease = {
   __typename: 'DataRelease';
   acceptedAndSubmittedVariantsVcf?: Maybe<DownloadableFile>;
@@ -1288,14 +1321,51 @@ export type DeprecateFeatureActivity = ActivityInterface & {
   createdAt: Scalars['ISO8601DateTime'];
   events: Array<Event>;
   id: Scalars['Int'];
+  molecularProfiles: Array<MolecularProfile>;
   note?: Maybe<Scalars['String']>;
   organization?: Maybe<Organization>;
   parsedNote: Array<CommentBodySegment>;
   subject: EventSubject;
   user: User;
+  variants: Array<Variant>;
   verbiage: Scalars['String'];
 };
 
+/** Autogenerated input type of DeprecateFeature */
+export type DeprecateFeatureInput = {
+  /** A unique identifier for the client performing the mutation. */
+  clientMutationId?: InputMaybe<Scalars['String']>;
+  /** Text giving more context for deprecation this feature. */
+  comment: Scalars['String'];
+  /** The reason for deprecation this feature. */
+  deprecationReason: FeatureDeprecationReason;
+  /** The CIViC ID of the feature to deprecate. */
+  featureId: Scalars['Int'];
+  /**
+   * The ID of the organization to credit the user's contributions to.
+   * If the user belongs to a single organization or no organizations, this field is not required.
+   * This field is required if the user belongs to more than one organization.
+   * The user must belong to the organization provided.
+   */
+  organizationId?: InputMaybe<Scalars['Int']>;
+};
+
+/** Autogenerated return type of DeprecateFeature */
+export type DeprecateFeaturePayload = {
+  __typename: 'DeprecateFeaturePayload';
+  /** A unique identifier for the client performing the mutation. */
+  clientMutationId?: Maybe<Scalars['String']>;
+  /** The deprecated Feature. */
+  feature?: Maybe<Feature>;
+  /**
+   * The molecular profiles linked to this feature's variants that weren't already
+   * deprecated and have been newly deprecated by running this mutation.
+   */
+  newlyDeprecatedMolecularProfiles?: Maybe<Array<MolecularProfile>>;
+  /** The variants linked to this feature that are newly deprecated. */
+  newlyDeprecatedVariants?: Maybe<Array<Variant>>;
+};
+
 export type DeprecateVariantActivity = ActivityInterface & {
   __typename: 'DeprecateVariantActivity';
   createdAt: Scalars['ISO8601DateTime'];
@@ -1805,10 +1875,14 @@ export enum EvidenceType {
 }
 
 /** The Feature that a Variant can belong to */
-export type Factor = Commentable & EventSubject & Flaggable & MolecularProfileComponent & WithRevisions & {
+export type Factor = Commentable & EventOriginObject & EventSubject & Flaggable & MolecularProfileComponent & WithRevisions & {
   __typename: 'Factor';
   /** List and filter comments. */
   comments: CommentConnection;
+  creationActivity?: Maybe<CreateFeatureActivity>;
+  deprecated: Scalars['Boolean'];
+  deprecationActivity?: Maybe<DeprecateFeatureActivity>;
+  deprecationReason?: Maybe<FeatureDeprecationReason>;
   description?: Maybe<Scalars['String']>;
   /** List and filter events for an object */
   events: EventConnection;
@@ -1904,10 +1978,14 @@ export type FdaCode = {
 };
 
 /** The Feature that a Variant can belong to */
-export type Feature = Commentable & EventSubject & Flaggable & MolecularProfileComponent & WithRevisions & {
+export type Feature = Commentable & EventOriginObject & EventSubject & Flaggable & MolecularProfileComponent & WithRevisions & {
   __typename: 'Feature';
   /** List and filter comments. */
   comments: CommentConnection;
+  creationActivity?: Maybe<CreateFeatureActivity>;
+  deprecated: Scalars['Boolean'];
+  deprecationActivity?: Maybe<DeprecateFeatureActivity>;
+  deprecationReason?: Maybe<FeatureDeprecationReason>;
   description?: Maybe<Scalars['String']>;
   /** List and filter events for an object */
   events: EventConnection;
@@ -1994,6 +2072,12 @@ export type FeatureVariantsArgs = {
   name?: InputMaybe<Scalars['String']>;
 };
 
+export enum FeatureDeprecationReason {
+  Duplicate = 'DUPLICATE',
+  Invalid = 'INVALID',
+  Other = 'OTHER'
+}
+
 /** The specific type of a feature instance */
 export type FeatureInstance = Factor | Gene;
 
@@ -2198,10 +2282,14 @@ export type FlaggableInput = {
 };
 
 /** The Feature that a Variant can belong to */
-export type Gene = Commentable & EventSubject & Flaggable & MolecularProfileComponent & WithRevisions & {
+export type Gene = Commentable & EventOriginObject & EventSubject & Flaggable & MolecularProfileComponent & WithRevisions & {
   __typename: 'Gene';
   /** List and filter comments. */
   comments: CommentConnection;
+  creationActivity?: Maybe<CreateFeatureActivity>;
+  deprecated: Scalars['Boolean'];
+  deprecationActivity?: Maybe<DeprecateFeatureActivity>;
+  deprecationReason?: Maybe<FeatureDeprecationReason>;
   description?: Maybe<Scalars['String']>;
   entrezId: Scalars['Int'];
   /** List and filter events for an object */
@@ -2904,12 +2992,19 @@ export type Mutation = {
   addRemoteCitation?: Maybe<AddRemoteCitationPayload>;
   /** Add a new therapy to the database. */
   addTherapy?: Maybe<AddTherapyPayload>;
+  /** Create a new Feature in the database. */
+  createFeature?: Maybe<CreateFeaturePayload>;
   /** Create a new Molecular Profile in order to attach Evidence Items to it. */
   createMolecularProfile?: Maybe<CreateMolecularProfilePayload>;
   /** Create a new Variant to the database. */
   createVariant?: Maybe<CreateVariantPayload>;
   /** Deprecate a complex molecular profile to prevent it from being used in the future. */
   deprecateComplexMolecularProfile?: Maybe<DeprecateComplexMolecularProfilePayload>;
+  /**
+   * Deprecate a feature to prevent it from being used in the future and implicitly
+   * deprecate all the variants and molecular profiles linked to this feature.
+   */
+  deprecateFeature?: Maybe<DeprecateFeaturePayload>;
   /**
    * Deprecate a variant to prevent it from being used in the future and implicitly
    * deprecate all the molecular profiles linked to this variant.
@@ -2993,6 +3088,11 @@ export type MutationAddTherapyArgs = {
 };
 
 
+export type MutationCreateFeatureArgs = {
+  input: CreateFeatureInput;
+};
+
+
 export type MutationCreateMolecularProfileArgs = {
   input: CreateMolecularProfileInput;
 };
@@ -3008,6 +3108,11 @@ export type MutationDeprecateComplexMolecularProfileArgs = {
 };
 
 
+export type MutationDeprecateFeatureArgs = {
+  input: DeprecateFeatureInput;
+};
+
+
 export type MutationDeprecateVariantArgs = {
   input: DeprecateVariantInput;
 };
@@ -5806,6 +5911,7 @@ export type VariantConnection = {
 
 export enum VariantDeprecationReason {
   Duplicate = 'DUPLICATE',
+  FeatureDeprecated = 'FEATURE_DEPRECATED',
   Invalid = 'INVALID',
   Other = 'OTHER'
 }
@@ -6321,11 +6427,11 @@ export type EventFeedQueryVariables = Exact<{
 }>;
 
 
-export type EventFeedQuery = { __typename: 'Query', events: { __typename: 'EventConnection', eventTypes?: Array<EventAction>, unfilteredCount: number, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, uniqueParticipants?: Array<{ __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined }>, participatingOrganizations?: Array<{ __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined }>, edges: Array<{ __typename: 'EventEdge', cursor: string, node?: { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined } | undefined }> } };
+export type EventFeedQuery = { __typename: 'Query', events: { __typename: 'EventConnection', eventTypes?: Array<EventAction>, unfilteredCount: number, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, uniqueParticipants?: Array<{ __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined }>, participatingOrganizations?: Array<{ __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined }>, edges: Array<{ __typename: 'EventEdge', cursor: string, node?: { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', deprecated: boolean, id: number, link: string, name: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Factor', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined } | undefined }> } };
 
-export type EventFeedFragment = { __typename: 'EventConnection', eventTypes?: Array<EventAction>, unfilteredCount: number, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, uniqueParticipants?: Array<{ __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined }>, participatingOrganizations?: Array<{ __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined }>, edges: Array<{ __typename: 'EventEdge', cursor: string, node?: { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined } | undefined }> };
+export type EventFeedFragment = { __typename: 'EventConnection', eventTypes?: Array<EventAction>, unfilteredCount: number, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, uniqueParticipants?: Array<{ __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined }>, participatingOrganizations?: Array<{ __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined }>, edges: Array<{ __typename: 'EventEdge', cursor: string, node?: { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', deprecated: boolean, id: number, link: string, name: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Factor', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined } | undefined }> };
 
-export type EventFeedNodeFragment = { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined };
+export type EventFeedNodeFragment = { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', deprecated: boolean, id: number, link: string, name: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Factor', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined };
 
 export type EvidencePopoverQueryVariables = Exact<{
   evidenceId: Scalars['Int'];
@@ -7814,7 +7920,7 @@ export type UserNotificationsQueryVariables = Exact<{
 }>;
 
 
-export type UserNotificationsQuery = { __typename: 'Query', notifications: { __typename: 'NotificationConnection', eventTypes: Array<EventAction>, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, notificationSubjects: Array<{ __typename: 'EventSubjectWithCount', occuranceCount: number, subject?: { __typename: 'Assertion', id: number, name: string } | { __typename: 'EvidenceItem', id: number, name: string } | { __typename: 'Factor', id: number, name: string } | { __typename: 'Feature', id: number, name: string } | { __typename: 'Flag', id: number, name: string } | { __typename: 'Gene', id: number, name: string } | { __typename: 'MolecularProfile', id: number, name: string } | { __typename: 'Revision', id: number, name: string } | { __typename: 'RevisionSet', id: number, name: string } | { __typename: 'Source', id: number, name: string } | { __typename: 'SourcePopover', id: number, name: string } | { __typename: 'SourceSuggestion', id: number, name: string } | { __typename: 'Variant', id: number, name: string } | { __typename: 'VariantGroup', id: number, name: string } | undefined }>, originatingUsers: Array<{ __typename: 'User', id: number, displayName: string }>, organizations: Array<{ __typename: 'Organization', id: number, name: string }>, edges: Array<{ __typename: 'NotificationEdge', node?: { __typename: 'Notification', id: number, type: NotificationReason, seen: boolean, event: { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined }, subscription?: { __typename: 'Subscription', id: number, subscribable: { __typename: 'Assertion', id: number, name: string } | { __typename: 'EvidenceItem', id: number, name: string } | { __typename: 'Factor', id: number, name: string } | { __typename: 'Feature', id: number, name: string } | { __typename: 'Flag', id: number, name: string } | { __typename: 'Gene', id: number, name: string } | { __typename: 'MolecularProfile', id: number, name: string } | { __typename: 'Revision', id: number, name: string } | { __typename: 'RevisionSet', id: number, name: string } | { __typename: 'Source', id: number, name: string } | { __typename: 'SourcePopover', id: number, name: string } | { __typename: 'SourceSuggestion', id: number, name: string } | { __typename: 'Variant', id: number, name: string } | { __typename: 'VariantGroup', id: number, name: string } } | undefined } | undefined }> } };
+export type UserNotificationsQuery = { __typename: 'Query', notifications: { __typename: 'NotificationConnection', eventTypes: Array<EventAction>, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, notificationSubjects: Array<{ __typename: 'EventSubjectWithCount', occuranceCount: number, subject?: { __typename: 'Assertion', id: number, name: string } | { __typename: 'EvidenceItem', id: number, name: string } | { __typename: 'Factor', id: number, name: string } | { __typename: 'Feature', id: number, name: string } | { __typename: 'Flag', id: number, name: string } | { __typename: 'Gene', id: number, name: string } | { __typename: 'MolecularProfile', id: number, name: string } | { __typename: 'Revision', id: number, name: string } | { __typename: 'RevisionSet', id: number, name: string } | { __typename: 'Source', id: number, name: string } | { __typename: 'SourcePopover', id: number, name: string } | { __typename: 'SourceSuggestion', id: number, name: string } | { __typename: 'Variant', id: number, name: string } | { __typename: 'VariantGroup', id: number, name: string } | undefined }>, originatingUsers: Array<{ __typename: 'User', id: number, displayName: string }>, organizations: Array<{ __typename: 'Organization', id: number, name: string }>, edges: Array<{ __typename: 'NotificationEdge', node?: { __typename: 'Notification', id: number, type: NotificationReason, seen: boolean, event: { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', deprecated: boolean, id: number, link: string, name: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Factor', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined }, subscription?: { __typename: 'Subscription', id: number, subscribable: { __typename: 'Assertion', id: number, name: string } | { __typename: 'EvidenceItem', id: number, name: string } | { __typename: 'Factor', id: number, name: string } | { __typename: 'Feature', id: number, name: string } | { __typename: 'Flag', id: number, name: string } | { __typename: 'Gene', id: number, name: string } | { __typename: 'MolecularProfile', id: number, name: string } | { __typename: 'Revision', id: number, name: string } | { __typename: 'RevisionSet', id: number, name: string } | { __typename: 'Source', id: number, name: string } | { __typename: 'SourcePopover', id: number, name: string } | { __typename: 'SourceSuggestion', id: number, name: string } | { __typename: 'Variant', id: number, name: string } | { __typename: 'VariantGroup', id: number, name: string } } | undefined } | undefined }> } };
 
 export type NotificationOrganizationFragment = { __typename: 'Organization', id: number, name: string };
 
@@ -7822,14 +7928,14 @@ export type NotificationOriginatingUsersFragment = { __typename: 'User', id: num
 
 export type NotificationFeedSubjectsFragment = { __typename: 'EventSubjectWithCount', occuranceCount: number, subject?: { __typename: 'Assertion', id: number, name: string } | { __typename: 'EvidenceItem', id: number, name: string } | { __typename: 'Factor', id: number, name: string } | { __typename: 'Feature', id: number, name: string } | { __typename: 'Flag', id: number, name: string } | { __typename: 'Gene', id: number, name: string } | { __typename: 'MolecularProfile', id: number, name: string } | { __typename: 'Revision', id: number, name: string } | { __typename: 'RevisionSet', id: number, name: string } | { __typename: 'Source', id: number, name: string } | { __typename: 'SourcePopover', id: number, name: string } | { __typename: 'SourceSuggestion', id: number, name: string } | { __typename: 'Variant', id: number, name: string } | { __typename: 'VariantGroup', id: number, name: string } | undefined };
 
-export type NotificationNodeFragment = { __typename: 'Notification', id: number, type: NotificationReason, seen: boolean, event: { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined }, subscription?: { __typename: 'Subscription', id: number, subscribable: { __typename: 'Assertion', id: number, name: string } | { __typename: 'EvidenceItem', id: number, name: string } | { __typename: 'Factor', id: number, name: string } | { __typename: 'Feature', id: number, name: string } | { __typename: 'Flag', id: number, name: string } | { __typename: 'Gene', id: number, name: string } | { __typename: 'MolecularProfile', id: number, name: string } | { __typename: 'Revision', id: number, name: string } | { __typename: 'RevisionSet', id: number, name: string } | { __typename: 'Source', id: number, name: string } | { __typename: 'SourcePopover', id: number, name: string } | { __typename: 'SourceSuggestion', id: number, name: string } | { __typename: 'Variant', id: number, name: string } | { __typename: 'VariantGroup', id: number, name: string } } | undefined };
+export type NotificationNodeFragment = { __typename: 'Notification', id: number, type: NotificationReason, seen: boolean, event: { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', deprecated: boolean, id: number, link: string, name: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Factor', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined }, subscription?: { __typename: 'Subscription', id: number, subscribable: { __typename: 'Assertion', id: number, name: string } | { __typename: 'EvidenceItem', id: number, name: string } | { __typename: 'Factor', id: number, name: string } | { __typename: 'Feature', id: number, name: string } | { __typename: 'Flag', id: number, name: string } | { __typename: 'Gene', id: number, name: string } | { __typename: 'MolecularProfile', id: number, name: string } | { __typename: 'Revision', id: number, name: string } | { __typename: 'RevisionSet', id: number, name: string } | { __typename: 'Source', id: number, name: string } | { __typename: 'SourcePopover', id: number, name: string } | { __typename: 'SourceSuggestion', id: number, name: string } | { __typename: 'Variant', id: number, name: string } | { __typename: 'VariantGroup', id: number, name: string } } | undefined };
 
 export type UpdateNotificationStatusMutationVariables = Exact<{
   input: UpdateNotificationStatusInput;
 }>;
 
 
-export type UpdateNotificationStatusMutation = { __typename: 'Mutation', updateNotificationStatus?: { __typename: 'UpdateNotificationStatusPayload', notifications: Array<{ __typename: 'Notification', id: number, type: NotificationReason, seen: boolean, event: { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined }, subscription?: { __typename: 'Subscription', id: number, subscribable: { __typename: 'Assertion', id: number, name: string } | { __typename: 'EvidenceItem', id: number, name: string } | { __typename: 'Factor', id: number, name: string } | { __typename: 'Feature', id: number, name: string } | { __typename: 'Flag', id: number, name: string } | { __typename: 'Gene', id: number, name: string } | { __typename: 'MolecularProfile', id: number, name: string } | { __typename: 'Revision', id: number, name: string } | { __typename: 'RevisionSet', id: number, name: string } | { __typename: 'Source', id: number, name: string } | { __typename: 'SourcePopover', id: number, name: string } | { __typename: 'SourceSuggestion', id: number, name: string } | { __typename: 'Variant', id: number, name: string } | { __typename: 'VariantGroup', id: number, name: string } } | undefined }> } | undefined };
+export type UpdateNotificationStatusMutation = { __typename: 'Mutation', updateNotificationStatus?: { __typename: 'UpdateNotificationStatusPayload', notifications: Array<{ __typename: 'Notification', id: number, type: NotificationReason, seen: boolean, event: { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', deprecated: boolean, id: number, link: string, name: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Factor', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined }, subscription?: { __typename: 'Subscription', id: number, subscribable: { __typename: 'Assertion', id: number, name: string } | { __typename: 'EvidenceItem', id: number, name: string } | { __typename: 'Factor', id: number, name: string } | { __typename: 'Feature', id: number, name: string } | { __typename: 'Flag', id: number, name: string } | { __typename: 'Gene', id: number, name: string } | { __typename: 'MolecularProfile', id: number, name: string } | { __typename: 'Revision', id: number, name: string } | { __typename: 'RevisionSet', id: number, name: string } | { __typename: 'Source', id: number, name: string } | { __typename: 'SourcePopover', id: number, name: string } | { __typename: 'SourceSuggestion', id: number, name: string } | { __typename: 'Variant', id: number, name: string } | { __typename: 'VariantGroup', id: number, name: string } } | undefined }> } | undefined };
 
 export type UnsubscribeMutationVariables = Exact<{
   input: UnsubscribeInput;
@@ -8245,6 +8351,12 @@ export const EventFeedNodeFragmentDoc = gql`
         name
       }
     }
+    ... on Feature {
+      deprecated
+      id
+      link
+      name
+    }
     ... on MolecularProfile {
       deprecated
     }
diff --git a/client/src/app/generated/civic.possible-types.ts b/client/src/app/generated/civic.possible-types.ts
index 5a5b63403..25cd0d9d1 100644
--- a/client/src/app/generated/civic.possible-types.ts
+++ b/client/src/app/generated/civic.possible-types.ts
@@ -49,7 +49,10 @@
       "Assertion",
       "Comment",
       "EvidenceItem",
+      "Factor",
+      "Feature",
       "Flag",
+      "Gene",
       "MolecularProfile",
       "Revision",
       "SourceSuggestion",
diff --git a/client/src/app/generated/server.model.graphql b/client/src/app/generated/server.model.graphql
index 772f8c62f..f2a45df62 100644
--- a/client/src/app/generated/server.model.graphql
+++ b/client/src/app/generated/server.model.graphql
@@ -2937,7 +2937,7 @@ enum EvidenceType {
 """
 The Feature that a Variant can belong to
 """
-type Factor implements Commentable & EventSubject & Flaggable & MolecularProfileComponent & WithRevisions {
+type Factor implements Commentable & EventOriginObject & EventSubject & Flaggable & MolecularProfileComponent & WithRevisions {
   """
   List and filter comments.
   """
@@ -3173,7 +3173,7 @@ type FdaCode {
 """
 The Feature that a Variant can belong to
 """
-type Feature implements Commentable & EventSubject & Flaggable & MolecularProfileComponent & WithRevisions {
+type Feature implements Commentable & EventOriginObject & EventSubject & Flaggable & MolecularProfileComponent & WithRevisions {
   """
   List and filter comments.
   """
@@ -3758,7 +3758,7 @@ input FlaggableInput {
 """
 The Feature that a Variant can belong to
 """
-type Gene implements Commentable & EventSubject & Flaggable & MolecularProfileComponent & WithRevisions {
+type Gene implements Commentable & EventOriginObject & EventSubject & Flaggable & MolecularProfileComponent & WithRevisions {
   """
   List and filter comments.
   """
diff --git a/client/src/app/generated/server.schema.json b/client/src/app/generated/server.schema.json
index a2c091e4d..30b16a2b9 100644
--- a/client/src/app/generated/server.schema.json
+++ b/client/src/app/generated/server.schema.json
@@ -12470,11 +12470,26 @@
               "name": "EvidenceItem",
               "ofType": null
             },
+            {
+              "kind": "OBJECT",
+              "name": "Factor",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "Feature",
+              "ofType": null
+            },
             {
               "kind": "OBJECT",
               "name": "Flag",
               "ofType": null
             },
+            {
+              "kind": "OBJECT",
+              "name": "Gene",
+              "ofType": null
+            },
             {
               "kind": "OBJECT",
               "name": "MolecularProfile",
@@ -15580,6 +15595,11 @@
               "name": "EventSubject",
               "ofType": null
             },
+            {
+              "kind": "INTERFACE",
+              "name": "EventOriginObject",
+              "ofType": null
+            },
             {
               "kind": "INTERFACE",
               "name": "MolecularProfileComponent",
@@ -16453,6 +16473,11 @@
               "name": "EventSubject",
               "ofType": null
             },
+            {
+              "kind": "INTERFACE",
+              "name": "EventOriginObject",
+              "ofType": null
+            },
             {
               "kind": "INTERFACE",
               "name": "MolecularProfileComponent",
@@ -18847,6 +18872,11 @@
               "name": "EventSubject",
               "ofType": null
             },
+            {
+              "kind": "INTERFACE",
+              "name": "EventOriginObject",
+              "ofType": null
+            },
             {
               "kind": "INTERFACE",
               "name": "MolecularProfileComponent",
diff --git a/server/app/graphql/types/entities/feature_type.rb b/server/app/graphql/types/entities/feature_type.rb
index 1fe7fe8fa..014457b60 100644
--- a/server/app/graphql/types/entities/feature_type.rb
+++ b/server/app/graphql/types/entities/feature_type.rb
@@ -2,6 +2,7 @@ module Types::Entities
   class FeatureType < Types::BaseObject
     implements Types::Interfaces::Flaggable
     implements Types::Interfaces::EventSubject
+    implements Types::Interfaces::EventOriginObject
     implements Types::Interfaces::MolecularProfileComponent
     implements Types::Interfaces::Commentable
     implements Types::Interfaces::WithRevisions

From 2b785b985b28842aaa3512c3e628ba82238e7762 Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Fri, 2 Feb 2024 11:06:37 -0600
Subject: [PATCH 084/125] get deprecation notice showing on feature pages, tags

---
 .../feature-tag/feature-tag.component.html    |  3 +-
 .../feature-tag/feature-tag.component.less    |  6 +++
 .../feature-tag/feature-tag.component.ts      |  2 +
 .../contributor-stack.component.html          |  2 +-
 client/src/app/generated/civic.apollo.ts      | 38 ++++++++++++++++---
 .../features-detail/features-detail.module.ts |  4 ++
 .../features-detail/features-detail.query.gql |  7 ++++
 .../features-detail/features-detail.view.html | 13 +++++++
 .../features-summary.query.gql                | 19 ++++++++++
 .../models/concerns/is_feature_instance.rb    |  3 ++
 10 files changed, 89 insertions(+), 8 deletions(-)
 create mode 100644 client/src/app/components/features/feature-tag/feature-tag.component.less

diff --git a/client/src/app/components/features/feature-tag/feature-tag.component.html b/client/src/app/components/features/feature-tag/feature-tag.component.html
index d146b721f..0812cd190 100644
--- a/client/src/app/components/features/feature-tag/feature-tag.component.html
+++ b/client/src/app/components/features/feature-tag/feature-tag.component.html
@@ -7,6 +7,7 @@
 <ng-template #tag>
   <nz-tag
     nz-popover
+    [ngClass]="{ deprecated: feature.deprecated }"
     [nzPopoverMouseEnterDelay]="this.onCloseClicked ? 0 : 0.5"
     [nzPopoverContent]="featurePopover"
     [nzPopoverTrigger]="enablePopover ? 'hover' : null"
@@ -35,7 +36,7 @@
   </cvc-icon-badges>
   <!-- gene name length mean: 8; mode: 12 (15306); max: 25 -->
   <ng-container *ngIf="this.truncateLongName; else fullName">
-    {{ feature.name | truncate : 12 }}
+    {{ feature.name | truncate: 12 }}
   </ng-container>
   <ng-template #fullName>
     {{ feature.name }}
diff --git a/client/src/app/components/features/feature-tag/feature-tag.component.less b/client/src/app/components/features/feature-tag/feature-tag.component.less
new file mode 100644
index 000000000..e82d5d804
--- /dev/null
+++ b/client/src/app/components/features/feature-tag/feature-tag.component.less
@@ -0,0 +1,6 @@
+@import "themes/overrides/entity-tag-overrides.less";
+
+:host {
+  display: inline-block;
+}
+
diff --git a/client/src/app/components/features/feature-tag/feature-tag.component.ts b/client/src/app/components/features/feature-tag/feature-tag.component.ts
index f90415439..625b7a725 100644
--- a/client/src/app/components/features/feature-tag/feature-tag.component.ts
+++ b/client/src/app/components/features/feature-tag/feature-tag.component.ts
@@ -13,11 +13,13 @@ export interface LinkableFeature {
   name: string
   link: string
   flagged?: boolean
+  deprecated?: boolean
 }
 
 @Component({
   selector: 'cvc-feature-tag',
   templateUrl: './feature-tag.component.html',
+  styleUrl: './feature-tag.component.less',
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class CvcFeatureTagComponent extends BaseCloseableTag implements OnInit {
diff --git a/client/src/app/components/shared/contributor-stack/contributor-stack.component.html b/client/src/app/components/shared/contributor-stack/contributor-stack.component.html
index 24420976a..60cc8b38d 100644
--- a/client/src/app/components/shared/contributor-stack/contributor-stack.component.html
+++ b/client/src/app/components/shared/contributor-stack/contributor-stack.component.html
@@ -27,7 +27,7 @@
             [nzColumn]="1">
             <nz-descriptions-item nzTitle="Contributions">
               <ng-container *ngFor="let a of u.uniqueActions; last as isLast">
-                {{ a.action | eventVerbiage : 'contributor-card' : a.count }}
+                {{ a.action | eventVerbiage: 'contributor-card' : a.count }}
                 <ng-container *ngIf="!isLast">, </ng-container>
               </ng-container>
             </nz-descriptions-item>
diff --git a/client/src/app/generated/civic.apollo.ts b/client/src/app/generated/civic.apollo.ts
index 1401f4b90..14fefacf5 100644
--- a/client/src/app/generated/civic.apollo.ts
+++ b/client/src/app/generated/civic.apollo.ts
@@ -7768,22 +7768,22 @@ export type FeatureDetailQueryVariables = Exact<{
 }>;
 
 
-export type FeatureDetailQuery = { __typename: 'Query', feature?: { __typename: 'Feature', id: number, name: string, fullName?: string | undefined, featureInstance: { __typename: 'Factor' } | { __typename: 'Gene' }, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number } } | undefined };
+export type FeatureDetailQuery = { __typename: 'Query', feature?: { __typename: 'Feature', id: number, name: string, fullName?: string | undefined, deprecated: boolean, deprecationReason?: FeatureDeprecationReason | undefined, deprecationActivity?: { __typename: 'DeprecateFeatureActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, featureInstance: { __typename: 'Factor' } | { __typename: 'Gene' }, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number } } | undefined };
 
-export type FeatureDetailFieldsFragment = { __typename: 'Feature', id: number, name: string, fullName?: string | undefined, featureInstance: { __typename: 'Factor' } | { __typename: 'Gene' }, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number } };
+export type FeatureDetailFieldsFragment = { __typename: 'Feature', id: number, name: string, fullName?: string | undefined, deprecated: boolean, deprecationReason?: FeatureDeprecationReason | undefined, deprecationActivity?: { __typename: 'DeprecateFeatureActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, featureInstance: { __typename: 'Factor' } | { __typename: 'Gene' }, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number } };
 
 export type FeaturesSummaryQueryVariables = Exact<{
   featureId: Scalars['Int'];
 }>;
 
 
-export type FeaturesSummaryQuery = { __typename: 'Query', feature?: { __typename: 'Feature', id: number, name: string, fullName?: string | undefined, link: string, featureInstance: { __typename: 'Factor', id: number, name: string, description?: string | undefined, featureAliases: Array<string>, ncitId?: string | undefined, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceUrl?: string | undefined, displayType: string, sourceType: SourceSource }>, ncitDetails?: { __typename: 'NcitDetails', synonyms: Array<{ __typename: 'NcitSynonym', name: string, source: string }>, definitions: Array<{ __typename: 'NcitDefinition', definition: string, source: string }> } | undefined } | { __typename: 'Gene', id: number, description?: string | undefined, featureAliases: Array<string>, entrezId: number, name: string, myGeneInfoDetails?: any | undefined, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceUrl?: string | undefined, displayType: string, sourceType: SourceSource }> } } | undefined };
+export type FeaturesSummaryQuery = { __typename: 'Query', feature?: { __typename: 'Feature', id: number, name: string, fullName?: string | undefined, link: string, featureInstance: { __typename: 'Factor', id: number, name: string, description?: string | undefined, featureAliases: Array<string>, ncitId?: string | undefined, deprecated: boolean, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceUrl?: string | undefined, displayType: string, sourceType: SourceSource }>, ncitDetails?: { __typename: 'NcitDetails', synonyms: Array<{ __typename: 'NcitSynonym', name: string, source: string }>, definitions: Array<{ __typename: 'NcitDefinition', definition: string, source: string }> } | undefined, creationActivity?: { __typename: 'CreateFeatureActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, deprecationActivity?: { __typename: 'DeprecateFeatureActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined } | { __typename: 'Gene', id: number, description?: string | undefined, featureAliases: Array<string>, entrezId: number, name: string, myGeneInfoDetails?: any | undefined, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceUrl?: string | undefined, displayType: string, sourceType: SourceSource }> } } | undefined };
 
-export type FeatureSummaryFieldsFragment = { __typename: 'Feature', id: number, name: string, fullName?: string | undefined, link: string, featureInstance: { __typename: 'Factor', id: number, name: string, description?: string | undefined, featureAliases: Array<string>, ncitId?: string | undefined, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceUrl?: string | undefined, displayType: string, sourceType: SourceSource }>, ncitDetails?: { __typename: 'NcitDetails', synonyms: Array<{ __typename: 'NcitSynonym', name: string, source: string }>, definitions: Array<{ __typename: 'NcitDefinition', definition: string, source: string }> } | undefined } | { __typename: 'Gene', id: number, description?: string | undefined, featureAliases: Array<string>, entrezId: number, name: string, myGeneInfoDetails?: any | undefined, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceUrl?: string | undefined, displayType: string, sourceType: SourceSource }> } };
+export type FeatureSummaryFieldsFragment = { __typename: 'Feature', id: number, name: string, fullName?: string | undefined, link: string, featureInstance: { __typename: 'Factor', id: number, name: string, description?: string | undefined, featureAliases: Array<string>, ncitId?: string | undefined, deprecated: boolean, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceUrl?: string | undefined, displayType: string, sourceType: SourceSource }>, ncitDetails?: { __typename: 'NcitDetails', synonyms: Array<{ __typename: 'NcitSynonym', name: string, source: string }>, definitions: Array<{ __typename: 'NcitDefinition', definition: string, source: string }> } | undefined, creationActivity?: { __typename: 'CreateFeatureActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, deprecationActivity?: { __typename: 'DeprecateFeatureActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined } | { __typename: 'Gene', id: number, description?: string | undefined, featureAliases: Array<string>, entrezId: number, name: string, myGeneInfoDetails?: any | undefined, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceUrl?: string | undefined, displayType: string, sourceType: SourceSource }> } };
 
 export type GeneSummaryFieldsFragment = { __typename: 'Gene', id: number, description?: string | undefined, featureAliases: Array<string>, entrezId: number, name: string, myGeneInfoDetails?: any | undefined, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceUrl?: string | undefined, displayType: string, sourceType: SourceSource }> };
 
-export type FactorSummaryFieldsFragment = { __typename: 'Factor', id: number, name: string, description?: string | undefined, featureAliases: Array<string>, ncitId?: string | undefined, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceUrl?: string | undefined, displayType: string, sourceType: SourceSource }>, ncitDetails?: { __typename: 'NcitDetails', synonyms: Array<{ __typename: 'NcitSynonym', name: string, source: string }>, definitions: Array<{ __typename: 'NcitDefinition', definition: string, source: string }> } | undefined };
+export type FactorSummaryFieldsFragment = { __typename: 'Factor', id: number, name: string, description?: string | undefined, featureAliases: Array<string>, ncitId?: string | undefined, deprecated: boolean, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceUrl?: string | undefined, displayType: string, sourceType: SourceSource }>, ncitDetails?: { __typename: 'NcitDetails', synonyms: Array<{ __typename: 'NcitSynonym', name: string, source: string }>, definitions: Array<{ __typename: 'NcitDefinition', definition: string, source: string }> } | undefined, creationActivity?: { __typename: 'CreateFeatureActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, deprecationActivity?: { __typename: 'DeprecateFeatureActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined };
 
 export type NcitDetailsFragment = { __typename: 'NcitDetails', synonyms: Array<{ __typename: 'NcitSynonym', name: string, source: string }>, definitions: Array<{ __typename: 'NcitDefinition', definition: string, source: string }> };
 
@@ -10012,6 +10012,13 @@ export const FeatureDetailFieldsFragmentDoc = gql`
   id
   name
   fullName
+  deprecated
+  deprecationReason
+  deprecationActivity {
+    parsedNote {
+      ...parsedCommentFragment
+    }
+  }
   featureInstance {
     __typename
   }
@@ -10025,7 +10032,7 @@ export const FeatureDetailFieldsFragmentDoc = gql`
     totalCount
   }
 }
-    `;
+    ${ParsedCommentFragmentFragmentDoc}`;
 export const GeneSummaryFieldsFragmentDoc = gql`
     fragment GeneSummaryFields on Gene {
   id
@@ -10063,6 +10070,7 @@ export const FactorSummaryFieldsFragmentDoc = gql`
   description
   featureAliases
   ncitId
+  deprecated
   sources {
     id
     citation
@@ -10074,6 +10082,24 @@ export const FactorSummaryFieldsFragmentDoc = gql`
   ncitDetails {
     ...NcitDetails
   }
+  creationActivity {
+    user {
+      id
+      displayName
+      role
+      profileImagePath(size: 32)
+    }
+    createdAt
+  }
+  deprecationActivity {
+    user {
+      id
+      displayName
+      role
+      profileImagePath(size: 32)
+    }
+    createdAt
+  }
 }
     ${NcitDetailsFragmentDoc}`;
 export const FeatureSummaryFieldsFragmentDoc = gql`
diff --git a/client/src/app/views/features/features-detail/features-detail.module.ts b/client/src/app/views/features/features-detail/features-detail.module.ts
index e5852b943..a2db71465 100644
--- a/client/src/app/views/features/features-detail/features-detail.module.ts
+++ b/client/src/app/views/features/features-detail/features-detail.module.ts
@@ -16,6 +16,8 @@ import { NzSpaceModule } from 'ng-zorro-antd/space'
 import { NzTypographyModule } from 'ng-zorro-antd/typography'
 import { FeaturesDetailRoutingModule } from './features-detail-routing.module'
 import { FeaturesDetailView } from './features-detail.view'
+import { NzAlertModule } from 'ng-zorro-antd/alert'
+import { CvcCommentBodyModule } from '@app/components/comments/comment-body/comment-body.module'
 
 @NgModule({
   declarations: [FeaturesDetailView],
@@ -30,6 +32,7 @@ import { FeaturesDetailView } from './features-detail.view'
     NzSpaceModule,
     NzTypographyModule,
     NzGridModule,
+    NzAlertModule,
     CvcPipesModule,
     CvcTabNavigationModule,
     CvcFlaggableModule,
@@ -37,6 +40,7 @@ import { FeaturesDetailView } from './features-detail.view'
     CvcSectionNavigationModule,
     CvcEntitySubscriptionButtonModule,
     CvcEventFeedModule,
+    CvcCommentBodyModule,
   ],
 })
 export class FeaturesDetailModule {}
diff --git a/client/src/app/views/features/features-detail/features-detail.query.gql b/client/src/app/views/features/features-detail/features-detail.query.gql
index 9c98357b8..53f7f3fb0 100644
--- a/client/src/app/views/features/features-detail/features-detail.query.gql
+++ b/client/src/app/views/features/features-detail/features-detail.query.gql
@@ -8,6 +8,13 @@ fragment FeatureDetailFields on Feature {
   id
   name
   fullName
+  deprecated
+  deprecationReason
+  deprecationActivity {
+    parsedNote {
+      ...parsedCommentFragment
+    }
+  }
   featureInstance {
     __typename
   }
diff --git a/client/src/app/views/features/features-detail/features-detail.view.html b/client/src/app/views/features/features-detail/features-detail.view.html
index c896d572b..0c102e3ff 100644
--- a/client/src/app/views/features/features-detail/features-detail.view.html
+++ b/client/src/app/views/features/features-detail/features-detail.view.html
@@ -76,6 +76,19 @@
       </nz-page-header-extra>
 
       <nz-page-header-content>
+        <nz-alert
+          *ngIf="feature.deprecated"
+          nzBanner
+          [nzMessage]="deprecationMessageTemplate"
+          nzType="error"></nz-alert>
+        <ng-template #deprecationMessageTemplate>
+          This Feature has been deprecated for reason: {{
+          feature.deprecationReason | enumToTitle }}.
+          <cvc-comment-body
+            [commentBodySegments]="
+              feature.deprecationActivity?.parsedNote || []
+            "></cvc-comment-body>
+        </ng-template>
         <cvc-tab-navigation [tabs]="this.tabs$ | ngrxPush">
           <ng-template #tabBarExtraContent>
             <nz-col id="contributors-col">
diff --git a/client/src/app/views/features/features-detail/features-summary/features-summary.query.gql b/client/src/app/views/features/features-detail/features-summary/features-summary.query.gql
index b6f42789a..8b8c47eb3 100644
--- a/client/src/app/views/features/features-detail/features-summary/features-summary.query.gql
+++ b/client/src/app/views/features/features-detail/features-summary/features-summary.query.gql
@@ -59,6 +59,7 @@ fragment FactorSummaryFields on Factor {
   description
   featureAliases
   ncitId
+  deprecated
   sources {
     id
     citation
@@ -70,6 +71,24 @@ fragment FactorSummaryFields on Factor {
   ncitDetails {
     ...NcitDetails
   }
+  creationActivity {
+    user {
+      id
+      displayName
+      role
+      profileImagePath(size: 32)
+    }
+    createdAt
+  }
+  deprecationActivity {
+    user {
+      id
+      displayName
+      role
+      profileImagePath(size: 32)
+    }
+    createdAt
+  }
 }
 
 fragment NcitDetails on NcitDetails {
diff --git a/server/app/models/concerns/is_feature_instance.rb b/server/app/models/concerns/is_feature_instance.rb
index cca6dff54..a7cfb365f 100644
--- a/server/app/models/concerns/is_feature_instance.rb
+++ b/server/app/models/concerns/is_feature_instance.rb
@@ -7,6 +7,9 @@ module IsFeatureInstance
     delegate :name, :name=, to: :feature
     delegate :description, :description=, to: :feature
     delegate :full_name, :full_name=, to: :feature
+    delegate :deprecated, :deprecated=, to: :feature
+    delegate :deprecation_activity, :deprecating_user, to: :feature
+    delegate :creation_activity, :creating_user, to: :feature
     delegate :feature_aliases, to: :feature
     delegate :sources, to: :feature
     delegate :source_ids, to: :feature

From 634c09ee3c134440b5ad2e643effbff9d2eea094 Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Fri, 2 Feb 2024 11:37:40 -0600
Subject: [PATCH 085/125] show deprecation and creation activities on factor
 pages

---
 .../factor-summary/factor-summary.page.html   | 37 +++++++++++++++++++
 .../factor-summary/factor-summary.page.ts     |  4 ++
 2 files changed, 41 insertions(+)

diff --git a/client/src/app/components/factors/factor-summary/factor-summary.page.html b/client/src/app/components/factors/factor-summary/factor-summary.page.html
index 1755dc229..244db8ed4 100644
--- a/client/src/app/components/factors/factor-summary/factor-summary.page.html
+++ b/client/src/app/components/factors/factor-summary/factor-summary.page.html
@@ -94,6 +94,43 @@
 
   <!-- last revision submitted/accepted, mygeneinfo col -->
   <nz-col nzSpan="12">
+    <!-- BLOCK: creation and deprecation events -->
+    <nz-descriptions
+      nzLayout="vertical"
+      nzSize="small"
+      [nzColumn]="{ xxl: 2, xl: 2, lg: 1, md: 1, sm: 1, xs: 1 }"
+      nzBordered="true">
+      <!-- creation/deprecation curation events -->
+      <ng-container *ngIf="factor.creationActivity">
+        <nz-descriptions-item [nzTitle]="createdTitle">
+          by
+          <cvc-user-tag [user]="factor.creationActivity.user"></cvc-user-tag>
+        </nz-descriptions-item>
+        <ng-template #createdTitle>
+          Created
+          <span
+            nz-typography
+            nzType="secondary">
+            ({{ factor.creationActivity.createdAt | timeAgo }})
+          </span>
+        </ng-template>
+      </ng-container>
+      <ng-container *ngIf="factor.deprecationActivity">
+        <nz-descriptions-item [nzTitle]="deprecatedTitle">
+          by
+          <cvc-user-tag [user]="factor.deprecationActivity.user"></cvc-user-tag>
+        </nz-descriptions-item>
+        <ng-template #deprecatedTitle>
+          Deprecated
+          <span
+            nz-typography
+            nzType="secondary">
+            ({{ factor.deprecationActivity.createdAt | timeAgo }})
+          </span>
+        </ng-template>
+      </ng-container>
+    </nz-descriptions>
+    <br />
     <!-- ncit info -->
     <cvc-ncit-details [ncitDetails]="factor.ncitDetails"></cvc-ncit-details>
   </nz-col>
diff --git a/client/src/app/components/factors/factor-summary/factor-summary.page.ts b/client/src/app/components/factors/factor-summary/factor-summary.page.ts
index 9aef81cc7..1e5fe58cc 100644
--- a/client/src/app/components/factors/factor-summary/factor-summary.page.ts
+++ b/client/src/app/components/factors/factor-summary/factor-summary.page.ts
@@ -16,6 +16,8 @@ import { NzSpaceModule } from 'ng-zorro-antd/space'
 import { NzTagModule } from 'ng-zorro-antd/tag'
 import { NzTypographyModule } from 'ng-zorro-antd/typography'
 import { CvcNcitDetailsComponent } from '../ncit-details/ncit-details.component'
+import { CvcPipesModule } from '@app/core/pipes/pipes.module'
+import { CvcUserTagModule } from '@app/components/users/user-tag/user-tag.module'
 
 @Component({
   standalone: true,
@@ -35,6 +37,8 @@ import { CvcNcitDetailsComponent } from '../ncit-details/ncit-details.component'
     CvcSourceTagModule,
     CvcLinkTagModule,
     CvcNcitDetailsComponent,
+    CvcPipesModule,
+    CvcUserTagModule,
   ],
 })
 export class FactorSummaryComponent implements OnInit {

From 0b0921c79d85f6dbc2609f681a0d8da39e7ad52d Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Wed, 14 Feb 2024 18:25:08 -0600
Subject: [PATCH 086/125] suggesting revisions to factors is working

---
 .../revision-list.component.html              |  13 +
 .../factor-revise.form.config.ts              | 137 ++++++++
 .../factor-revise/factor-revise.form.html     |  37 +++
 .../factor-revise/factor-revise.form.ts       | 121 +++++++
 .../factor-revise/factor-revise.query.gql     |  35 ++
 .../app/forms/models/factor-fields.model.ts   |   8 +
 .../app/forms/models/factor-revise.model.ts   |  19 ++
 .../forms/utilities/factor-to-model-fields.ts |  50 +++
 .../src/app/generated/civic.apollo-helpers.ts |  21 +-
 client/src/app/generated/civic.apollo.ts      | 176 ++++++++++
 client/src/app/generated/server.model.graphql | 105 +++++-
 client/src/app/generated/server.schema.json   | 300 +++++++++++++++++-
 .../features-detail/features-detail.view.html |   1 +
 .../features-suggest.module.ts                |   2 +
 .../features-suggest.page.html                |  13 +-
 .../features-suggest/features-suggest.page.ts |   8 +
 .../graphql/types/events/event_action_type.rb |   2 +-
 server/app/graphql/types/mutation_type.rb     |   1 +
 .../graphql/types/revisions/factor_fields.rb  |   4 +-
 server/app/lib/importer/entrez_symbols.rb     |   4 +-
 .../models/concerns/is_feature_instance.rb    |   2 +
 server/app/models/feature.rb                  |   4 +-
 .../models/{features => }/feature_alias.rb    |   6 +-
 .../input_adaptors/factor_input_adaptor.rb    |  13 +-
 .../features/backfill_gene_feature.rb         |   2 +-
 25 files changed, 1062 insertions(+), 22 deletions(-)
 create mode 100644 client/src/app/forms/config/factor-revise/factor-revise.form.config.ts
 create mode 100644 client/src/app/forms/config/factor-revise/factor-revise.form.html
 create mode 100644 client/src/app/forms/config/factor-revise/factor-revise.form.ts
 create mode 100644 client/src/app/forms/config/factor-revise/factor-revise.query.gql
 create mode 100644 client/src/app/forms/models/factor-fields.model.ts
 create mode 100644 client/src/app/forms/models/factor-revise.model.ts
 create mode 100644 client/src/app/forms/utilities/factor-to-model-fields.ts
 rename server/app/models/{features => }/feature_alias.rb (77%)

diff --git a/client/src/app/components/revisions/revision-list/revision-list.component.html b/client/src/app/components/revisions/revision-list/revision-list.component.html
index 6afe4e006..8478bff11 100644
--- a/client/src/app/components/revisions/revision-list/revision-list.component.html
+++ b/client/src/app/components/revisions/revision-list/revision-list.component.html
@@ -130,6 +130,19 @@
               </ng-template>
             </cvc-revision-list-diff>
           </ng-container>
+          <ng-container *ngSwitchCase="'feature_alias_ids'">
+            <cvc-revision-list-diff
+              [diffObject]="revision.linkoutData.diffValue"
+              entityType="Feature Aliases">
+              <ng-template
+                #itemTemplate
+                let-item>
+                <nz-tag>
+                  {{ item.displayName }}
+                </nz-tag>
+              </ng-template>
+            </cvc-revision-list-diff>
+          </ng-container>
           <ng-container *ngSwitchCase="'molecular_profile_alias_ids'">
             <cvc-revision-list-diff
               [diffObject]="revision.linkoutData.diffValue"
diff --git a/client/src/app/forms/config/factor-revise/factor-revise.form.config.ts b/client/src/app/forms/config/factor-revise/factor-revise.form.config.ts
new file mode 100644
index 000000000..4db7f7aab
--- /dev/null
+++ b/client/src/app/forms/config/factor-revise/factor-revise.form.config.ts
@@ -0,0 +1,137 @@
+import { factorReviseFormInitialModel } from '@app/forms/models/factor-revise.model'
+import assignFieldConfigDefaultValues from '@app/forms/utilities/assign-field-default-values'
+import { CvcFormCardWrapperProps } from '@app/forms/wrappers/form-card/form-card.wrapper'
+import { CvcFormLayoutWrapperProps } from '@app/forms/wrappers/form-layout/form-layout.wrapper'
+import { CvcFormRowWrapperProps } from '@app/forms/wrappers/form-row/form-row.wrapper'
+import { FormlyFieldConfig } from '@ngx-formly/core'
+
+const formFieldConfig: FormlyFieldConfig[] = [
+  // form-layout wrapper embeds the form in an nz-grid row, allowing the form to be placed adjacent to other controls or page elements. Currently, it provides a toggleable dev panel. Could be used to add a preview of the entity being added/edited, or more extensive feedback like lists of similar entities, etc.
+  {
+    wrappers: ['form-layout'],
+    props: <CvcFormLayoutWrapperProps>{
+      showDevPanel: false,
+    },
+    fieldGroup: [
+      {
+        key: 'clientMutationId',
+        props: {
+          hidden: true,
+        },
+      },
+      // form-card wraps the form fields in a card, providing a place to put a title, and other controls e.g. form options, status
+      {
+        key: 'fields',
+        wrappers: ['form-card'],
+        props: <CvcFormCardWrapperProps>{
+          formCardOptions: { title: 'Revise Factor' },
+        },
+        fieldGroup: [
+          {
+            wrappers: ['form-row'],
+            props: <CvcFormRowWrapperProps>{
+              formRowOptions: {
+                span: 24,
+              },
+            },
+            fieldGroup: [
+              {
+                key: 'name',
+                type: 'base-input',
+                props: {
+                  placeholder: 'Enter a name for this Factor',
+                  description: 'Enter the name of the Factor',
+                  label: 'Name',
+                  required: true,
+                },
+              },
+              {
+                key: 'fullName',
+                type: 'base-input',
+                props: {
+                  placeholder: 'Enter a full name for this Factor',
+                  description:
+                    'Enter a full or long-form name of the Factor if applicable',
+                  label: 'Full Name',
+                  required: false,
+                },
+              },
+              {
+                key: 'ncitId',
+                type: 'base-input',
+                props: {
+                  placeholder: 'NCI Thesaurus Code',
+                  description: 'Enter the NCI Thesaurus ID for this Factor',
+                  label: 'NCI Thesaurus ID',
+                  required: false,
+                },
+              },
+              {
+                key: 'aliases',
+                type: 'tag-multi-input',
+                props: {
+                  label: 'Aliases',
+                  description:
+                    'List any aliases commonly used to refer to this Factor',
+                  placeholder: 'Enter Alias and hit return',
+                },
+              },
+              {
+                key: 'description',
+                type: 'base-textarea',
+                wrappers: ['form-field'],
+                props: {
+                  tooltip:
+                    'User-defined summary of the clinical relevance of this Factor.',
+                  placeholder: 'Enter a Factor Summary',
+                  label: 'Summary',
+                  required: false,
+                  rows: 5,
+                },
+              },
+              {
+                key: 'sourceIds',
+                type: 'source-multi-select',
+                wrappers: ['form-field'],
+                props: {},
+              },
+            ],
+          },
+        ],
+      },
+      {
+        wrappers: ['form-row'],
+        props: <CvcFormRowWrapperProps>{
+          formRowOptions: {
+            spanIndexed: [24, 12, 12],
+          },
+        },
+        fieldGroup: [
+          {
+            key: 'comment',
+            type: 'base-textarea',
+            props: {
+              label: 'Comment',
+              placeholder: 'Please enter a comment describing your revisions.',
+              required: true,
+              minLength: 10,
+            },
+          },
+          {
+            type: 'cvc-cancel-button',
+          },
+          {
+            key: 'organizationId',
+            type: 'org-submit-button',
+            props: {
+              submitLabel: 'Submit Factor Revisions',
+              align: 'right',
+            },
+          },
+        ],
+      },
+    ],
+  },
+]
+export const factorReviseFields: FormlyFieldConfig[] =
+  assignFieldConfigDefaultValues(formFieldConfig, factorReviseFormInitialModel)
diff --git a/client/src/app/forms/config/factor-revise/factor-revise.form.html b/client/src/app/forms/config/factor-revise/factor-revise.form.html
new file mode 100644
index 000000000..87b408507
--- /dev/null
+++ b/client/src/app/forms/config/factor-revise/factor-revise.form.html
@@ -0,0 +1,37 @@
+<cvc-form-submission-status-display
+  [redirectUrl]="this.url"
+  [mutationState]="this.mutationState"
+  entityType="Gene"
+  [successMessage]="success">
+  <ng-template #success>
+    Revision(s) submitted! You will be redirected to the Revisions page or can
+    view them <a href="{{this.url}}">here.</a>
+  </ng-template>
+  <form
+    *ngIf="model; else loadingModel"
+    nz-form
+    nzLayout="vertical"
+    [formGroup]="form"
+    (ngSubmit)="onSubmit(model)">
+    <formly-form
+      [form]="form"
+      [fields]="fields"
+      [model]="model"
+      [options]="{}"
+      (modelChange)="model = $event">
+    </formly-form>
+  </form>
+  <ng-template #loadingModel> Loading Factor... </ng-template>
+</cvc-form-submission-status-display>
+<!-- <nz-row style="background-color: #eef">
+  <nz-col nzSpan="12">
+    <h4>evidence-revise.form.html Model</h4>
+    <ngx-json-viewer [json]="model"></ngx-json-viewer>
+  </nz-col>
+  <nz-col nzSpan="12">
+    <h4>Form</h4>
+    <pre>
+touched: {{ form.touched }}
+    </pre>
+  </nz-col>
+</nz-row> -->
diff --git a/client/src/app/forms/config/factor-revise/factor-revise.form.ts b/client/src/app/forms/config/factor-revise/factor-revise.form.ts
new file mode 100644
index 000000000..ec303de43
--- /dev/null
+++ b/client/src/app/forms/config/factor-revise/factor-revise.form.ts
@@ -0,0 +1,121 @@
+import {
+  AfterViewInit,
+  ChangeDetectionStrategy,
+  ChangeDetectorRef,
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core'
+import { UntypedFormGroup } from '@angular/forms'
+import {
+  FactorRevisableFieldsGQL,
+  SuggestFactorRevisionGQL,
+  SuggestFactorRevisionMutation,
+  SuggestFactorRevisionMutationVariables,
+} from '@app/generated/civic.apollo'
+import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy'
+import { FormlyFieldConfig } from '@ngx-formly/core'
+import {
+  MutationState,
+  MutatorWithState,
+} from '@app/core/utilities/mutation-state-wrapper'
+import { NetworkErrorsService } from '@app/core/services/network-errors.service'
+import {
+  factorFormModelToReviseInput,
+  factorToModelFields,
+} from '@app/forms/utilities/factor-to-model-fields'
+import { factorReviseFields } from './factor-revise.form.config'
+import { CommonModule } from '@angular/common'
+import { LetDirective, PushPipe } from '@ngrx/component'
+import { NzFormModule } from 'ng-zorro-antd/form'
+import { NzButtonModule } from 'ng-zorro-antd/button'
+import { CvcForms2Module } from '@app/forms/forms.module'
+import { CvcFormSubmissionStatusDisplayModule } from '@app/forms/components/form-submission-status-display/form-submission-status-display.module'
+import { FactorReviseModel } from '@app/forms/models/factor-revise.model'
+
+@UntilDestroy()
+@Component({
+  selector: 'cvc-factor-revise-form',
+  standalone: true,
+  templateUrl: './factor-revise.form.html',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  imports: [
+    CommonModule,
+    LetDirective,
+    PushPipe,
+    NzFormModule,
+    NzButtonModule,
+    CvcForms2Module,
+    CvcFormSubmissionStatusDisplayModule,
+  ],
+
+  //NgxJsonViewerModule, // debug
+})
+export class CvcFactorReviseForm implements OnInit, AfterViewInit {
+  @Input() featureId!: number
+  model?: FactorReviseModel
+  form: UntypedFormGroup
+  fields: FormlyFieldConfig[]
+
+  reviseFactorMutator: MutatorWithState<
+    SuggestFactorRevisionGQL,
+    SuggestFactorRevisionMutation,
+    SuggestFactorRevisionMutationVariables
+  >
+
+  mutationState?: MutationState
+  url?: string
+
+  constructor(
+    private revisableFieldsGQL: FactorRevisableFieldsGQL,
+    private submitRevisionsGQL: SuggestFactorRevisionGQL,
+    private networkErrorService: NetworkErrorsService,
+    private cdr: ChangeDetectorRef
+  ) {
+    this.form = new UntypedFormGroup({})
+    this.fields = factorReviseFields
+    this.reviseFactorMutator = new MutatorWithState(networkErrorService)
+  }
+
+  ngOnInit() {
+    this.url = `/features/${this.featureId}/revisions`
+  }
+
+  ngAfterViewInit(): void {
+    this.revisableFieldsGQL
+      .fetch({ featureId: this.featureId })
+      .pipe(untilDestroyed(this))
+      .subscribe({
+        next: ({ data: { feature } }) => {
+          if (feature) {
+            let fields = factorToModelFields(feature)
+            if (fields) {
+              this.model = {
+                id: feature.id,
+                fields: fields,
+              }
+              this.cdr.detectChanges()
+            }
+          }
+        },
+        error: (error) => {
+          console.error('Error retrieving Factor.')
+          console.error(error)
+        },
+        complete: () => {},
+      })
+  }
+
+  onSubmit(model: FactorReviseModel) {
+    if (!this.featureId) {
+      return
+    }
+    let input = factorFormModelToReviseInput(this.featureId, model)
+    if (input) {
+      this.mutationState = this.reviseFactorMutator.mutate(
+        this.submitRevisionsGQL,
+        { input: input }
+      )
+    }
+  }
+}
diff --git a/client/src/app/forms/config/factor-revise/factor-revise.query.gql b/client/src/app/forms/config/factor-revise/factor-revise.query.gql
new file mode 100644
index 000000000..e7e8405e7f
--- /dev/null
+++ b/client/src/app/forms/config/factor-revise/factor-revise.query.gql
@@ -0,0 +1,35 @@
+query FactorRevisableFields($featureId: Int!) {
+  feature(id: $featureId) {
+    ...RevisableFactorFields
+  }
+}
+
+fragment RevisableFactorFields on Feature {
+  id
+  name
+  fullName
+  description
+  sources {
+    id
+    sourceType
+    citation
+    citationId
+  }
+  featureAliases
+  featureInstance {
+    ... on Factor {
+      ncitId
+    }
+  }
+}
+
+mutation SuggestFactorRevision($input: SuggestFactorRevisionInput!) {
+  suggestFactorRevision(input: $input) {
+    clientMutationId
+    results {
+      newlyCreated
+      id
+      fieldName
+    }
+  }
+}
diff --git a/client/src/app/forms/models/factor-fields.model.ts b/client/src/app/forms/models/factor-fields.model.ts
new file mode 100644
index 000000000..cbf28631a
--- /dev/null
+++ b/client/src/app/forms/models/factor-fields.model.ts
@@ -0,0 +1,8 @@
+export type FactorFields = {
+  description?: string
+  name?: string
+  fullName?: string
+  sourceIds?: number[]
+  aliases?: string[]
+  ncitId?: string
+}
diff --git a/client/src/app/forms/models/factor-revise.model.ts b/client/src/app/forms/models/factor-revise.model.ts
new file mode 100644
index 000000000..ad1c4ae1c
--- /dev/null
+++ b/client/src/app/forms/models/factor-revise.model.ts
@@ -0,0 +1,19 @@
+import { FactorFields } from './factor-fields.model'
+import { FormReviseBaseModel } from './form-revise-base.model'
+
+export interface FactorReviseModel extends FormReviseBaseModel {
+  fields: FactorFields
+}
+
+export const factorReviseFieldsDefaults: FactorFields = {
+  description: undefined,
+  sourceIds: undefined,
+}
+
+export const factorReviseFormInitialModel: FactorReviseModel = {
+  id: undefined,
+  clientMutationId: undefined,
+  fields: factorReviseFieldsDefaults,
+  comment: undefined,
+  organizationId: undefined,
+}
diff --git a/client/src/app/forms/utilities/factor-to-model-fields.ts b/client/src/app/forms/utilities/factor-to-model-fields.ts
new file mode 100644
index 000000000..a1bcbcad0
--- /dev/null
+++ b/client/src/app/forms/utilities/factor-to-model-fields.ts
@@ -0,0 +1,50 @@
+import {
+  Maybe,
+  RevisableFactorFieldsFragment,
+  SuggestFactorRevisionInput,
+} from '@app/generated/civic.apollo'
+import * as fmt from '@app/forms/utilities/input-formatters'
+import { FactorFields } from '../models/factor-fields.model'
+import { FactorReviseModel } from '../models/factor-revise.model'
+
+export function factorToModelFields(
+  factor: RevisableFactorFieldsFragment
+): Maybe<FactorFields> {
+  if (factor.featureInstance.__typename === 'Factor') {
+    return {
+      description: factor.description,
+      name: factor.name,
+      fullName: factor.fullName,
+      sourceIds: factor.sources.map((s) => s.id),
+      aliases: factor.featureAliases,
+      ncitId: factor.featureInstance.ncitId,
+    }
+  } else {
+    return undefined
+  }
+}
+
+export function factorFormModelToReviseInput(
+  fid: number,
+  model: FactorReviseModel
+): Maybe<SuggestFactorRevisionInput> {
+  const fields = model.fields
+
+  if (!model.comment || !fields.name) {
+    return undefined
+  }
+
+  return {
+    id: fid,
+    fields: {
+      description: fmt.toNullableString(fields.description),
+      fullName: fmt.toNullableString(fields.fullName),
+      name: fields.name,
+      sourceIds: fields.sourceIds || [],
+      aliases: fields.aliases || [],
+      ncitId: fmt.toNullableString(fields.ncitId),
+    },
+    organizationId: model.organizationId,
+    comment: model.comment!,
+  }
+}
diff --git a/client/src/app/generated/civic.apollo-helpers.ts b/client/src/app/generated/civic.apollo-helpers.ts
index cae7075d5..84d7b0d20 100644
--- a/client/src/app/generated/civic.apollo-helpers.ts
+++ b/client/src/app/generated/civic.apollo-helpers.ts
@@ -39,13 +39,17 @@ export type ActivityInterfaceFieldPolicy = {
 	user?: FieldPolicy<any> | FieldReadFunction<any>,
 	verbiage?: FieldPolicy<any> | FieldReadFunction<any>
 };
-export type ActivityInterfaceConnectionKeySpecifier = ('edges' | 'nodes' | 'pageCount' | 'pageInfo' | 'totalCount' | ActivityInterfaceConnectionKeySpecifier)[];
+export type ActivityInterfaceConnectionKeySpecifier = ('activityTypes' | 'edges' | 'nodes' | 'pageCount' | 'pageInfo' | 'participatingOrganizations' | 'totalCount' | 'unfilteredCount' | 'uniqueParticipants' | ActivityInterfaceConnectionKeySpecifier)[];
 export type ActivityInterfaceConnectionFieldPolicy = {
+	activityTypes?: FieldPolicy<any> | FieldReadFunction<any>,
 	edges?: FieldPolicy<any> | FieldReadFunction<any>,
 	nodes?: FieldPolicy<any> | FieldReadFunction<any>,
 	pageCount?: FieldPolicy<any> | FieldReadFunction<any>,
 	pageInfo?: FieldPolicy<any> | FieldReadFunction<any>,
-	totalCount?: FieldPolicy<any> | FieldReadFunction<any>
+	participatingOrganizations?: FieldPolicy<any> | FieldReadFunction<any>,
+	totalCount?: FieldPolicy<any> | FieldReadFunction<any>,
+	unfilteredCount?: FieldPolicy<any> | FieldReadFunction<any>,
+	uniqueParticipants?: FieldPolicy<any> | FieldReadFunction<any>
 };
 export type ActivityInterfaceEdgeKeySpecifier = ('cursor' | 'node' | ActivityInterfaceEdgeKeySpecifier)[];
 export type ActivityInterfaceEdgeFieldPolicy = {
@@ -1209,7 +1213,7 @@ export type MolecularProfileTextSegmentKeySpecifier = ('text' | MolecularProfile
 export type MolecularProfileTextSegmentFieldPolicy = {
 	text?: FieldPolicy<any> | FieldReadFunction<any>
 };
-export type MutationKeySpecifier = ('acceptRevisions' | 'addComment' | 'addDisease' | 'addRemoteCitation' | 'addTherapy' | 'createFeature' | 'createMolecularProfile' | 'createVariant' | 'deprecateComplexMolecularProfile' | 'deprecateFeature' | 'deprecateVariant' | 'editUser' | 'flagEntity' | 'moderateAssertion' | 'moderateEvidenceItem' | 'rejectRevisions' | 'resolveFlag' | 'submitAssertion' | 'submitEvidence' | 'submitVariantGroup' | 'subscribe' | 'suggestAssertionRevision' | 'suggestEvidenceItemRevision' | 'suggestGeneRevision' | 'suggestMolecularProfileRevision' | 'suggestSource' | 'suggestVariantGroupRevision' | 'suggestVariantRevision' | 'unsubscribe' | 'updateCoi' | 'updateNotificationStatus' | 'updateSourceSuggestionStatus' | MutationKeySpecifier)[];
+export type MutationKeySpecifier = ('acceptRevisions' | 'addComment' | 'addDisease' | 'addRemoteCitation' | 'addTherapy' | 'createFeature' | 'createMolecularProfile' | 'createVariant' | 'deprecateComplexMolecularProfile' | 'deprecateFeature' | 'deprecateVariant' | 'editUser' | 'flagEntity' | 'moderateAssertion' | 'moderateEvidenceItem' | 'rejectRevisions' | 'resolveFlag' | 'submitAssertion' | 'submitEvidence' | 'submitVariantGroup' | 'subscribe' | 'suggestAssertionRevision' | 'suggestEvidenceItemRevision' | 'suggestFactorRevision' | 'suggestGeneRevision' | 'suggestMolecularProfileRevision' | 'suggestSource' | 'suggestVariantGroupRevision' | 'suggestVariantRevision' | 'unsubscribe' | 'updateCoi' | 'updateNotificationStatus' | 'updateSourceSuggestionStatus' | MutationKeySpecifier)[];
 export type MutationFieldPolicy = {
 	acceptRevisions?: FieldPolicy<any> | FieldReadFunction<any>,
 	addComment?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -1234,6 +1238,7 @@ export type MutationFieldPolicy = {
 	subscribe?: FieldPolicy<any> | FieldReadFunction<any>,
 	suggestAssertionRevision?: FieldPolicy<any> | FieldReadFunction<any>,
 	suggestEvidenceItemRevision?: FieldPolicy<any> | FieldReadFunction<any>,
+	suggestFactorRevision?: FieldPolicy<any> | FieldReadFunction<any>,
 	suggestGeneRevision?: FieldPolicy<any> | FieldReadFunction<any>,
 	suggestMolecularProfileRevision?: FieldPolicy<any> | FieldReadFunction<any>,
 	suggestSource?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -1843,6 +1848,12 @@ export type SuggestEvidenceItemRevisionPayloadFieldPolicy = {
 	evidenceItem?: FieldPolicy<any> | FieldReadFunction<any>,
 	results?: FieldPolicy<any> | FieldReadFunction<any>
 };
+export type SuggestFactorRevisionPayloadKeySpecifier = ('clientMutationId' | 'factor' | 'results' | SuggestFactorRevisionPayloadKeySpecifier)[];
+export type SuggestFactorRevisionPayloadFieldPolicy = {
+	clientMutationId?: FieldPolicy<any> | FieldReadFunction<any>,
+	factor?: FieldPolicy<any> | FieldReadFunction<any>,
+	results?: FieldPolicy<any> | FieldReadFunction<any>
+};
 export type SuggestGeneRevisionPayloadKeySpecifier = ('clientMutationId' | 'gene' | 'results' | SuggestGeneRevisionPayloadKeySpecifier)[];
 export type SuggestGeneRevisionPayloadFieldPolicy = {
 	clientMutationId?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -2840,6 +2851,10 @@ export type StrictTypedTypePolicies = {
 		keyFields?: false | SuggestEvidenceItemRevisionPayloadKeySpecifier | (() => undefined | SuggestEvidenceItemRevisionPayloadKeySpecifier),
 		fields?: SuggestEvidenceItemRevisionPayloadFieldPolicy,
 	},
+	SuggestFactorRevisionPayload?: Omit<TypePolicy, "fields" | "keyFields"> & {
+		keyFields?: false | SuggestFactorRevisionPayloadKeySpecifier | (() => undefined | SuggestFactorRevisionPayloadKeySpecifier),
+		fields?: SuggestFactorRevisionPayloadFieldPolicy,
+	},
 	SuggestGeneRevisionPayload?: Omit<TypePolicy, "fields" | "keyFields"> & {
 		keyFields?: false | SuggestGeneRevisionPayloadKeySpecifier | (() => undefined | SuggestGeneRevisionPayloadKeySpecifier),
 		fields?: SuggestGeneRevisionPayloadFieldPolicy,
diff --git a/client/src/app/generated/civic.apollo.ts b/client/src/app/generated/civic.apollo.ts
index 14fefacf5..583587e7e 100644
--- a/client/src/app/generated/civic.apollo.ts
+++ b/client/src/app/generated/civic.apollo.ts
@@ -90,6 +90,8 @@ export type ActivityInterface = {
 /** The connection type for ActivityInterface. */
 export type ActivityInterfaceConnection = {
   __typename: 'ActivityInterfaceConnection';
+  /** List of activity types that have occured on this entity. */
+  activityTypes: Array<ActivityTypeInput>;
   /** A list of edges. */
   edges: Array<ActivityInterfaceEdge>;
   /** A list of nodes. */
@@ -98,8 +100,17 @@ export type ActivityInterfaceConnection = {
   pageCount: Scalars['Int'];
   /** Information to aid in pagination. */
   pageInfo: PageInfo;
+  /** List of all organizations who are involved in this activity stream. */
+  participatingOrganizations: Array<Organization>;
   /** The total number of records in this filtered collection. */
   totalCount: Scalars['Int'];
+  /**
+   * When filtered on a subject, user, or organization, the total number of events
+   * for that subject/user/organization, irregardless of other filters.
+   */
+  unfilteredCount: Scalars['Int'];
+  /** List of all users that have performed an activity on the subject entity. */
+  uniqueParticipants: Array<User>;
 };
 
 /** An edge in a connection. */
@@ -111,6 +122,27 @@ export type ActivityInterfaceEdge = {
   node?: Maybe<ActivityInterface>;
 };
 
+export enum ActivityTypeInput {
+  AcceptRevisions = 'ACCEPT_REVISIONS',
+  Comment = 'COMMENT',
+  CreateComplexMolecularProfile = 'CREATE_COMPLEX_MOLECULAR_PROFILE',
+  CreateFeature = 'CREATE_FEATURE',
+  CreateVariant = 'CREATE_VARIANT',
+  DeprecateComplexMolecularProfile = 'DEPRECATE_COMPLEX_MOLECULAR_PROFILE',
+  DeprecateFeature = 'DEPRECATE_FEATURE',
+  DeprecateVariant = 'DEPRECATE_VARIANT',
+  FlagEntity = 'FLAG_ENTITY',
+  ModerateAssertion = 'MODERATE_ASSERTION',
+  ModerateEvidenceItem = 'MODERATE_EVIDENCE_ITEM',
+  RejectRevisions = 'REJECT_REVISIONS',
+  ResolveFlag = 'RESOLVE_FLAG',
+  SubmitAssertion = 'SUBMIT_ASSERTION',
+  SubmitEvidenceItem = 'SUBMIT_EVIDENCE_ITEM',
+  SuggestRevision = 'SUGGEST_REVISION',
+  SuggestSource = 'SUGGEST_SOURCE',
+  UpdateSourceSuggestion = 'UPDATE_SOURCE_SUGGESTION'
+}
+
 /** Autogenerated input type of AddComment */
 export type AddCommentInput = {
   /** Text of the comment. */
@@ -1971,6 +2003,22 @@ export type FactorVariantsArgs = {
   name?: InputMaybe<Scalars['String']>;
 };
 
+/** Fields on a Factor that curators may propose revisions to. */
+export type FactorFields = {
+  /** List of aliases or alternate names for the Factor. */
+  aliases: Array<Scalars['String']>;
+  /** The Factor's description/summary text. */
+  description: NullableStringInput;
+  /** The Factor's full name if applicable. */
+  fullName: NullableStringInput;
+  /** The Factor's display name. */
+  name: Scalars['String'];
+  /** NCI Thesaurus concept ID for this Factor */
+  ncitId: NullableStringInput;
+  /** Source IDs cited by the Factor's summary. */
+  sourceIds: Array<Scalars['Int']>;
+};
+
 export type FdaCode = {
   __typename: 'FdaCode';
   code: Scalars['String'];
@@ -3042,6 +3090,8 @@ export type Mutation = {
   suggestAssertionRevision?: Maybe<SuggestAssertionRevisionPayload>;
   /** Suggest a Revision to an EvidenceItem entity. */
   suggestEvidenceItemRevision?: Maybe<SuggestEvidenceItemRevisionPayload>;
+  /** Suggest a Revision to a Feature entity of instance type "Factor". */
+  suggestFactorRevision?: Maybe<SuggestFactorRevisionPayload>;
   /** Suggest a Revision to a Feature entity of instance type "Gene". */
   suggestGeneRevision?: Maybe<SuggestGeneRevisionPayload>;
   /** Suggest a Revision to a MolecularProfile entity. */
@@ -3178,6 +3228,11 @@ export type MutationSuggestEvidenceItemRevisionArgs = {
 };
 
 
+export type MutationSuggestFactorRevisionArgs = {
+  input: SuggestFactorRevisionInput;
+};
+
+
 export type MutationSuggestGeneRevisionArgs = {
   input: SuggestGeneRevisionInput;
 };
@@ -3852,10 +3907,15 @@ export type QueryAcmgCodesTypeaheadArgs = {
 
 
 export type QueryActivitiesArgs = {
+  activityType?: InputMaybe<ActivityTypeInput>;
   after?: InputMaybe<Scalars['String']>;
   before?: InputMaybe<Scalars['String']>;
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
+  mode?: InputMaybe<EventFeedMode>;
+  organizationId?: InputMaybe<Scalars['Int']>;
+  sortBy?: InputMaybe<DateSort>;
+  subject?: InputMaybe<SubscribableQueryInput>;
   userId?: InputMaybe<Scalars['Int']>;
 };
 
@@ -5230,6 +5290,45 @@ export type SuggestEvidenceItemRevisionPayload = {
   results: Array<RevisionResult>;
 };
 
+/** Autogenerated input type of SuggestFactorRevision */
+export type SuggestFactorRevisionInput = {
+  /** A unique identifier for the client performing the mutation. */
+  clientMutationId?: InputMaybe<Scalars['String']>;
+  /** Text describing the reason for the change. Will be attached to the Revision as a comment. */
+  comment: Scalars['String'];
+  /**
+   * The desired state of the Factors's editable fields if the change were applied.
+   * If no change is desired for a particular field, pass in the current value of that field.
+   */
+  fields: FactorFields;
+  /** The ID of the Feature of instance type "Factor" to suggest a Revision to. */
+  id: Scalars['Int'];
+  /**
+   * The ID of the organization to credit the user's contributions to.
+   * If the user belongs to a single organization or no organizations, this field is not required.
+   * This field is required if the user belongs to more than one organization.
+   * The user must belong to the organization provided.
+   */
+  organizationId?: InputMaybe<Scalars['Int']>;
+};
+
+/** Autogenerated return type of SuggestFactorRevision */
+export type SuggestFactorRevisionPayload = {
+  __typename: 'SuggestFactorRevisionPayload';
+  /** A unique identifier for the client performing the mutation. */
+  clientMutationId?: Maybe<Scalars['String']>;
+  /** The Gene the user has proposed a Revision to. */
+  factor: Factor;
+  /**
+   * A list of Revisions generated as a result of this suggestion.
+   * If an existing Revision exactly matches the proposed one, it will be returned instead.
+   * This is indicated via the 'newlyCreated' Boolean.
+   * Revisions are stored on a per-field basis.
+   * The changesetId can be used to group Revisions proposed at the same time.
+   */
+  results: Array<RevisionResult>;
+};
+
 /** Autogenerated input type of SuggestGeneRevision */
 export type SuggestGeneRevisionInput = {
   /** A unique identifier for the client performing the mutation. */
@@ -7256,6 +7355,22 @@ export type FullyCuratedSourceQueryVariables = Exact<{
 
 export type FullyCuratedSourceQuery = { __typename: 'Query', source?: { __typename: 'Source', fullyCurated: boolean } | undefined };
 
+export type FactorRevisableFieldsQueryVariables = Exact<{
+  featureId: Scalars['Int'];
+}>;
+
+
+export type FactorRevisableFieldsQuery = { __typename: 'Query', feature?: { __typename: 'Feature', id: number, name: string, fullName?: string | undefined, description?: string | undefined, featureAliases: Array<string>, sources: Array<{ __typename: 'Source', id: number, sourceType: SourceSource, citation?: string | undefined, citationId: string }>, featureInstance: { __typename: 'Factor', ncitId?: string | undefined } | { __typename: 'Gene' } } | undefined };
+
+export type RevisableFactorFieldsFragment = { __typename: 'Feature', id: number, name: string, fullName?: string | undefined, description?: string | undefined, featureAliases: Array<string>, sources: Array<{ __typename: 'Source', id: number, sourceType: SourceSource, citation?: string | undefined, citationId: string }>, featureInstance: { __typename: 'Factor', ncitId?: string | undefined } | { __typename: 'Gene' } };
+
+export type SuggestFactorRevisionMutationVariables = Exact<{
+  input: SuggestFactorRevisionInput;
+}>;
+
+
+export type SuggestFactorRevisionMutation = { __typename: 'Mutation', suggestFactorRevision?: { __typename: 'SuggestFactorRevisionPayload', clientMutationId?: string | undefined, results: Array<{ __typename: 'RevisionResult', newlyCreated: boolean, id: number, fieldName: string }> } | undefined };
+
 export type GeneRevisableFieldsQueryVariables = Exact<{
   featureId: Scalars['Int'];
 }>;
@@ -9400,6 +9515,26 @@ export const SubmittableEvidenceFieldsFragmentDoc = gql`
   }
 }
     `;
+export const RevisableFactorFieldsFragmentDoc = gql`
+    fragment RevisableFactorFields on Feature {
+  id
+  name
+  fullName
+  description
+  sources {
+    id
+    sourceType
+    citation
+    citationId
+  }
+  featureAliases
+  featureInstance {
+    ... on Factor {
+      ncitId
+    }
+  }
+}
+    `;
 export const RevisableGeneFieldsFragmentDoc = gql`
     fragment RevisableGeneFields on Feature {
   id
@@ -13353,6 +13488,47 @@ export const FullyCuratedSourceDocument = gql`
   export class FullyCuratedSourceGQL extends Apollo.Query<FullyCuratedSourceQuery, FullyCuratedSourceQueryVariables> {
     document = FullyCuratedSourceDocument;
     
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
+export const FactorRevisableFieldsDocument = gql`
+    query FactorRevisableFields($featureId: Int!) {
+  feature(id: $featureId) {
+    ...RevisableFactorFields
+  }
+}
+    ${RevisableFactorFieldsFragmentDoc}`;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class FactorRevisableFieldsGQL extends Apollo.Query<FactorRevisableFieldsQuery, FactorRevisableFieldsQueryVariables> {
+    document = FactorRevisableFieldsDocument;
+    
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
+export const SuggestFactorRevisionDocument = gql`
+    mutation SuggestFactorRevision($input: SuggestFactorRevisionInput!) {
+  suggestFactorRevision(input: $input) {
+    clientMutationId
+    results {
+      newlyCreated
+      id
+      fieldName
+    }
+  }
+}
+    `;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class SuggestFactorRevisionGQL extends Apollo.Mutation<SuggestFactorRevisionMutation, SuggestFactorRevisionMutationVariables> {
+    document = SuggestFactorRevisionDocument;
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
diff --git a/client/src/app/generated/server.model.graphql b/client/src/app/generated/server.model.graphql
index 51d9c01c4..45e80e238 100644
--- a/client/src/app/generated/server.model.graphql
+++ b/client/src/app/generated/server.model.graphql
@@ -2389,11 +2389,11 @@ enum EventAction {
   ASSERTION_SUBMITTED
   COMMENTED
   COMPLEX_MOLECULAR_PROFILE_CREATED
-  CREATED_FEATURE
   CURATED_SOURCE_SUGGESTION
   DEPRECATED_FEATURE
   DEPRECATED_MOLECULAR_PROFILE
   DEPRECATED_VARIANT
+  FEATURE_CREATED
   FLAGGED
   FLAG_RESOLVED
   PUBLICATION_SUGGESTED
@@ -3207,6 +3207,41 @@ type Factor implements Commentable & EventOriginObject & EventSubject & Flaggabl
   ): VariantConnection!
 }
 
+"""
+Fields on a Factor that curators may propose revisions to.
+"""
+input FactorFields {
+  """
+  List of aliases or alternate names for the Factor.
+  """
+  aliases: [String!]!
+
+  """
+  The Factor's description/summary text.
+  """
+  description: NullableStringInput!
+
+  """
+  The Factor's full name if applicable.
+  """
+  fullName: NullableStringInput!
+
+  """
+  The Factor's display name.
+  """
+  name: String!
+
+  """
+  NCI Thesaurus concept ID for this Factor
+  """
+  ncitId: NullableStringInput!
+
+  """
+  Source IDs cited by the Factor's summary.
+  """
+  sourceIds: [Int!]!
+}
+
 type FdaCode {
   code: String!
   description: String!
@@ -5254,6 +5289,16 @@ type Mutation {
     input: SuggestEvidenceItemRevisionInput!
   ): SuggestEvidenceItemRevisionPayload
 
+  """
+  Suggest a Revision to a Feature entity of instance type "Factor".
+  """
+  suggestFactorRevision(
+    """
+    Parameters for SuggestFactorRevision
+    """
+    input: SuggestFactorRevisionInput!
+  ): SuggestFactorRevisionPayload
+
   """
   Suggest a Revision to a Feature entity of instance type "Gene".
   """
@@ -8621,6 +8666,64 @@ type SuggestEvidenceItemRevisionPayload {
   results: [RevisionResult!]!
 }
 
+"""
+Autogenerated input type of SuggestFactorRevision
+"""
+input SuggestFactorRevisionInput {
+  """
+  A unique identifier for the client performing the mutation.
+  """
+  clientMutationId: String
+
+  """
+  Text describing the reason for the change. Will be attached to the Revision as a comment.
+  """
+  comment: String!
+
+  """
+  The desired state of the Factors's editable fields if the change were applied.
+  If no change is desired for a particular field, pass in the current value of that field.
+  """
+  fields: FactorFields!
+
+  """
+  The ID of the Feature of instance type "Factor" to suggest a Revision to.
+  """
+  id: Int!
+
+  """
+  The ID of the organization to credit the user's contributions to.
+  If the user belongs to a single organization or no organizations, this field is not required.
+  This field is required if the user belongs to more than one organization.
+  The user must belong to the organization provided.
+  """
+  organizationId: Int
+}
+
+"""
+Autogenerated return type of SuggestFactorRevision
+"""
+type SuggestFactorRevisionPayload {
+  """
+  A unique identifier for the client performing the mutation.
+  """
+  clientMutationId: String
+
+  """
+  The Gene the user has proposed a Revision to.
+  """
+  factor: Factor!
+
+  """
+  A list of Revisions generated as a result of this suggestion.
+  If an existing Revision exactly matches the proposed one, it will be returned instead.
+  This is indicated via the 'newlyCreated' Boolean.
+  Revisions are stored on a per-field basis.
+  The changesetId can be used to group Revisions proposed at the same time.
+  """
+  results: [RevisionResult!]!
+}
+
 """
 Autogenerated input type of SuggestGeneRevision
 """
diff --git a/client/src/app/generated/server.schema.json b/client/src/app/generated/server.schema.json
index 13ff52cd0..6953c5c3a 100644
--- a/client/src/app/generated/server.schema.json
+++ b/client/src/app/generated/server.schema.json
@@ -12327,7 +12327,7 @@
               "deprecationReason": null
             },
             {
-              "name": "CREATED_FEATURE",
+              "name": "FEATURE_CREATED",
               "description": null,
               "isDeprecated": false,
               "deprecationReason": null
@@ -15826,6 +15826,129 @@
           "enumValues": null,
           "possibleTypes": null
         },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "FactorFields",
+          "description": "Fields on a Factor that curators may propose revisions to.",
+          "fields": null,
+          "inputFields": [
+            {
+              "name": "description",
+              "description": "The Factor's description/summary text.",
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "INPUT_OBJECT",
+                  "name": "NullableStringInput",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "name",
+              "description": "The Factor's display name.",
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "fullName",
+              "description": "The Factor's full name if applicable.",
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "INPUT_OBJECT",
+                  "name": "NullableStringInput",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "ncitId",
+              "description": "NCI Thesaurus concept ID for this Factor",
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "INPUT_OBJECT",
+                  "name": "NullableStringInput",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "sourceIds",
+              "description": "Source IDs cited by the Factor's summary.",
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "SCALAR",
+                      "name": "Int",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "aliases",
+              "description": "List of aliases or alternate names for the Factor.",
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "SCALAR",
+                      "name": "String",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
         {
           "kind": "OBJECT",
           "name": "FdaCode",
@@ -24418,6 +24541,35 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "suggestFactorRevision",
+              "description": "Suggest a Revision to a Feature entity of instance type \"Factor\".",
+              "args": [
+                {
+                  "name": "input",
+                  "description": "Parameters for SuggestFactorRevision",
+                  "type": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "INPUT_OBJECT",
+                      "name": "SuggestFactorRevisionInput",
+                      "ofType": null
+                    }
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                }
+              ],
+              "type": {
+                "kind": "OBJECT",
+                "name": "SuggestFactorRevisionPayload",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "suggestGeneRevision",
               "description": "Suggest a Revision to a Feature entity of instance type \"Gene\".",
@@ -39787,6 +39939,152 @@
           "enumValues": null,
           "possibleTypes": null
         },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "SuggestFactorRevisionInput",
+          "description": "Autogenerated input type of SuggestFactorRevision",
+          "fields": null,
+          "inputFields": [
+            {
+              "name": "organizationId",
+              "description": "The ID of the organization to credit the user's contributions to.\nIf the user belongs to a single organization or no organizations, this field is not required.\nThis field is required if the user belongs to more than one organization.\nThe user must belong to the organization provided.",
+              "type": {
+                "kind": "SCALAR",
+                "name": "Int",
+                "ofType": null
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "id",
+              "description": "The ID of the Feature of instance type \"Factor\" to suggest a Revision to.",
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "fields",
+              "description": "The desired state of the Factors's editable fields if the change were applied.\nIf no change is desired for a particular field, pass in the current value of that field.",
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "INPUT_OBJECT",
+                  "name": "FactorFields",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "comment",
+              "description": "Text describing the reason for the change. Will be attached to the Revision as a comment.",
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "clientMutationId",
+              "description": "A unique identifier for the client performing the mutation.",
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "SuggestFactorRevisionPayload",
+          "description": "Autogenerated return type of SuggestFactorRevision",
+          "fields": [
+            {
+              "name": "clientMutationId",
+              "description": "A unique identifier for the client performing the mutation.",
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "factor",
+              "description": "The Gene the user has proposed a Revision to.",
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "Factor",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "results",
+              "description": "A list of Revisions generated as a result of this suggestion.\nIf an existing Revision exactly matches the proposed one, it will be returned instead.\nThis is indicated via the 'newlyCreated' Boolean.\nRevisions are stored on a per-field basis.\nThe changesetId can be used to group Revisions proposed at the same time.",
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "RevisionResult",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
         {
           "kind": "INPUT_OBJECT",
           "name": "SuggestGeneRevisionInput",
diff --git a/client/src/app/views/features/features-detail/features-detail.view.html b/client/src/app/views/features/features-detail/features-detail.view.html
index 0c102e3ff..dbe7dbc54 100644
--- a/client/src/app/views/features/features-detail/features-detail.view.html
+++ b/client/src/app/views/features/features-detail/features-detail.view.html
@@ -39,6 +39,7 @@
           <span *nzSpaceItem>
             <button
               [routerLink]="['/features', feature.id, 'revise']"
+              [queryParams]="{featureType: feature.featureInstance.__typename}"
               *ngIf="viewer.signedIn"
               routerLinkActive
               #rlaComments="routerLinkActive"
diff --git a/client/src/app/views/features/features-revise/features-suggest/features-suggest.module.ts b/client/src/app/views/features/features-revise/features-suggest/features-suggest.module.ts
index eba050339..cc202ac4e 100644
--- a/client/src/app/views/features/features-revise/features-suggest/features-suggest.module.ts
+++ b/client/src/app/views/features/features-revise/features-suggest/features-suggest.module.ts
@@ -9,6 +9,7 @@ import { LetDirective, PushPipe } from '@ngrx/component'
 import { NzPageHeaderModule } from 'ng-zorro-antd/page-header'
 import { CvcSectionNavigationModule } from '@app/components/shared/section-navigation/section-navigation.module'
 import { CvcGeneReviseFormModule } from '@app/forms/config/gene-revise/gene-revise.form.module'
+import { CvcFactorReviseForm } from '@app/forms/config/factor-revise/factor-revise.form'
 
 @NgModule({
   declarations: [FeaturesSuggestPage],
@@ -23,6 +24,7 @@ import { CvcGeneReviseFormModule } from '@app/forms/config/gene-revise/gene-revi
     NzPageHeaderModule,
     CvcGeneReviseFormModule,
     CvcSectionNavigationModule,
+    CvcFactorReviseForm,
   ],
 })
 export class FeaturesSuggestModule {}
diff --git a/client/src/app/views/features/features-revise/features-suggest/features-suggest.page.html b/client/src/app/views/features/features-revise/features-suggest/features-suggest.page.html
index c0d27a926..00f4b4779 100644
--- a/client/src/app/views/features/features-revise/features-suggest/features-suggest.page.html
+++ b/client/src/app/views/features/features-revise/features-suggest/features-suggest.page.html
@@ -1,4 +1,13 @@
-<ng-container *ngIf="featureId; else loadingFeature">
-  <cvc-gene-revise-form [featureId]="featureId"> </cvc-gene-revise-form>
+<ng-container *ngIf="featureId && featureType; else loadingFeature">
+  @switch (featureType) {
+    @case ('Gene') {
+      <span>
+        <cvc-gene-revise-form [featureId]="featureId"> </cvc-gene-revise-form>
+      </span>
+    }
+    @case ('Factor') {
+      <cvc-factor-revise-form [featureId]="featureId"> </cvc-factor-revise-form>
+    }
+  }
 </ng-container>
 <ng-template #loadingFeature>Loading Feature...</ng-template>
diff --git a/client/src/app/views/features/features-revise/features-suggest/features-suggest.page.ts b/client/src/app/views/features/features-revise/features-suggest/features-suggest.page.ts
index 5971932b9..a2b6972f2 100644
--- a/client/src/app/views/features/features-revise/features-suggest/features-suggest.page.ts
+++ b/client/src/app/views/features/features-revise/features-suggest/features-suggest.page.ts
@@ -9,15 +9,23 @@ import { Subscription } from 'rxjs'
 })
 export class FeaturesSuggestPage implements OnDestroy {
   featureId?: number
+  featureType?: string
   routeParams$: Subscription
+  queryParams$: Subscription
 
   constructor(private route: ActivatedRoute) {
     this.routeParams$ = this.route.params.subscribe((params) => {
       this.featureId = +params.featureId
     })
+    this.queryParams$ = this.route.queryParamMap.subscribe((params) => {
+      if (params.has('featureType')) {
+        this.featureType = params.get('featureType')!
+      }
+    })
   }
 
   ngOnDestroy(): void {
     this.routeParams$.unsubscribe()
+    this.queryParams$.unsubscribe()
   }
 }
diff --git a/server/app/graphql/types/events/event_action_type.rb b/server/app/graphql/types/events/event_action_type.rb
index 25e48b3fd..cb0384506 100644
--- a/server/app/graphql/types/events/event_action_type.rb
+++ b/server/app/graphql/types/events/event_action_type.rb
@@ -24,7 +24,7 @@ class EventActionType < Types::BaseEnum
     value 'VARIANT_CREATED', value: 'variant created'
     value 'COMPLEX_MOLECULAR_PROFILE_CREATED', value: 'complex molecular profile created'
     value 'DEPRECATED_FEATURE', value: 'deprecated feature'
-    value 'CREATED_FEATURE', value: 'created feature'
+    value 'FEATURE_CREATED', value: 'feature created'
   end
 end
 
diff --git a/server/app/graphql/types/mutation_type.rb b/server/app/graphql/types/mutation_type.rb
index d8d1aeaa9..974271c66 100644
--- a/server/app/graphql/types/mutation_type.rb
+++ b/server/app/graphql/types/mutation_type.rb
@@ -5,6 +5,7 @@ class MutationType < Types::BaseObject
 
     #revisions
     field :suggest_gene_revision, mutation: Mutations::SuggestGeneRevision
+    field :suggest_factor_revision, mutation: Mutations::SuggestFactorRevision
     field :suggest_variant_revision, mutation: Mutations::SuggestVariantRevision
     field :suggest_molecular_profile_revision, mutation: Mutations::SuggestMolecularProfileRevision
     field :suggest_evidence_item_revision, mutation: Mutations::SuggestEvidenceItemRevision
diff --git a/server/app/graphql/types/revisions/factor_fields.rb b/server/app/graphql/types/revisions/factor_fields.rb
index a41d7c26d..c5dd64f17 100644
--- a/server/app/graphql/types/revisions/factor_fields.rb
+++ b/server/app/graphql/types/revisions/factor_fields.rb
@@ -3,9 +3,9 @@ class FactorFields < Types::BaseInputObject
     description 'Fields on a Factor that curators may propose revisions to.'
     argument :description, Types::NullableValueInputType.for(GraphQL::Types::String), required: true,
       description: "The Factor's description/summary text."
-    argument :name, Types::NullableValueInputType.for(GraphQL::Types::String), required: true,
+    argument :name, GraphQL::Types::String, required: true,
       description: "The Factor's display name."
-    argument :name, Types::NullableValueInputType.for(GraphQL::Types::String), required: true,
+    argument :full_name, Types::NullableValueInputType.for(GraphQL::Types::String), required: true,
       description: "The Factor's full name if applicable."
     argument :ncit_id, Types::NullableValueInputType.for(GraphQL::Types::String), required: true,
       description: "NCI Thesaurus concept ID for this Factor"
diff --git a/server/app/lib/importer/entrez_symbols.rb b/server/app/lib/importer/entrez_symbols.rb
index cef20eeb2..fb4bd1e3b 100644
--- a/server/app/lib/importer/entrez_symbols.rb
+++ b/server/app/lib/importer/entrez_symbols.rb
@@ -56,10 +56,10 @@ def process_line(line)
           if synonym.strip == '-'
             nil
           else
-            Features::FeatureAlias.where(name: synonym).first_or_create
+            FeatureAlias.where(name: synonym).first_or_create
           end
         end.compact
-        synonyms << Features::FeatureAlias.where(name: line['Symbol']).first_or_create
+        synonyms << FeatureAlias.where(name: line['Symbol']).first_or_create
         gene.feature.feature_aliases = synonyms.uniq
       end
 
diff --git a/server/app/models/concerns/is_feature_instance.rb b/server/app/models/concerns/is_feature_instance.rb
index a7cfb365f..a938550f2 100644
--- a/server/app/models/concerns/is_feature_instance.rb
+++ b/server/app/models/concerns/is_feature_instance.rb
@@ -29,5 +29,7 @@ module IsFeatureInstance
     delegate :events, to: :feature
     delegate :last_submitted_revision_event, to: :feature
     delegate :link, to: :feature
+
+    delegate_missing_to :feature
   end
 end
diff --git a/server/app/models/feature.rb b/server/app/models/feature.rb
index 828a7f08c..80053c3a1 100644
--- a/server/app/models/feature.rb
+++ b/server/app/models/feature.rb
@@ -6,7 +6,7 @@ class Feature < ApplicationRecord
   include WithTimepointCounts
 
   delegated_type :feature_instance, types: %w[ Features::Gene Features::Factor ]
-  has_and_belongs_to_many :feature_aliases, class_name: 'Features::FeatureAlias'
+  has_and_belongs_to_many :feature_aliases
   has_and_belongs_to_many :sources
 
   has_one :deprecation_activity,
@@ -26,7 +26,7 @@ class Feature < ApplicationRecord
   searchkick highlight: [:name, :aliases, :feature_type], callbacks: :async
   scope :search_import, -> { includes(:feature_aliases) }
 
-  validates :name, presence: true, uniqueness: { scope: :feature_instance_type }
+  validates :name, uniqueness: { scope: :feature_instance_type }
 
   def search_data
     {
diff --git a/server/app/models/features/feature_alias.rb b/server/app/models/feature_alias.rb
similarity index 77%
rename from server/app/models/features/feature_alias.rb
rename to server/app/models/feature_alias.rb
index 7362dfa2c..763e4c09e 100644
--- a/server/app/models/features/feature_alias.rb
+++ b/server/app/models/feature_alias.rb
@@ -1,7 +1,11 @@
-class Features::FeatureAlias < ActiveRecord::Base
+class FeatureAlias < ActiveRecord::Base
   validates :name, presence: true, uniqueness: true
   has_and_belongs_to_many :features
 
+  def display_name
+    name
+  end
+
   def self.get_or_create_by_name(name)
     if found = self.where('lower(name) = ?', name.downcase).first
       found
diff --git a/server/app/models/input_adaptors/factor_input_adaptor.rb b/server/app/models/input_adaptors/factor_input_adaptor.rb
index a8a7e0157..5af1f7766 100644
--- a/server/app/models/input_adaptors/factor_input_adaptor.rb
+++ b/server/app/models/input_adaptors/factor_input_adaptor.rb
@@ -7,11 +7,7 @@ def initialize(factor_input_object: )
   end
 
   def perform
-    f = Features::Factor.new(
-      ncit_id: input.ncit_id
-    )
-
-    Feature.new(
+    f = Feature.new(
       description: input.description,
       source_ids: input.source_ids,
       name: input.name,
@@ -19,12 +15,17 @@ def perform
       feature_alias_ids: get_alias_ids,
       feature_instance: f
     )
+
+    Features::Factor.new(
+      ncit_id: input.ncit_id,
+      feature: f
+    )
   end
 
   private
   def get_alias_ids
     input.aliases.map do |a|
-      FeatureAliases.get_or_create_by_name(a).id
+      FeatureAlias.get_or_create_by_name(a).id
     end
   end
 end
diff --git a/server/misc_scripts/features/backfill_gene_feature.rb b/server/misc_scripts/features/backfill_gene_feature.rb
index eec815bed..37942c2a4 100644
--- a/server/misc_scripts/features/backfill_gene_feature.rb
+++ b/server/misc_scripts/features/backfill_gene_feature.rb
@@ -14,7 +14,7 @@
   )
 
   gene.gene_aliases.each do |gene_alias|
-    feature_alias = Features::FeatureAlias.where(name: gene_alias.name).first_or_create
+    feature_alias = FeatureAlias.where(name: gene_alias.name).first_or_create
     feature.feature_aliases << feature_alias
   end
 

From de65a64fb3be5a222cb64dda57baca1fc7998b76 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Feb 2024 17:58:03 +0000
Subject: [PATCH 087/125] Bump undici from 5.26.3 to 5.28.3 in /client

Bumps [undici](https://github.com/nodejs/undici) from 5.26.3 to 5.28.3.
- [Release notes](https://github.com/nodejs/undici/releases)
- [Commits](https://github.com/nodejs/undici/compare/v5.26.3...v5.28.3)

---
updated-dependencies:
- dependency-name: undici
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 client/yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/yarn.lock b/client/yarn.lock
index 54bbb7efb..0a2853f87 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -9173,9 +9173,9 @@ unc-path-regex@^0.1.2:
   integrity sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==
 
 undici@^5.12.0:
-  version "5.26.3"
-  resolved "https://registry.yarnpkg.com/undici/-/undici-5.26.3.tgz#ab3527b3d5bb25b12f898dfd22165d472dd71b79"
-  integrity sha512-H7n2zmKEWgOllKkIUkLvFmsJQj062lSm3uA4EYApG8gLuiOM0/go9bIoC3HVaSnfg4xunowDE2i9p8drkXuvDw==
+  version "5.28.3"
+  resolved "https://registry.yarnpkg.com/undici/-/undici-5.28.3.tgz#a731e0eff2c3fcfd41c1169a869062be222d1e5b"
+  integrity sha512-3ItfzbrhDlINjaP0duwnNsKpDQk3acHI3gVJ1z4fmwMK31k5G9OVIAMLSIaP6w4FaGkaAkN6zaQO9LUvZ1t7VA==
   dependencies:
     "@fastify/busboy" "^2.0.0"
 

From 678a0c666fbe2175633ce1a386f4973b81d54e3c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 Feb 2024 22:33:29 +0000
Subject: [PATCH 088/125] Bump ip from 2.0.0 to 2.0.1 in /client

Bumps [ip](https://github.com/indutny/node-ip) from 2.0.0 to 2.0.1.
- [Commits](https://github.com/indutny/node-ip/compare/v2.0.0...v2.0.1)

---
updated-dependencies:
- dependency-name: ip
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 client/yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/yarn.lock b/client/yarn.lock
index 54bbb7efb..442871c1c 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -5996,9 +5996,9 @@ invariant@^2.2.4:
     loose-envify "^1.0.0"
 
 ip@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da"
-  integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.1.tgz#e8f3595d33a3ea66490204234b77636965307105"
+  integrity sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ==
 
 ipaddr.js@1.9.1:
   version "1.9.1"

From 295a6a6c540a59dfea01815cf7dd44a3624fadb5 Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Wed, 21 Feb 2024 12:03:13 -0600
Subject: [PATCH 089/125] basic feature-select working with factors

---
 ...orm-submission-status-display.component.ts |  27 +-
 .../feature-quick-add.form.html               |  27 ++
 .../feature-quick-add.form.ts                 | 234 ++++++++++++++++++
 .../feature-quick-add.query.gql               |  13 +
 .../feature-select/feature-select.module.ts   |   5 +-
 .../feature-select/feature-select.query.gql   |   3 +
 .../feature-select/feature-select.type.html   |  63 +++--
 .../feature-select/feature-select.type.ts     |  32 ++-
 client/src/app/generated/civic.apollo.ts      | 223 ++++++++++-------
 .../graphql/types/revisions/linkout_data.rb   |   8 +-
 server/app/models/feature.rb                  |   2 +-
 server/app/models/features/factor.rb          |   2 +-
 12 files changed, 511 insertions(+), 128 deletions(-)
 create mode 100644 client/src/app/forms/types/feature-select/feature-quick-add/feature-quick-add.form.html
 create mode 100644 client/src/app/forms/types/feature-select/feature-quick-add/feature-quick-add.form.ts
 create mode 100644 client/src/app/forms/types/feature-select/feature-quick-add/feature-quick-add.query.gql

diff --git a/client/src/app/forms/components/form-submission-status-display/form-submission-status-display.component.ts b/client/src/app/forms/components/form-submission-status-display/form-submission-status-display.component.ts
index b636446a7..799f850f1 100644
--- a/client/src/app/forms/components/form-submission-status-display/form-submission-status-display.component.ts
+++ b/client/src/app/forms/components/form-submission-status-display/form-submission-status-display.component.ts
@@ -7,8 +7,8 @@ import {
 } from '@angular/core'
 import { Router } from '@angular/router'
 import { MutationState } from '@app/core/utilities/mutation-state-wrapper'
-import { Maybe } from '@app/generated/civic.apollo';
-import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
+import { Maybe } from '@app/generated/civic.apollo'
+import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy'
 
 @UntilDestroy()
 @Component({
@@ -18,27 +18,27 @@ import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
 })
 export class CvcFormSubmissionStatusDisplayComponent implements OnInit {
   private _mutationState?: MutationState
-  private currentTimer?:  ReturnType<typeof setTimeout>
+  private currentTimer?: ReturnType<typeof setTimeout>
 
   @Input() set mutationState(value: Maybe<MutationState>) {
     this._mutationState = value
-    if(this.currentTimer) {
+    if (this.currentTimer) {
       clearTimeout(this.currentTimer)
     }
 
-    if(value) {
+    if (value) {
       value.submitSuccess$.pipe(untilDestroyed(this)).subscribe((success) => {
-        if(success) {
-          this.currentTimer = setTimeout(() => { 
-              if(this.redirectUrl) {
-                this.router.navigateByUrl(this.redirectUrl) 
-              }
-            }, 2500);
+        if (success) {
+          this.currentTimer = setTimeout(() => {
+            if (this.redirectUrl) {
+              this.router.navigateByUrl(this.redirectUrl)
+            }
+          }, 2500)
         }
       })
     }
   }
-  
+
   get mutationState(): Maybe<MutationState> {
     return this._mutationState
   }
@@ -55,11 +55,12 @@ export class CvcFormSubmissionStatusDisplayComponent implements OnInit {
     | 'Comment'
     | 'Gene'
     | 'Variant Group'
+    | 'Feature'
 
   @Input() successMessage?: TemplateRef<void>
   @Input() redirectUrl?: string
 
   constructor(private router: Router) {}
 
-  ngOnInit(): void { }
+  ngOnInit(): void {}
 }
diff --git a/client/src/app/forms/types/feature-select/feature-quick-add/feature-quick-add.form.html b/client/src/app/forms/types/feature-select/feature-quick-add/feature-quick-add.form.html
new file mode 100644
index 000000000..32eb03d89
--- /dev/null
+++ b/client/src/app/forms/types/feature-select/feature-quick-add/feature-quick-add.form.html
@@ -0,0 +1,27 @@
+<ng-container *ngIf="showForm$ | ngrxPush">
+  <ng-container *ngrxLet="formMessageDisplay$ as display">
+    <span>{{ display.message }}</span>
+  </ng-container>
+  <cvc-form-submission-status-display
+    [mutationState]="this.mutationState"
+    entityType="Feature"
+    [successMessage]="success">
+    <!-- FIXME: network errors (e.g. not logged in err) are not being displayed -->
+    <ng-template #success>{{ successMessage }}</ng-template>
+    <form
+      [formGroup]="form"
+      (ngSubmit)="onSubmit$.next(model)">
+      <nz-row [nzGutter]="[0, 0]">
+        <nz-col nzSpan="24">
+          <formly-form
+            [form]="form"
+            [fields]="fields"
+            [model]="model"
+            [options]="options"
+            (modelChange)="model = $event">
+          </formly-form>
+        </nz-col>
+      </nz-row>
+    </form>
+  </cvc-form-submission-status-display>
+</ng-container>
diff --git a/client/src/app/forms/types/feature-select/feature-quick-add/feature-quick-add.form.ts b/client/src/app/forms/types/feature-select/feature-quick-add/feature-quick-add.form.ts
new file mode 100644
index 000000000..3692123be
--- /dev/null
+++ b/client/src/app/forms/types/feature-select/feature-quick-add/feature-quick-add.form.ts
@@ -0,0 +1,234 @@
+import { CommonModule } from '@angular/common'
+import {
+  ChangeDetectionStrategy,
+  Component,
+  EventEmitter,
+  Input,
+  OnChanges,
+  Output,
+  SimpleChanges,
+} from '@angular/core'
+import { ReactiveFormsModule, UntypedFormGroup } from '@angular/forms'
+import { NetworkErrorsService } from '@app/core/services/network-errors.service'
+import {
+  MutationState,
+  MutatorWithState,
+} from '@app/core/utilities/mutation-state-wrapper'
+import { CvcFormSubmissionStatusDisplayModule } from '@app/forms/components/form-submission-status-display/form-submission-status-display.module'
+import { NoStateFormOptions } from '@app/forms/states/base.state'
+import {
+  CreateableFeatureTypes,
+  FeatureInstanceTypes,
+  Maybe,
+  QuickAddFeatureGQL,
+  QuickAddFeatureMutation,
+  QuickAddFeatureMutationVariables,
+} from '@app/generated/civic.apollo'
+import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy'
+import { LetDirective, PushPipe } from '@ngrx/component'
+import { FormlyFieldConfig, FormlyModule } from '@ngx-formly/core'
+import { NzFormLayoutType } from 'ng-zorro-antd/form'
+import { NzGridModule } from 'ng-zorro-antd/grid'
+import { BehaviorSubject, Subject } from 'rxjs'
+
+type FeatureQuickAddModel = {
+  name?: string
+  organizationId?: number
+  featureType?: CreateableFeatureTypes
+}
+
+type FeatureQuickAddDisplay = {
+  message?: string
+}
+
+export type FeatureIdWithCreationStatus = {
+  id: number
+  new: boolean
+}
+
+@UntilDestroy()
+@Component({
+  standalone: true,
+  imports: [
+    CommonModule,
+    ReactiveFormsModule,
+    CvcFormSubmissionStatusDisplayModule,
+    LetDirective,
+    PushPipe,
+    FormlyModule,
+    NzGridModule,
+  ],
+  selector: 'cvc-feature-quick-add-form',
+  templateUrl: './feature-quick-add.form.html',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class CvcFeatureQuickAddForm implements OnChanges {
+  @Input()
+  set cvcFeatureType(type: Maybe<FeatureInstanceTypes>) {
+    if (!type) return
+    this.featureType$.next(type)
+  }
+
+  @Input()
+  set cvcSearchString(str: string) {
+    if (!str) return
+    this.searchString$.next(str)
+  }
+
+  @Output() cvcOnCreate = new EventEmitter<FeatureIdWithCreationStatus>()
+
+  model: Partial<QuickAddFeatureMutationVariables>
+  form: UntypedFormGroup
+  fields: FormlyFieldConfig[]
+  options: NoStateFormOptions
+  formLayout: NzFormLayoutType
+
+  // SOURCE STREAMS
+  onSubmit$: Subject<FeatureQuickAddModel>
+  searchString$: BehaviorSubject<Maybe<string>>
+
+  // PRESENTATION STREAMS
+  featureType$: BehaviorSubject<Maybe<FeatureInstanceTypes>>
+  formMessageDisplay$: BehaviorSubject<FeatureQuickAddDisplay>
+  showForm$: BehaviorSubject<boolean> = new BehaviorSubject(false)
+
+  addFeatureMutator: MutatorWithState<
+    QuickAddFeatureGQL,
+    QuickAddFeatureMutation,
+    QuickAddFeatureMutationVariables
+  >
+
+  mutationState?: MutationState
+  successMessage?: string
+  minNameLength: number
+
+  constructor(
+    private query: QuickAddFeatureGQL,
+    private errors: NetworkErrorsService
+  ) {
+    // configure form
+    this.form = new UntypedFormGroup({})
+    this.model = { name: '' }
+    this.formLayout = 'horizontal'
+    this.options = { formState: { formLayout: this.formLayout } }
+
+    this.onSubmit$ = new Subject<FeatureQuickAddModel>()
+    this.searchString$ = new BehaviorSubject<Maybe<string>>(undefined)
+
+    this.featureType$ = new BehaviorSubject<Maybe<FeatureInstanceTypes>>(
+      undefined
+    )
+    this.formMessageDisplay$ = new BehaviorSubject<FeatureQuickAddDisplay>({
+      message: 'Feature does not exist, create it?',
+    })
+
+    this.addFeatureMutator = new MutatorWithState(this.errors)
+
+    this.minNameLength = 3
+
+    this.fields = [
+      {
+        key: 'featureType',
+        hide: true,
+        props: {
+          required: true,
+        },
+      },
+      {
+        key: 'name',
+        hide: true,
+        props: {
+          minLength: this.minNameLength,
+          required: true,
+        },
+      },
+      {
+        key: 'organizationId',
+        type: 'org-submit-button',
+        props: {
+          submitLabel: 'Add Feature',
+        },
+      },
+    ]
+
+    // keep form module updated w/ Inputs
+    this.featureType$
+      .pipe(untilDestroyed(this))
+      .subscribe((type: Maybe<FeatureInstanceTypes>) => {
+        //TODO - this is hacky, maybe need to rework the types on the backend
+        if (
+          Object.values(CreateableFeatureTypes).includes(
+            type as unknown as CreateableFeatureTypes
+          )
+        ) {
+          this.model.featureType = type as unknown as CreateableFeatureTypes
+          this.showForm$.next(true)
+        } else {
+          this.showForm$.next(false)
+        }
+      })
+
+    this.searchString$
+      .pipe(untilDestroyed(this))
+      .subscribe((str: Maybe<string>) => {
+        this.model.name = str
+        if (
+          str === undefined ||
+          (str !== undefined && str.length < this.minNameLength)
+        ) {
+          this.formMessageDisplay$.next({
+            message: `New Feature name must be at least ${this.minNameLength} characters.`,
+          })
+        } else {
+          this.formMessageDisplay$.next({
+            message: `Feature '${str}' does not exist, create it?`,
+          })
+        }
+      })
+
+    // handle submit events from form
+    this.onSubmit$.pipe(untilDestroyed(this)).subscribe((model) => {
+      console.log('feature-quick-add form model submitted.', model)
+      this.submitFeature(model)
+    })
+  }
+
+  submitFeature(model: FeatureQuickAddModel) {
+    if (!(model.name && model.featureType)) {
+      console.error(
+        `feature-quick-add form submitFeature requires model with valid name and featureType.`
+      )
+      return
+    }
+    this.mutationState = this.addFeatureMutator.mutate(
+      this.query,
+      {
+        name: model.name,
+        featureType: model.featureType,
+        organizationId: model.organizationId,
+      },
+      {},
+      (data) => {
+        console.log('feature-quick-add submit data callback', data)
+        if (!data.createFeature) return
+        this.formMessageDisplay$.next({ message: undefined })
+        setTimeout(() => {
+          if (data && data.createFeature) {
+            this.cvcOnCreate.next({
+              id: data.createFeature.feature.id,
+              new: data.createFeature.new,
+            })
+          }
+        }, 1000)
+      }
+    )
+  }
+
+  ngOnChanges(changes: SimpleChanges): void {
+    if (changes.cvcFeatureType) {
+      const ft = changes.cvcFeatureType.currentValue
+      this.featureType$.next(ft)
+      this.model = { ...this.model, featureType: ft }
+    }
+  }
+}
diff --git a/client/src/app/forms/types/feature-select/feature-quick-add/feature-quick-add.query.gql b/client/src/app/forms/types/feature-select/feature-quick-add/feature-quick-add.query.gql
new file mode 100644
index 000000000..38b1b5d86
--- /dev/null
+++ b/client/src/app/forms/types/feature-select/feature-quick-add/feature-quick-add.query.gql
@@ -0,0 +1,13 @@
+mutation QuickAddFeature($name: String!, $organizationId: Int, $featureType: CreateableFeatureTypes!) {
+  createFeature(input: { name: $name,  organizationId: $organizationId, featureType: $featureType }) {
+    ...QuickAddFeatureFields
+  }
+}
+
+fragment QuickAddFeatureFields on CreateFeaturePayload {
+  clientMutationId
+  new
+  feature {
+    ...FeatureSummaryFields
+  }
+}
diff --git a/client/src/app/forms/types/feature-select/feature-select.module.ts b/client/src/app/forms/types/feature-select/feature-select.module.ts
index fa7fbdea3..c9a041060 100644
--- a/client/src/app/forms/types/feature-select/feature-select.module.ts
+++ b/client/src/app/forms/types/feature-select/feature-select.module.ts
@@ -1,6 +1,6 @@
 import { CommonModule } from '@angular/common'
 import { NgModule } from '@angular/core'
-import { ReactiveFormsModule } from '@angular/forms'
+import { FormsModule, ReactiveFormsModule } from '@angular/forms'
 import { CvcPipesModule } from '@app/core/pipes/pipes.module'
 import { CvcEntitySelectModule } from '@app/forms/components/entity-select/entity-select.module'
 import { CvcEntityTagModule } from '@app/forms/components/entity-tag/entity-tag.module'
@@ -22,6 +22,7 @@ import {
   CvcFeatureSelectFieldConfig,
   CvcFeatureSelectFieldProps,
 } from './feature-select.type'
+import { CvcFeatureQuickAddForm } from './feature-quick-add/feature-quick-add.form'
 
 const typeConfig: ConfigOption = {
   types: [
@@ -49,6 +50,7 @@ const typeConfig: ConfigOption = {
   imports: [
     CommonModule,
     ReactiveFormsModule,
+    FormsModule,
     LetDirective,
     PushPipe,
     FormlyModule.forChild(typeConfig),
@@ -66,6 +68,7 @@ const typeConfig: ConfigOption = {
     CvcEntitySelectModule,
     CvcPipesModule,
     CvcEntityTagModule,
+    CvcFeatureQuickAddForm,
   ],
   exports: [CvcFeatureSelectField],
 })
diff --git a/client/src/app/forms/types/feature-select/feature-select.query.gql b/client/src/app/forms/types/feature-select/feature-select.query.gql
index 4fa7bc812..ccf6721e0 100644
--- a/client/src/app/forms/types/feature-select/feature-select.query.gql
+++ b/client/src/app/forms/types/feature-select/feature-select.query.gql
@@ -20,5 +20,8 @@ fragment FeatureSelectTypeaheadFields on Feature {
     ... on Gene {
       entrezId
     }
+    ... on Factor {
+      ncitId
+    }
   }
 }
diff --git a/client/src/app/forms/types/feature-select/feature-select.type.html b/client/src/app/forms/types/feature-select/feature-select.type.html
index 974f9ea09..50d8ff65f 100644
--- a/client/src/app/forms/types/feature-select/feature-select.type.html
+++ b/client/src/app/forms/types/feature-select/feature-select.type.html
@@ -1,20 +1,40 @@
 <!-- NOTE: entity-field.mixin provides the observables passed to cvc-entity-select below -->
-<cvc-entity-select
-  [cvcSelectMode]="props.isMultiSelect ? 'multiple' : 'default'"
-  [cvcCustomTemplate]="selectedTemplate"
-  [cvcFormControl]="formControl"
-  [cvcFormlyAttributes]="field"
-  [cvcPlaceholder]="props.placeholder"
-  [cvcEntityName]="props.entityName"
-  [cvcResults]="result$ | ngrxPush"
-  [cvcOptions]="selectOption$ | ngrxPush"
-  [cvcShowError]="showError"
-  [cvcLoading]="isLoading$ | ngrxPush"
-  (cvcOnSearch)="onSearch$.next($event)"
-  (cvcOnOpenChange)="onOpenChange$.next($event)"
-  (cvcSelectComponent)="selectComponent = $event"
-  (cvcOnModelChange)="props.change && props.change(field, $event)">
-</cvc-entity-select>
+<nz-row [nzGutter]="[6, 6]">
+  <nz-col nzFlex="100px">
+    <nz-form-item>
+      <nz-select
+        [(ngModel)]="selectedFeatureType"
+        (ngModelChange)="this.onFeatureType$?.next($event)">
+        <nz-option
+          nzValue="GENE"
+          nzLabel="Gene"></nz-option>
+        <nz-option
+          nzValue="FACTOR"
+          nzLabel="Factor"></nz-option>
+      </nz-select>
+    </nz-form-item>
+  </nz-col>
+  <nz-col nzFlex="auto">
+    <cvc-entity-select
+      [cvcSelectMode]="props.isMultiSelect ? 'multiple' : 'default'"
+      [cvcCustomTemplate]="selectedTemplate"
+      [cvcFormControl]="formControl"
+      [cvcFormlyAttributes]="field"
+      [cvcPlaceholder]="props.placeholder"
+      [cvcEntityName]="props.entityName"
+      [cvcAddEntity]="addFeature"
+      [cvcAddEntityBehavior]="showAddBehavior"
+      [cvcResults]="result$ | ngrxPush"
+      [cvcOptions]="selectOption$ | ngrxPush"
+      [cvcShowError]="showError"
+      [cvcLoading]="isLoading$ | ngrxPush"
+      (cvcOnSearch)="onSearch$.next($event)"
+      (cvcOnOpenChange)="onOpenChange$.next($event)"
+      (cvcSelectComponent)="selectComponent = $event"
+      (cvcOnModelChange)="props.change && props.change(field, $event)">
+    </cvc-entity-select>
+  </nz-col>
+</nz-row>
 
 <!-- select option templates -->
 <!-- result$ updates generate an array of #optionTemplates. entity-tag-field.mixin watches #optionTemplates changes, and attaches each to an NzSelectOptionTemplateInterface an object, which are emitted from selectOption$. selectOption$ is passed to <cvc-entity-select> via [cvcOptions] above -->
@@ -61,3 +81,14 @@
       (cvcOnClose)="onTagClose$.next(selected.nzValue)"></cvc-entity-tag>
   </div>
 </ng-template>
+
+<ng-template
+  #addFeature
+  let-searchStr
+  let-model="model">
+  <cvc-feature-quick-add-form
+    [cvcSearchString]="searchStr"
+    [cvcFeatureType]="onFeatureType$ | ngrxPush"
+    (cvcOnCreate)="onSelectOrCreate($event)">
+  </cvc-feature-quick-add-form>
+</ng-template>
diff --git a/client/src/app/forms/types/feature-select/feature-select.type.ts b/client/src/app/forms/types/feature-select/feature-select.type.ts
index 71f3e7208..e6d3c54bf 100644
--- a/client/src/app/forms/types/feature-select/feature-select.type.ts
+++ b/client/src/app/forms/types/feature-select/feature-select.type.ts
@@ -17,7 +17,7 @@ import { BaseFieldType } from '@app/forms/mixins/base/base-field'
 import { EntitySelectField } from '@app/forms/mixins/entity-select-field.mixin'
 import { CvcFormFieldExtraType } from '@app/forms/wrappers/form-field/form-field.wrapper'
 import {
-    FeatureInstanceTypes,
+  FeatureInstanceTypes,
   FeatureSelectTagGQL,
   FeatureSelectTagQuery,
   FeatureSelectTagQueryVariables,
@@ -31,6 +31,8 @@ import { FieldTypeConfig, FormlyFieldConfig } from '@ngx-formly/core'
 import { FormlyFieldProps } from '@ngx-formly/ng-zorro-antd/form-field'
 import { NzSelectOptionInterface } from 'ng-zorro-antd/select'
 import mixin from 'ts-mixin-extended'
+import { FeatureIdWithCreationStatus } from './feature-quick-add/feature-quick-add.form'
+import { BehaviorSubject } from 'rxjs'
 
 export type CvcFeatureSelectFieldOption = Partial<
   FieldTypeConfig<Partial<CvcFeatureSelectFieldProps>>
@@ -82,15 +84,18 @@ export class CvcFeatureSelectField
       placeholder: 'Search Features',
       isMultiSelect: false,
       entityName: { singular: 'Feature', plural: 'Features' },
-      description:
-        'Feature Name',
+      description: 'Feature Name',
     },
-    featureType: FeatureInstanceTypes.Gene
+    featureType: FeatureInstanceTypes.Gene,
   }
 
   @ViewChildren('optionTemplates', { read: TemplateRef })
   optionTemplates?: QueryList<TemplateRef<any>>
 
+  selectedFeatureType: FeatureInstanceTypes = this.defaultOptions.featureType
+  onFeatureType$?: BehaviorSubject<Maybe<FeatureInstanceTypes>> =
+    new BehaviorSubject<Maybe<FeatureInstanceTypes>>(undefined)
+
   constructor(
     private taq: FeatureSelectTypeaheadGQL,
     private tq: FeatureSelectTagGQL,
@@ -120,7 +125,7 @@ export class CvcFeatureSelectField
   } // ngAfterViewInit()
 
   getTypeaheadVarsFn(str: string): FeatureSelectTypeaheadQueryVariables {
-    return { queryTerm: str, featureType: this.props.featureType }
+    return { queryTerm: str, featureType: this.selectedFeatureType }
   }
 
   getTypeaheadResultsFn(r: ApolloQueryResult<FeatureSelectTypeaheadQuery>) {
@@ -156,4 +161,21 @@ export class CvcFeatureSelectField
       }
     )
   }
+
+  showAddBehavior(
+    s: string,
+    results: FeatureSelectTypeaheadFieldsFragment[]
+  ): boolean {
+    const searchName = s.toLowerCase()
+    return (
+      s.length >= 3 && !results.some((v) => v.name.toLowerCase() === searchName)
+    )
+  }
+
+  onSelectOrCreate(feature: FeatureIdWithCreationStatus) {
+    this.onPopulate$.next(feature.id)
+    if (this.props.isNewlyCreatedCallback) {
+      this.props.isNewlyCreatedCallback(feature.new)
+    }
+  }
 }
diff --git a/client/src/app/generated/civic.apollo.ts b/client/src/app/generated/civic.apollo.ts
index 583587e7e..cff60f903 100644
--- a/client/src/app/generated/civic.apollo.ts
+++ b/client/src/app/generated/civic.apollo.ts
@@ -7588,22 +7588,33 @@ export type EvidenceSelectTagQuery = { __typename: 'Query', evidenceItem?: { __t
 
 export type EvidenceSelectTypeaheadFieldsFragment = { __typename: 'EvidenceItem', id: number, name: string, link: string, evidenceType: EvidenceType, evidenceDirection: EvidenceDirection, evidenceLevel: EvidenceLevel, evidenceRating?: number | undefined, significance: EvidenceSignificance, variantOrigin: VariantOrigin, status: EvidenceStatus };
 
+export type QuickAddFeatureMutationVariables = Exact<{
+  name: Scalars['String'];
+  organizationId?: InputMaybe<Scalars['Int']>;
+  featureType: CreateableFeatureTypes;
+}>;
+
+
+export type QuickAddFeatureMutation = { __typename: 'Mutation', createFeature?: { __typename: 'CreateFeaturePayload', clientMutationId?: string | undefined, new: boolean, feature: { __typename: 'Feature', id: number, name: string, fullName?: string | undefined, link: string, featureInstance: { __typename: 'Factor', id: number, name: string, description?: string | undefined, featureAliases: Array<string>, ncitId?: string | undefined, deprecated: boolean, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceUrl?: string | undefined, displayType: string, sourceType: SourceSource }>, ncitDetails?: { __typename: 'NcitDetails', synonyms: Array<{ __typename: 'NcitSynonym', name: string, source: string }>, definitions: Array<{ __typename: 'NcitDefinition', definition: string, source: string }> } | undefined, creationActivity?: { __typename: 'CreateFeatureActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, deprecationActivity?: { __typename: 'DeprecateFeatureActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined } | { __typename: 'Gene', id: number, description?: string | undefined, featureAliases: Array<string>, entrezId: number, name: string, myGeneInfoDetails?: any | undefined, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceUrl?: string | undefined, displayType: string, sourceType: SourceSource }> } } } | undefined };
+
+export type QuickAddFeatureFieldsFragment = { __typename: 'CreateFeaturePayload', clientMutationId?: string | undefined, new: boolean, feature: { __typename: 'Feature', id: number, name: string, fullName?: string | undefined, link: string, featureInstance: { __typename: 'Factor', id: number, name: string, description?: string | undefined, featureAliases: Array<string>, ncitId?: string | undefined, deprecated: boolean, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceUrl?: string | undefined, displayType: string, sourceType: SourceSource }>, ncitDetails?: { __typename: 'NcitDetails', synonyms: Array<{ __typename: 'NcitSynonym', name: string, source: string }>, definitions: Array<{ __typename: 'NcitDefinition', definition: string, source: string }> } | undefined, creationActivity?: { __typename: 'CreateFeatureActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, deprecationActivity?: { __typename: 'DeprecateFeatureActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined } | { __typename: 'Gene', id: number, description?: string | undefined, featureAliases: Array<string>, entrezId: number, name: string, myGeneInfoDetails?: any | undefined, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceUrl?: string | undefined, displayType: string, sourceType: SourceSource }> } } };
+
 export type FeatureSelectTypeaheadQueryVariables = Exact<{
   queryTerm: Scalars['String'];
   featureType?: InputMaybe<FeatureInstanceTypes>;
 }>;
 
 
-export type FeatureSelectTypeaheadQuery = { __typename: 'Query', featureTypeahead: Array<{ __typename: 'Feature', id: number, name: string, featureAliases: Array<string>, link: string, featureInstance: { __typename: 'Factor' } | { __typename: 'Gene', entrezId: number } }> };
+export type FeatureSelectTypeaheadQuery = { __typename: 'Query', featureTypeahead: Array<{ __typename: 'Feature', id: number, name: string, featureAliases: Array<string>, link: string, featureInstance: { __typename: 'Factor', ncitId?: string | undefined } | { __typename: 'Gene', entrezId: number } }> };
 
 export type FeatureSelectTagQueryVariables = Exact<{
   featureId: Scalars['Int'];
 }>;
 
 
-export type FeatureSelectTagQuery = { __typename: 'Query', feature?: { __typename: 'Feature', id: number, name: string, featureAliases: Array<string>, link: string, featureInstance: { __typename: 'Factor' } | { __typename: 'Gene', entrezId: number } } | undefined };
+export type FeatureSelectTagQuery = { __typename: 'Query', feature?: { __typename: 'Feature', id: number, name: string, featureAliases: Array<string>, link: string, featureInstance: { __typename: 'Factor', ncitId?: string | undefined } | { __typename: 'Gene', entrezId: number } } | undefined };
 
-export type FeatureSelectTypeaheadFieldsFragment = { __typename: 'Feature', id: number, name: string, featureAliases: Array<string>, link: string, featureInstance: { __typename: 'Factor' } | { __typename: 'Gene', entrezId: number } };
+export type FeatureSelectTypeaheadFieldsFragment = { __typename: 'Feature', id: number, name: string, featureAliases: Array<string>, link: string, featureInstance: { __typename: 'Factor', ncitId?: string | undefined } | { __typename: 'Gene', entrezId: number } };
 
 export type MolecularProfileSelectTypeaheadQueryVariables = Exact<{
   name: Scalars['String'];
@@ -9727,6 +9738,102 @@ export const EvidenceSelectTypeaheadFieldsFragmentDoc = gql`
   status
 }
     `;
+export const GeneSummaryFieldsFragmentDoc = gql`
+    fragment GeneSummaryFields on Gene {
+  id
+  description
+  featureAliases
+  entrezId
+  name
+  sources {
+    id
+    citation
+    link
+    sourceUrl
+    displayType
+    sourceType
+  }
+  myGeneInfoDetails
+}
+    `;
+export const NcitDetailsFragmentDoc = gql`
+    fragment NcitDetails on NcitDetails {
+  synonyms {
+    name
+    source
+  }
+  definitions {
+    definition
+    source
+  }
+}
+    `;
+export const FactorSummaryFieldsFragmentDoc = gql`
+    fragment FactorSummaryFields on Factor {
+  id
+  name
+  description
+  featureAliases
+  ncitId
+  deprecated
+  sources {
+    id
+    citation
+    link
+    sourceUrl
+    displayType
+    sourceType
+  }
+  ncitDetails {
+    ...NcitDetails
+  }
+  creationActivity {
+    user {
+      id
+      displayName
+      role
+      profileImagePath(size: 32)
+    }
+    createdAt
+  }
+  deprecationActivity {
+    user {
+      id
+      displayName
+      role
+      profileImagePath(size: 32)
+    }
+    createdAt
+  }
+}
+    ${NcitDetailsFragmentDoc}`;
+export const FeatureSummaryFieldsFragmentDoc = gql`
+    fragment FeatureSummaryFields on Feature {
+  id
+  name
+  fullName
+  link
+  featureInstance {
+    __typename
+    ... on Gene {
+      ...GeneSummaryFields
+    }
+    ... on Factor {
+      ...FactorSummaryFields
+    }
+  }
+}
+    ${GeneSummaryFieldsFragmentDoc}
+${FactorSummaryFieldsFragmentDoc}`;
+export const QuickAddFeatureFieldsFragmentDoc = gql`
+    fragment QuickAddFeatureFields on CreateFeaturePayload {
+  clientMutationId
+  new
+  feature {
+    ...FeatureSummaryFields
+  }
+}
+    ${FeatureSummaryFieldsFragmentDoc}`;
 export const FeatureSelectTypeaheadFieldsFragmentDoc = gql`
     fragment FeatureSelectTypeaheadFields on Feature {
   id
@@ -9738,6 +9845,9 @@ export const FeatureSelectTypeaheadFieldsFragmentDoc = gql`
     ... on Gene {
       entrezId
     }
+    ... on Factor {
+      ncitId
+    }
   }
 }
     `;
@@ -10168,93 +10278,6 @@ export const FeatureDetailFieldsFragmentDoc = gql`
   }
 }
     ${ParsedCommentFragmentFragmentDoc}`;
-export const GeneSummaryFieldsFragmentDoc = gql`
-    fragment GeneSummaryFields on Gene {
-  id
-  description
-  featureAliases
-  entrezId
-  name
-  sources {
-    id
-    citation
-    link
-    sourceUrl
-    displayType
-    sourceType
-  }
-  myGeneInfoDetails
-}
-    `;
-export const NcitDetailsFragmentDoc = gql`
-    fragment NcitDetails on NcitDetails {
-  synonyms {
-    name
-    source
-  }
-  definitions {
-    definition
-    source
-  }
-}
-    `;
-export const FactorSummaryFieldsFragmentDoc = gql`
-    fragment FactorSummaryFields on Factor {
-  id
-  name
-  description
-  featureAliases
-  ncitId
-  deprecated
-  sources {
-    id
-    citation
-    link
-    sourceUrl
-    displayType
-    sourceType
-  }
-  ncitDetails {
-    ...NcitDetails
-  }
-  creationActivity {
-    user {
-      id
-      displayName
-      role
-      profileImagePath(size: 32)
-    }
-    createdAt
-  }
-  deprecationActivity {
-    user {
-      id
-      displayName
-      role
-      profileImagePath(size: 32)
-    }
-    createdAt
-  }
-}
-    ${NcitDetailsFragmentDoc}`;
-export const FeatureSummaryFieldsFragmentDoc = gql`
-    fragment FeatureSummaryFields on Feature {
-  id
-  name
-  fullName
-  link
-  featureInstance {
-    __typename
-    ... on Gene {
-      ...GeneSummaryFields
-    }
-    ... on Factor {
-      ...FactorSummaryFields
-    }
-  }
-}
-    ${GeneSummaryFieldsFragmentDoc}
-${FactorSummaryFieldsFragmentDoc}`;
 export const MolecularProfileDetailFieldsFragmentDoc = gql`
     fragment MolecularProfileDetailFields on MolecularProfile {
   id
@@ -14054,6 +14077,26 @@ export const EvidenceSelectTagDocument = gql`
   export class EvidenceSelectTagGQL extends Apollo.Query<EvidenceSelectTagQuery, EvidenceSelectTagQueryVariables> {
     document = EvidenceSelectTagDocument;
     
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
+export const QuickAddFeatureDocument = gql`
+    mutation QuickAddFeature($name: String!, $organizationId: Int, $featureType: CreateableFeatureTypes!) {
+  createFeature(
+    input: {name: $name, organizationId: $organizationId, featureType: $featureType}
+  ) {
+    ...QuickAddFeatureFields
+  }
+}
+    ${QuickAddFeatureFieldsFragmentDoc}`;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class QuickAddFeatureGQL extends Apollo.Mutation<QuickAddFeatureMutation, QuickAddFeatureMutationVariables> {
+    document = QuickAddFeatureDocument;
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
diff --git a/server/app/graphql/types/revisions/linkout_data.rb b/server/app/graphql/types/revisions/linkout_data.rb
index c28d9f957..4b52c13c9 100644
--- a/server/app/graphql/types/revisions/linkout_data.rb
+++ b/server/app/graphql/types/revisions/linkout_data.rb
@@ -6,7 +6,7 @@ class LinkoutData < Types::BaseObject
     field :diff_value, Types::Revisions::ModeratedFieldDiffType, null: false
 
     def self.from_revision(r)
-      if r.field_name.ends_with?('_id') || r.field_name.ends_with?('_ids')
+      if (r.field_name.ends_with?('_id') || r.field_name.ends_with?('_ids')) && ! non_object_fields.include?(r.field_name)
         current_set = Set.new(Array(r.current_value))
         suggested_set = Set.new(Array(r.suggested_value))
         {
@@ -112,5 +112,11 @@ def self.value_for_set(r, set:)
 
       return values
     end
+
+    def self.non_object_fields
+      @nof ||= [
+        'ncit_id'
+      ]
+    end
   end
 end
diff --git a/server/app/models/feature.rb b/server/app/models/feature.rb
index 80053c3a1..1ca371d54 100644
--- a/server/app/models/feature.rb
+++ b/server/app/models/feature.rb
@@ -26,7 +26,7 @@ class Feature < ApplicationRecord
   searchkick highlight: [:name, :aliases, :feature_type], callbacks: :async
   scope :search_import, -> { includes(:feature_aliases) }
 
-  validates :name, uniqueness: { scope: :feature_instance_type }
+#  validates :name, uniqueness: { scope: :feature_instance_type }
 
   def search_data
     {
diff --git a/server/app/models/features/factor.rb b/server/app/models/features/factor.rb
index 9ecd7410c..5852bf850 100644
--- a/server/app/models/features/factor.rb
+++ b/server/app/models/features/factor.rb
@@ -15,7 +15,7 @@ def editable_fields
         :name,
         :full_name,
         :description,
-        :ncit_id,
+        :ncit_code,
         :source_ids,
         :feature_alias_ids
       ]

From cf48538d3366b80bcde9b61c98171cb85097f7eb Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Thu, 22 Feb 2024 09:24:59 -0600
Subject: [PATCH 090/125] fix ncit editable field definition

---
 server/app/models/features/factor.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/app/models/features/factor.rb b/server/app/models/features/factor.rb
index 5852bf850..9ecd7410c 100644
--- a/server/app/models/features/factor.rb
+++ b/server/app/models/features/factor.rb
@@ -15,7 +15,7 @@ def editable_fields
         :name,
         :full_name,
         :description,
-        :ncit_code,
+        :ncit_id,
         :source_ids,
         :feature_alias_ids
       ]

From 70b03ef473c6f690e2993d22aad4605f56687837 Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Thu, 22 Feb 2024 11:20:15 -0600
Subject: [PATCH 091/125] rails minor version bump for security update

---
 server/Gemfile.lock | 130 ++++++++++++++++++++++----------------------
 1 file changed, 65 insertions(+), 65 deletions(-)

diff --git a/server/Gemfile.lock b/server/Gemfile.lock
index ff2dac44d..cf3be4681 100644
--- a/server/Gemfile.lock
+++ b/server/Gemfile.lock
@@ -1,35 +1,35 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.1.3)
-      actionpack (= 7.1.3)
-      activesupport (= 7.1.3)
+    actioncable (7.1.3.2)
+      actionpack (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.1.3)
-      actionpack (= 7.1.3)
-      activejob (= 7.1.3)
-      activerecord (= 7.1.3)
-      activestorage (= 7.1.3)
-      activesupport (= 7.1.3)
+    actionmailbox (7.1.3.2)
+      actionpack (= 7.1.3.2)
+      activejob (= 7.1.3.2)
+      activerecord (= 7.1.3.2)
+      activestorage (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.1.3)
-      actionpack (= 7.1.3)
-      actionview (= 7.1.3)
-      activejob (= 7.1.3)
-      activesupport (= 7.1.3)
+    actionmailer (7.1.3.2)
+      actionpack (= 7.1.3.2)
+      actionview (= 7.1.3.2)
+      activejob (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.2)
-    actionpack (7.1.3)
-      actionview (= 7.1.3)
-      activesupport (= 7.1.3)
+    actionpack (7.1.3.2)
+      actionview (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       nokogiri (>= 1.8.5)
       racc
       rack (>= 2.2.4)
@@ -37,15 +37,15 @@ GEM
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    actiontext (7.1.3)
-      actionpack (= 7.1.3)
-      activerecord (= 7.1.3)
-      activestorage (= 7.1.3)
-      activesupport (= 7.1.3)
+    actiontext (7.1.3.2)
+      actionpack (= 7.1.3.2)
+      activerecord (= 7.1.3.2)
+      activestorage (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.1.3)
-      activesupport (= 7.1.3)
+    actionview (7.1.3.2)
+      activesupport (= 7.1.3.2)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
@@ -55,23 +55,23 @@ GEM
       activemodel (>= 5.2.0)
       activestorage (>= 5.2.0)
       activesupport (>= 5.2.0)
-    activejob (7.1.3)
-      activesupport (= 7.1.3)
+    activejob (7.1.3.2)
+      activesupport (= 7.1.3.2)
       globalid (>= 0.3.6)
     activejob-null (0.0.1)
-    activemodel (7.1.3)
-      activesupport (= 7.1.3)
-    activerecord (7.1.3)
-      activemodel (= 7.1.3)
-      activesupport (= 7.1.3)
+    activemodel (7.1.3.2)
+      activesupport (= 7.1.3.2)
+    activerecord (7.1.3.2)
+      activemodel (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       timeout (>= 0.4.0)
-    activestorage (7.1.3)
-      actionpack (= 7.1.3)
-      activejob (= 7.1.3)
-      activerecord (= 7.1.3)
-      activesupport (= 7.1.3)
+    activestorage (7.1.3.2)
+      actionpack (= 7.1.3.2)
+      activejob (= 7.1.3.2)
+      activerecord (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       marcel (~> 1.0)
-    activesupport (7.1.3)
+    activesupport (7.1.3.2)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -213,7 +213,7 @@ GEM
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
     io-console (0.7.2)
-    irb (1.11.1)
+    irb (1.11.2)
       rdoc
       reline (>= 0.4.2)
     jaro_winkler (1.5.6)
@@ -253,13 +253,13 @@ GEM
     method_source (1.0.0)
     mini_magick (4.12.0)
     mini_mime (1.1.5)
-    minitest (5.21.2)
+    minitest (5.22.2)
     msgpack (1.7.2)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.3.0)
     mutex_m (0.2.0)
-    net-imap (0.4.9.1)
+    net-imap (0.4.10)
       date
       net-protocol
     net-pop (0.1.2)
@@ -274,17 +274,17 @@ GEM
       net-protocol
     net-ssh (7.2.1)
     nio4r (2.7.0)
-    nokogiri (1.16.0-aarch64-linux)
+    nokogiri (1.16.2-aarch64-linux)
       racc (~> 1.4)
-    nokogiri (1.16.0-arm-linux)
+    nokogiri (1.16.2-arm-linux)
       racc (~> 1.4)
-    nokogiri (1.16.0-arm64-darwin)
+    nokogiri (1.16.2-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.0-x86-linux)
+    nokogiri (1.16.2-x86-linux)
       racc (~> 1.4)
-    nokogiri (1.16.0-x86_64-darwin)
+    nokogiri (1.16.2-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.0-x86_64-linux)
+    nokogiri (1.16.2-x86_64-linux)
       racc (~> 1.4)
     oauth2 (1.4.11)
       faraday (>= 0.17.3, < 3.0)
@@ -334,7 +334,7 @@ GEM
       nio4r (~> 2.0)
     raabro (1.4.0)
     racc (1.7.3)
-    rack (2.2.8)
+    rack (2.2.8.1)
     rack-cors (1.1.1)
       rack (>= 2.0.0)
     rack-mini-profiler (2.3.4)
@@ -351,20 +351,20 @@ GEM
     rackup (1.0.0)
       rack (< 3)
       webrick
-    rails (7.1.3)
-      actioncable (= 7.1.3)
-      actionmailbox (= 7.1.3)
-      actionmailer (= 7.1.3)
-      actionpack (= 7.1.3)
-      actiontext (= 7.1.3)
-      actionview (= 7.1.3)
-      activejob (= 7.1.3)
-      activemodel (= 7.1.3)
-      activerecord (= 7.1.3)
-      activestorage (= 7.1.3)
-      activesupport (= 7.1.3)
+    rails (7.1.3.2)
+      actioncable (= 7.1.3.2)
+      actionmailbox (= 7.1.3.2)
+      actionmailer (= 7.1.3.2)
+      actionpack (= 7.1.3.2)
+      actiontext (= 7.1.3.2)
+      actionview (= 7.1.3.2)
+      activejob (= 7.1.3.2)
+      activemodel (= 7.1.3.2)
+      activerecord (= 7.1.3.2)
+      activestorage (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       bundler (>= 1.15.0)
-      railties (= 7.1.3)
+      railties (= 7.1.3.2)
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
@@ -372,9 +372,9 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    railties (7.1.3)
-      actionpack (= 7.1.3)
-      activesupport (= 7.1.3)
+    railties (7.1.3.2)
+      actionpack (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       irb
       rackup (>= 1.0.0)
       rake (>= 12.2)
@@ -524,7 +524,7 @@ GEM
     xpath (3.2.0)
       nokogiri (~> 1.8)
     yard (0.9.34)
-    zeitwerk (2.6.12)
+    zeitwerk (2.6.13)
 
 PLATFORMS
   aarch64-linux
@@ -595,4 +595,4 @@ RUBY VERSION
    ruby 3.3.0p0
 
 BUNDLED WITH
-   2.5.3
+   2.5.6

From f593d781e654bf718db42edd65b989c0963f215e Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Wed, 13 Mar 2024 10:59:02 -0500
Subject: [PATCH 092/125] add babel-plugin-macros dependency explicitly

---
 server/package.json |   3 +-
 server/yarn.lock    | 144 ++++++++++++++++++++++++++++++++++++--------
 2 files changed, 121 insertions(+), 26 deletions(-)

diff --git a/server/package.json b/server/package.json
index a9fda8b4e..8e9ebe1d2 100644
--- a/server/package.json
+++ b/server/package.json
@@ -8,7 +8,8 @@
   },
   "version": "0.1.0",
   "devDependencies": {
-    "webpack-dev-server": "4.15.1"
+    "webpack-dev-server": "4.15.1",
+    "babel-plugin-macros": "3.1.0"
   },
   "babel": {
     "presets": [
diff --git a/server/yarn.lock b/server/yarn.lock
index d1edf0da6..a9064b0ef 100644
--- a/server/yarn.lock
+++ b/server/yarn.lock
@@ -10,6 +10,14 @@
     "@jridgewell/gen-mapping" "^0.3.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.23.5":
+  version "7.23.5"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.23.5.tgz#9009b69a8c602293476ad598ff53e4562e15c244"
+  integrity sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==
+  dependencies:
+    "@babel/highlight" "^7.23.4"
+    chalk "^2.4.2"
+
 "@babel/code-frame@^7.22.13":
   version "7.22.13"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.13.tgz#e3c1c099402598483b7a8c46a721d1038803755e"
@@ -18,14 +26,6 @@
     "@babel/highlight" "^7.22.13"
     chalk "^2.4.2"
 
-"@babel/code-frame@^7.23.5":
-  version "7.23.5"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.23.5.tgz#9009b69a8c602293476ad598ff53e4562e15c244"
-  integrity sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==
-  dependencies:
-    "@babel/highlight" "^7.23.4"
-    chalk "^2.4.2"
-
 "@babel/compat-data@^7.22.6", "@babel/compat-data@^7.23.3", "@babel/compat-data@^7.23.5":
   version "7.23.5"
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.23.5.tgz#ffb878728bb6bdcb6f4510aa51b1be9afb8cfd98"
@@ -697,13 +697,13 @@
     "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
 "@babel/plugin-transform-object-rest-spread@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.23.4.tgz#2b9c2d26bf62710460bdc0d1730d4f1048361b83"
-  integrity sha512-9x9K1YyeQVw0iOXJlIzwm8ltobIIv7j2iLyP2jIhEbqPRQ7ScNgwQufU2I0Gq11VjyG4gI4yMXt2VFags+1N3g==
+  version "7.24.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.24.0.tgz#7b836ad0088fdded2420ce96d4e1d3ed78b71df1"
+  integrity sha512-y/yKMm7buHpFFXfxVFS4Vk1ToRJDilIa6fKRioB9Vjichv58TDGXTvqV0dN7plobAmTW5eSEGXDngE+Mm+uO+w==
   dependencies:
-    "@babel/compat-data" "^7.23.3"
-    "@babel/helper-compilation-targets" "^7.22.15"
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/compat-data" "^7.23.5"
+    "@babel/helper-compilation-targets" "^7.23.6"
+    "@babel/helper-plugin-utils" "^7.24.0"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
     "@babel/plugin-transform-parameters" "^7.23.3"
 
@@ -958,6 +958,13 @@
   resolved "https://registry.yarnpkg.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310"
   integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==
 
+"@babel/runtime@^7.12.5":
+  version "7.24.0"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.0.tgz#584c450063ffda59697021430cb47101b085951e"
+  integrity sha512-Chk32uHMg6TnQdvw2e9IlqPpFX/6NLuK0Ys2PqLb7/gL5uFn9mXvK715FGLlOLQrcO4qIkNHkvPGktzzXexsFw==
+  dependencies:
+    regenerator-runtime "^0.14.0"
+
 "@babel/runtime@^7.15.4":
   version "7.23.9"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.9.tgz#47791a15e4603bb5f905bc0753801cf21d6345f7"
@@ -1052,9 +1059,9 @@
   integrity sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==
 
 "@jridgewell/set-array@^1.0.1":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72"
-  integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.2.1.tgz#558fb6472ed16a4c850b889530e6b36438c49280"
+  integrity sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==
 
 "@jridgewell/source-map@^0.3.3":
   version "0.3.5"
@@ -1070,9 +1077,9 @@
   integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==
 
 "@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.9":
-  version "0.3.19"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz#f8a3249862f91be48d3127c3cfe992f79b4b8811"
-  integrity sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==
+  version "0.3.25"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz#15f190e98895f3fc23276ee14bc76b675c2e50f0"
+  integrity sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==
   dependencies:
     "@jridgewell/resolve-uri" "^3.1.0"
     "@jridgewell/sourcemap-codec" "^1.4.14"
@@ -1240,6 +1247,11 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.0.tgz#62797cee3b8b497f6547503b2312254d4fe3c2bb"
   integrity sha512-eMhwJXc931Ihh4tkU+Y7GiLzT/y/DBNpNtr4yU9O2w3SYBsr9NaOPhQlLKRmoWtI54uNwuo0IOUFQjVOTZYRvw==
 
+"@types/parse-json@^4.0.0":
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.2.tgz#5950e50960793055845e956c427fc2b0d70c5239"
+  integrity sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==
+
 "@types/qs@*":
   version "6.9.11"
   resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.11.tgz#208d8a30bc507bd82e03ada29e4732ea46a6bbda"
@@ -1545,6 +1557,15 @@ babel-loader@^8.2.2:
     make-dir "^3.1.0"
     schema-utils "^2.6.5"
 
+babel-plugin-macros@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz#9ef6dc74deb934b4db344dc973ee851d148c50c1"
+  integrity sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    cosmiconfig "^7.0.0"
+    resolve "^1.19.0"
+
 babel-plugin-polyfill-corejs2@^0.4.8:
   version "0.4.8"
   resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.8.tgz#dbcc3c8ca758a290d47c3c6a490d59429b0d2269"
@@ -1673,6 +1694,11 @@ call-bind@^1.0.0:
     function-bind "^1.1.1"
     get-intrinsic "^1.0.2"
 
+callsites@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
+  integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
+
 caniuse-lite@^1.0.30001565:
   version "1.0.30001579"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001579.tgz#45c065216110f46d6274311a4b3fcf6278e0852a"
@@ -1819,9 +1845,9 @@ content-disposition@0.5.4:
     safe-buffer "5.2.1"
 
 content-type@~1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
-  integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918"
+  integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==
 
 convert-source-map@^2.0.0:
   version "2.0.0"
@@ -1850,6 +1876,17 @@ core-util-is@~1.0.0:
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
   integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
 
+cosmiconfig@^7.0.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.1.0.tgz#1443b9afa596b670082ea46cbd8f6a62b84635f6"
+  integrity sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==
+  dependencies:
+    "@types/parse-json" "^4.0.0"
+    import-fresh "^3.2.1"
+    parse-json "^5.0.0"
+    path-type "^4.0.0"
+    yaml "^1.10.0"
+
 cross-spawn@^7.0.3:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
@@ -1962,6 +1999,13 @@ envinfo@^7.7.3:
   resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.11.1.tgz#2ffef77591057081b0129a8fd8cf6118da1b94e1"
   integrity sha512-8PiZgZNIB4q/Lw4AhOvAfB/ityHAd2bli3lESSWmWSzSsl5dKpy5N1d1Rfkd2teq/g9xN90lc6o98DOjMeYHpg==
 
+error-ex@^1.3.1:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
+  integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
+  dependencies:
+    is-arrayish "^0.2.1"
+
 es-module-lexer@^1.2.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.4.1.tgz#41ea21b43908fe6a287ffcbe4300f790555331f5"
@@ -2365,6 +2409,14 @@ iconv-lite@0.4.24:
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
+import-fresh@^3.2.1:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
+  integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
+  dependencies:
+    parent-module "^1.0.0"
+    resolve-from "^4.0.0"
+
 import-local@^3.0.2:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.1.0.tgz#b4479df8a5fd44f6cdce24070675676063c95cb4"
@@ -2406,6 +2458,11 @@ ipaddr.js@^2.0.1:
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.1.0.tgz#2119bc447ff8c257753b196fc5f1ce08a4cdf39f"
   integrity sha512-LlbxQ7xKzfBusov6UMi4MFpEg0m+mAm9xyNGEduwXMEDuf4WfzB/RZwMVYEd7IKGvh4IUkEXYxtAVu9T3OelJQ==
 
+is-arrayish@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
+  integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==
+
 is-binary-path@~2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
@@ -2519,7 +2576,7 @@ jsesc@~0.5.0:
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
   integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=
 
-json-parse-even-better-errors@^2.3.1:
+json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
   integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
@@ -2559,6 +2616,11 @@ launch-editor@^2.6.0:
     picocolors "^1.0.0"
     shell-quote "^1.8.1"
 
+lines-and-columns@^1.1.6:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
+  integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
+
 loader-runner@^4.2.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1"
@@ -2836,6 +2898,23 @@ p-try@^2.0.0:
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
   integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
+parent-module@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
+  integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==
+  dependencies:
+    callsites "^3.0.0"
+
+parse-json@^5.0.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
+  integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    error-ex "^1.3.1"
+    json-parse-even-better-errors "^2.3.0"
+    lines-and-columns "^1.1.6"
+
 parseurl@~1.3.2, parseurl@~1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
@@ -2871,6 +2950,11 @@ path-to-regexp@0.1.7:
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
   integrity sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==
 
+path-type@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
+  integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
+
 picocolors@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
@@ -3048,6 +3132,11 @@ resolve-cwd@^3.0.0:
   dependencies:
     resolve-from "^5.0.0"
 
+resolve-from@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
+  integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
+
 resolve-from@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
@@ -3061,7 +3150,7 @@ resolve@^1.14.2:
     is-core-module "^2.2.0"
     path-parse "^1.0.6"
 
-resolve@^1.9.0:
+resolve@^1.19.0, resolve@^1.9.0:
   version "1.22.8"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d"
   integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==
@@ -3651,3 +3740,8 @@ yallist@^3.0.2:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
   integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
+
+yaml@^1.10.0:
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
+  integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==

From c66f56585a48087beb07df8c553e46db2dc37646 Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Wed, 13 Mar 2024 11:17:23 -0500
Subject: [PATCH 093/125] additional missing deps

---
 server/package.json |  3 ++-
 server/yarn.lock    | 22 +++++++++++++++++++---
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/server/package.json b/server/package.json
index 8e9ebe1d2..1bd600be9 100644
--- a/server/package.json
+++ b/server/package.json
@@ -9,7 +9,8 @@
   "version": "0.1.0",
   "devDependencies": {
     "webpack-dev-server": "4.15.1",
-    "babel-plugin-macros": "3.1.0"
+    "babel-plugin-macros": "3.1.0",
+    "@babel/plugin-proposal-object-rest-spread": "7.20.7"
   },
   "babel": {
     "presets": [
diff --git a/server/yarn.lock b/server/yarn.lock
index a9064b0ef..b6e8d576b 100644
--- a/server/yarn.lock
+++ b/server/yarn.lock
@@ -26,7 +26,7 @@
     "@babel/highlight" "^7.22.13"
     chalk "^2.4.2"
 
-"@babel/compat-data@^7.22.6", "@babel/compat-data@^7.23.3", "@babel/compat-data@^7.23.5":
+"@babel/compat-data@^7.20.5", "@babel/compat-data@^7.22.6", "@babel/compat-data@^7.23.5":
   version "7.23.5"
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.23.5.tgz#ffb878728bb6bdcb6f4510aa51b1be9afb8cfd98"
   integrity sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==
@@ -76,7 +76,7 @@
   dependencies:
     "@babel/types" "^7.22.15"
 
-"@babel/helper-compilation-targets@^7.22.15", "@babel/helper-compilation-targets@^7.22.6", "@babel/helper-compilation-targets@^7.23.6":
+"@babel/helper-compilation-targets@^7.20.7", "@babel/helper-compilation-targets@^7.22.15", "@babel/helper-compilation-targets@^7.22.6", "@babel/helper-compilation-targets@^7.23.6":
   version "7.23.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz#4d79069b16cbcf1461289eccfbbd81501ae39991"
   integrity sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==
@@ -184,6 +184,11 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz#dd7ee3735e8a313b9f7b05a773d892e88e6d7295"
   integrity sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==
 
+"@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.24.0":
+  version "7.24.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.0.tgz#945681931a52f15ce879fd5b86ce2dae6d3d7f2a"
+  integrity sha512-9cUznXMG0+FxRuJfvL82QlTqIzhVW9sL0KjMPHhAOOvpQGL8QtdxnBKILjBqxlHyliz0yCa1G903ZXI/FuHy2w==
+
 "@babel/helper-remap-async-to-generator@^7.22.20":
   version "7.22.20"
   resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.20.tgz#7b68e1cb4fa964d2996fd063723fb48eca8498e0"
@@ -326,6 +331,17 @@
     "@babel/helper-create-class-features-plugin" "^7.18.6"
     "@babel/helper-plugin-utils" "^7.18.6"
 
+"@babel/plugin-proposal-object-rest-spread@7.20.7":
+  version "7.20.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz#aa662940ef425779c75534a5c41e9d936edc390a"
+  integrity sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==
+  dependencies:
+    "@babel/compat-data" "^7.20.5"
+    "@babel/helper-compilation-targets" "^7.20.7"
+    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
+    "@babel/plugin-transform-parameters" "^7.20.7"
+
 "@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2":
   version "7.21.0-placeholder-for-preset-env.2"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz#7844f9289546efa9febac2de4cfe358a050bd703"
@@ -732,7 +748,7 @@
     "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
 
-"@babel/plugin-transform-parameters@^7.23.3":
+"@babel/plugin-transform-parameters@^7.20.7", "@babel/plugin-transform-parameters@^7.23.3":
   version "7.23.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.23.3.tgz#83ef5d1baf4b1072fa6e54b2b0999a7b2527e2af"
   integrity sha512-09lMt6UsUb3/34BbECKVbVwrT9bO6lILWln237z7sLaWnMsTi7Yc9fhX5DLpkJzAGfaReXI22wP41SZmnAA3Vw==

From c745a519088769033da9a125597683d0e2c80192 Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Thu, 14 Mar 2024 18:17:03 -0500
Subject: [PATCH 094/125] some tweaks to avoid circular delegation dependencies

---
 server/app/models/actions/accept_revisions.rb |  9 +++++--
 .../models/concerns/is_feature_instance.rb    | 26 -------------------
 server/app/models/feature.rb                  |  2 +-
 3 files changed, 8 insertions(+), 29 deletions(-)

diff --git a/server/app/models/actions/accept_revisions.rb b/server/app/models/actions/accept_revisions.rb
index 1aefa64e2..79a93cbae 100644
--- a/server/app/models/actions/accept_revisions.rb
+++ b/server/app/models/actions/accept_revisions.rb
@@ -15,10 +15,15 @@ def execute
     revisions.each{|r| r.lock!}
     subject.lock!
 
+    receiver = if subject.is_a?(Feature)
+                 subject.feature_instance
+               else
+                 subject
+               end
     revisions.each do |revision|
-      subject.send("#{revision.field_name}=", revision.suggested_value)
+      receiver.send("#{revision.field_name}=", revision.suggested_value)
     end
-    subject.save!
+    receiver.save!
 
     revisions.each do |revision|
       revision.status = 'accepted'
diff --git a/server/app/models/concerns/is_feature_instance.rb b/server/app/models/concerns/is_feature_instance.rb
index a938550f2..dd42437e8 100644
--- a/server/app/models/concerns/is_feature_instance.rb
+++ b/server/app/models/concerns/is_feature_instance.rb
@@ -4,32 +4,6 @@ module IsFeatureInstance
   included do
     has_one :feature, as: :feature_instance, touch: true, autosave: true
 
-    delegate :name, :name=, to: :feature
-    delegate :description, :description=, to: :feature
-    delegate :full_name, :full_name=, to: :feature
-    delegate :deprecated, :deprecated=, to: :feature
-    delegate :deprecation_activity, :deprecating_user, to: :feature
-    delegate :creation_activity, :creating_user, to: :feature
-    delegate :feature_aliases, to: :feature
-    delegate :sources, to: :feature
-    delegate :source_ids, to: :feature
-    delegate :variants, to: :feature
-
-    delegate :flagged, to: :feature
-    delegate :flags, to: :feature
-    delegate :most_recent_flag, to: :feature
-
-    delegate :comments, to: :feature
-    delegate :last_comment_event, to: :feature
-
-    delegate :revisions, to: :feature
-    delegate :open_revisions, to: :feature
-    delegate :last_accepted_revision, to: :feature
-    delegate :last_accepted_revision_event, to: :feature
-    delegate :events, to: :feature
-    delegate :last_submitted_revision_event, to: :feature
-    delegate :link, to: :feature
-
     delegate_missing_to :feature
   end
 end
diff --git a/server/app/models/feature.rb b/server/app/models/feature.rb
index 1ca371d54..ecc1deaf7 100644
--- a/server/app/models/feature.rb
+++ b/server/app/models/feature.rb
@@ -5,7 +5,7 @@ class Feature < ApplicationRecord
   include Subscribable
   include WithTimepointCounts
 
-  delegated_type :feature_instance, types: %w[ Features::Gene Features::Factor ]
+  delegated_type :feature_instance, types: %w[ Features::Gene Features::Factor ], touch: true, autosave: true
   has_and_belongs_to_many :feature_aliases
   has_and_belongs_to_many :sources
 

From ba75183ca4855be1aee47a14e8465fdaf14af508 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 16 Mar 2024 22:54:36 +0000
Subject: [PATCH 095/125] Bump follow-redirects from 1.15.4 to 1.15.6 in
 /server

Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.4 to 1.15.6.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.15.4...v1.15.6)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 server/yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/yarn.lock b/server/yarn.lock
index b6e8d576b..8ac0c9f5d 100644
--- a/server/yarn.lock
+++ b/server/yarn.lock
@@ -2204,9 +2204,9 @@ flat@^5.0.2:
   integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==
 
 follow-redirects@^1.0.0:
-  version "1.15.4"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.4.tgz#cdc7d308bf6493126b17ea2191ea0ccf3e535adf"
-  integrity sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==
+  version "1.15.6"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b"
+  integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==
 
 forwarded@0.2.0:
   version "0.2.0"

From 06153d69b56d2e89878463dad7e0507377c8e12b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 16 Mar 2024 22:55:28 +0000
Subject: [PATCH 096/125] Bump follow-redirects from 1.15.4 to 1.15.6 in
 /client

Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.4 to 1.15.6.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.15.4...v1.15.6)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 client/yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/yarn.lock b/client/yarn.lock
index 113a55ae4..3b9605ba6 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -5774,9 +5774,9 @@ flat@^5.0.2:
   integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==
 
 follow-redirects@^1.0.0, follow-redirects@^1.14.0, follow-redirects@^1.15.0:
-  version "1.15.4"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.4.tgz#cdc7d308bf6493126b17ea2191ea0ccf3e535adf"
-  integrity sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==
+  version "1.15.6"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b"
+  integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==
 
 for-each@^0.3.3:
   version "0.3.3"

From 2a5d48eade74176e5bd4054bd575de89176de1e1 Mon Sep 17 00:00:00 2001
From: Adam Coffman <acoffman@wustl.edu>
Date: Mon, 18 Mar 2024 09:08:14 -0500
Subject: [PATCH 097/125] Remove ruby 3.2 from test matrix

---
 .github/workflows/tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 591b67910..671baad40 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: 'ubuntu-latest'
     strategy:
       matrix:
-        ruby: ['3.2', '3.3']
+        ruby: ['3.3']
     services:
         postgres:
           image: postgres:13

From 8745b4e973d1b99682219f9a578bc3e793bfaf2b Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Mon, 18 Mar 2024 11:19:33 -0500
Subject: [PATCH 098/125] dont create linkouts to pid, the site no longer
 exists

---
 .../app/components/genes/my-gene-info/my-gene-info.service.ts   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/app/components/genes/my-gene-info/my-gene-info.service.ts b/client/src/app/components/genes/my-gene-info/my-gene-info.service.ts
index f5b0b9384..b2220215d 100644
--- a/client/src/app/components/genes/my-gene-info/my-gene-info.service.ts
+++ b/client/src/app/components/genes/my-gene-info/my-gene-info.service.ts
@@ -13,8 +13,8 @@ export class MyGeneInfoService {
       pharmgkb: 'https://www.pharmgkb.org/pathway/',
       humancyc: 'http://humancyc.org/HUMAN/NEW-IMAGE?type=PATHWAY&object=',
       smpdb: 'http://www.smpdb.ca/view/',
-      pid: 'http://pid.nci.nih.gov/search/pathway_landing.shtml?what=graphic&jpg=on&pathway_id=',
       wikipathways: 'http://wikipathways.org/index.php/Pathway:',
+      pid: null,
       netpath: null,
       biocarta: null,
       inoh: null,

From 4840835b0414c4efc30395ea2bf76e035dec493a Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Tue, 19 Mar 2024 17:05:15 -0500
Subject: [PATCH 099/125] wip: everything but the popover and the mp variant
 card working with variant subtypes

---
 .../activity-feed/activity-feed.gql           |    2 +-
 .../coordinates-card.component.html           |   20 +-
 .../coordinates-card.component.ts             |    1 -
 .../coordinates-card.query.gql                |   34 +-
 .../gene-variant-summary.page.html            |  271 +
 .../gene-variant-summary.page.less            |    9 +
 .../gene-variant-summary.page.ts              |   53 +
 .../variant-popover/variant-popover.query.gql |    6 +-
 .../variants-menu/variants-menu.component.ts  |   15 +-
 .../variants/variants-menu/variants-menu.gql  |    9 +-
 .../gene-variant-revise.form.config.ts        |  366 +
 .../gene-variant-revise.form.html}            |    0
 .../gene-variant-revise.form.module.ts        |   26 +
 .../gene-variant-revise.form.ts               |  100 +
 .../gene-variant-revise.query.gql}            |   14 +-
 .../variant-revise.form.config.ts             |    9 +-
 .../variant-revise.form.module.ts             |   29 -
 .../variant-revise/variant-revise.form.ts     |   84 -
 ....model.ts => gene-variant-fields.model.ts} |    4 +-
 ....model.ts => gene-variant-revise.model.ts} |   16 +-
 .../variant-revise-test.module.ts             |    5 +-
 .../variant-revise-test.page.html             |    3 +-
 .../variant-select/variant-select.query.gql   |    2 +-
 ...lds.ts => gene-variant-to-model-fields.ts} |   20 +-
 .../src/app/generated/civic.apollo-helpers.ts |  180 +-
 client/src/app/generated/civic.apollo.ts      | 1237 ++-
 .../src/app/generated/civic.possible-types.ts |   17 +
 client/src/app/generated/server.model.graphql | 1275 ++-
 client/src/app/generated/server.schema.json   | 8102 +++++++++++------
 .../molecular-profiles-summary.query.gql      |   28 +-
 .../variants-detail/variants-detail.query.gql |    2 +-
 .../variants-detail/variants-detail.view.html |    1 +
 .../variants-summary.module.ts                |   47 +-
 .../variants-summary.page.html                |  249 +-
 .../variants-summary/variants-summary.page.ts |    6 -
 .../variants-summary.query.gql                |   64 +-
 .../variants-suggest.module.ts                |    4 +-
 .../variants-suggest.page.html                |    7 +-
 .../variants-suggest/variants-suggest.page.ts |    8 +
 .../app/graphql/mutations/create_variant.rb   |    2 +-
 .../graphql/mutations/deprecate_feature.rb    |    2 +-
 .../graphql/mutations/deprecate_variant.rb    |    2 +-
 ...on.rb => suggest_gene_variant_revision.rb} |   10 +-
 server/app/graphql/resolvers/quicksearch.rb   |    2 +-
 .../graphql/resolvers/top_level_variants.rb   |    2 +-
 server/app/graphql/resolvers/variants.rb      |    2 +-
 .../deprecate_feature_activity_type.rb        |    2 +-
 .../types/entities/molecular_profile_type.rb  |    4 +-
 .../graphql/types/entities/variant_type.rb    |  127 +-
 .../graphql/types/interfaces/commentable.rb   |    2 +-
 .../types/interfaces/event_origin_object.rb   |    2 +-
 .../graphql/types/interfaces/event_subject.rb |    2 +-
 .../app/graphql/types/interfaces/flaggable.rb |    2 +-
 .../interfaces/molecular_profile_component.rb |    2 +-
 .../types/interfaces/variant_interface.rb     |   75 +
 .../molecular_profile_name_preview_type.rb    |    2 +-
 server/app/graphql/types/mutation_type.rb     |    2 +-
 server/app/graphql/types/query_type.rb        |    3 +-
 ...riant_fields.rb => gene_variant_fields.rb} |    4 +-
 .../types/variants/factor_variant_type.rb     |    7 +
 .../types/variants/gene_variant_type.rb       |   81 +
 server/app/models/actions/create_variant.rb   |    9 +-
 server/app/models/feature.rb                  |    4 +
 server/app/models/features/factor.rb          |    4 +
 server/app/models/features/gene.rb            |    4 +
 server/app/models/variant.rb                  |   75 +-
 server/app/models/variants/factor_variant.rb  |   19 +
 server/app/models/variants/gene_variant.rb    |   53 +
 .../validators/variant_fields_validator.rb    |   15 +
 .../migrate/20240314185837_add_variant_sti.rb |   19 +
 server/db/schema.rb                           |   29 +-
 71 files changed, 8592 insertions(+), 4303 deletions(-)
 create mode 100644 client/src/app/components/variants/gene-variant-summary/gene-variant-summary.page.html
 create mode 100644 client/src/app/components/variants/gene-variant-summary/gene-variant-summary.page.less
 create mode 100644 client/src/app/components/variants/gene-variant-summary/gene-variant-summary.page.ts
 create mode 100644 client/src/app/forms/config/gene-variant-revise/gene-variant-revise.form.config.ts
 rename client/src/app/forms/config/{variant-revise/variant-revise.form.html => gene-variant-revise/gene-variant-revise.form.html} (100%)
 create mode 100644 client/src/app/forms/config/gene-variant-revise/gene-variant-revise.form.module.ts
 create mode 100644 client/src/app/forms/config/gene-variant-revise/gene-variant-revise.form.ts
 rename client/src/app/forms/config/{variant-revise/variant-revise.query.gql => gene-variant-revise/gene-variant-revise.query.gql} (65%)
 rename client/src/app/forms/config/{variant-revise => gene-variant-revise}/variant-revise.form.config.ts (98%)
 delete mode 100644 client/src/app/forms/config/variant-revise/variant-revise.form.module.ts
 delete mode 100644 client/src/app/forms/config/variant-revise/variant-revise.form.ts
 rename client/src/app/forms/models/{variant-fields.model.ts => gene-variant-fields.model.ts} (82%)
 rename client/src/app/forms/models/{variant-revise.model.ts => gene-variant-revise.model.ts} (59%)
 rename client/src/app/forms/utilities/{variant-to-model-fields.ts => gene-variant-to-model-fields.ts} (85%)
 rename server/app/graphql/mutations/{suggest_variant_revision.rb => suggest_gene_variant_revision.rb} (87%)
 create mode 100644 server/app/graphql/types/interfaces/variant_interface.rb
 rename server/app/graphql/types/revisions/{variant_fields.rb => gene_variant_fields.rb} (93%)
 create mode 100644 server/app/graphql/types/variants/factor_variant_type.rb
 create mode 100644 server/app/graphql/types/variants/gene_variant_type.rb
 create mode 100644 server/app/models/variants/factor_variant.rb
 create mode 100644 server/app/models/variants/gene_variant.rb
 create mode 100644 server/app/validators/variant_fields_validator.rb
 create mode 100644 server/db/migrate/20240314185837_add_variant_sti.rb

diff --git a/client/src/app/components/activities/activity-feed/activity-feed.gql b/client/src/app/components/activities/activity-feed/activity-feed.gql
index 4d0ccb9ee..0f7d706a3 100644
--- a/client/src/app/components/activities/activity-feed/activity-feed.gql
+++ b/client/src/app/components/activities/activity-feed/activity-feed.gql
@@ -32,7 +32,7 @@ query ActivityFeed(
   $last: Int
   $before: String
   $after: String
-  $userId: Int
+  $userId: [Int!]
   #$organizationId: Int
   #$eventType: EventAction
   #$mode: EventFeedMode
diff --git a/client/src/app/components/variants/coordinates-card/coordinates-card.component.html b/client/src/app/components/variants/coordinates-card/coordinates-card.component.html
index 7c33ecbe9..6b419a870 100644
--- a/client/src/app/components/variants/coordinates-card/coordinates-card.component.html
+++ b/client/src/app/components/variants/coordinates-card/coordinates-card.component.html
@@ -1,7 +1,9 @@
 <ng-container *ngIf="this.cvcVariantId && (variant$ | ngrxPush) as variant">
+  @if(variant.__typename == "GeneVariant") {
   <ng-container
     *ngTemplateOutlet="coordinateCard; context: { $implicit: variant }">
   </ng-container>
+  }
 </ng-container>
 <ng-container *ngIf="this.cvcCoordinates">
   <ng-container
@@ -86,8 +88,13 @@
           <nz-descriptions-item
             nzTitle="Transcript"
             nzColumn="5">
-            <cvc-link-tag *ngIf="coords.representativeTranscript" tooltip="View on Ensembl"
-              [href]="'http://www.ensembl.org/Homo_sapiens/transview?transcript=' + coords.representativeTranscript">
+            <cvc-link-tag
+              *ngIf="coords.representativeTranscript"
+              tooltip="View on Ensembl"
+              [href]="
+                'http://www.ensembl.org/Homo_sapiens/transview?transcript=' +
+                coords.representativeTranscript
+              ">
               {{ coords.representativeTranscript }}
             </cvc-link-tag>
             <ng-container *ngIf="!coords.representativeTranscript">
@@ -131,8 +138,13 @@
           <nz-descriptions-item
             nzTitle="Transcript"
             nzColumn="5">
-            <cvc-link-tag *ngIf="coords.representativeTranscript" tooltip="View on Ensembl"
-              [href]="'http://www.ensembl.org/Homo_sapiens/transview?transcript=' + coords.representativeTranscript">
+            <cvc-link-tag
+              *ngIf="coords.representativeTranscript"
+              tooltip="View on Ensembl"
+              [href]="
+                'http://www.ensembl.org/Homo_sapiens/transview?transcript=' +
+                coords.representativeTranscript
+              ">
               {{ coords.representativeTranscript }}
             </cvc-link-tag>
             <ng-container *ngIf="!coords.representativeTranscript">
diff --git a/client/src/app/components/variants/coordinates-card/coordinates-card.component.ts b/client/src/app/components/variants/coordinates-card/coordinates-card.component.ts
index 4c25b85b9..aa241e45e 100644
--- a/client/src/app/components/variants/coordinates-card/coordinates-card.component.ts
+++ b/client/src/app/components/variants/coordinates-card/coordinates-card.component.ts
@@ -5,7 +5,6 @@ import {
   CoordinatesCardQuery,
   CoordinatesCardQueryVariables,
   Maybe,
-  Variant,
 } from '@app/generated/civic.apollo'
 import { QueryRef } from 'apollo-angular'
 import { Observable } from 'rxjs'
diff --git a/client/src/app/components/variants/coordinates-card/coordinates-card.query.gql b/client/src/app/components/variants/coordinates-card/coordinates-card.query.gql
index c8fd0656a..cd2fea9ad 100644
--- a/client/src/app/components/variants/coordinates-card/coordinates-card.query.gql
+++ b/client/src/app/components/variants/coordinates-card/coordinates-card.query.gql
@@ -4,23 +4,25 @@ query CoordinatesCard($variantId: Int!) {
   }
 }
 
-fragment CoordinatesCardFields on Variant {
+fragment CoordinatesCardFields on VariantInterface {
   id
   name
-  referenceBuild
-  ensemblVersion
-  primaryCoordinates {
-    representativeTranscript
-    chromosome
-    start
-    stop
+  ... on GeneVariant {
+    referenceBuild
+    ensemblVersion
+    primaryCoordinates {
+      representativeTranscript
+      chromosome
+      start
+      stop
+    }
+    secondaryCoordinates {
+      representativeTranscript
+      chromosome
+      start
+      stop
+    }
+    referenceBases
+    variantBases
   }
-  secondaryCoordinates {
-    representativeTranscript
-    chromosome
-    start
-    stop
-  }
-  referenceBases
-  variantBases
 }
diff --git a/client/src/app/components/variants/gene-variant-summary/gene-variant-summary.page.html b/client/src/app/components/variants/gene-variant-summary/gene-variant-summary.page.html
new file mode 100644
index 000000000..0a6b699fa
--- /dev/null
+++ b/client/src/app/components/variants/gene-variant-summary/gene-variant-summary.page.html
@@ -0,0 +1,271 @@
+@if(variant.__typename == "GeneVariant") {
+<!-- variant description, details, myvariantinfo row -->
+<nz-row [nzGutter]="[8, 16]">
+  <!-- LEFT COL -->
+  <nz-col [nzSpan]="12">
+    <!-- left col layout row -->
+    <nz-row [nzGutter]="[8, 8]">
+      <!-- variant attributes block -->
+      <nz-col nzSpan="24">
+        <nz-descriptions
+          nzLayout="horizontal"
+          nzSize="small"
+          [nzColumn]="1"
+          nzBordered="true">
+          <!-- aliases -->
+          <nz-descriptions-item nzTitle="Aliases">
+            <ng-container
+              *ngIf="variant.variantAliases.length > 0; else noAliases">
+              <cvc-tag-list>
+                <nz-tag *ngFor="let alias of variant.variantAliases">{{
+                  alias
+                }}</nz-tag>
+              </cvc-tag-list>
+            </ng-container>
+            <ng-template #noAliases>
+              <span
+                nz-typography
+                nzType="secondary"
+                >None specified</span
+              >
+            </ng-template>
+          </nz-descriptions-item>
+
+          <!-- variant type(s) -->
+          <nz-descriptions-item
+            [nzTitle]="
+              variant.variantTypes.length > 1 ? 'Variant Types' : 'Variant Type'
+            ">
+            <ng-container *ngIf="variant.variantTypes.length > 0; else noTypes">
+              <cvc-tag-list>
+                <cvc-variant-type-tag
+                  [variantType]="type"
+                  *ngFor="
+                    let type of variant.variantTypes
+                  "></cvc-variant-type-tag>
+              </cvc-tag-list>
+            </ng-container>
+            <ng-template #noTypes>
+              <span
+                nz-typography
+                nzType="secondary"
+                >None specified</span
+              >
+            </ng-template>
+          </nz-descriptions-item>
+
+          <!-- HGVS descriptions -->
+          <nz-descriptions-item
+            [nzTitle]="
+              variant.hgvsDescriptions.length > 1
+                ? 'HGVS Descriptions'
+                : 'HGVS Description'
+            ">
+            <ng-container
+              *ngIf="variant.hgvsDescriptions.length > 0; else noDescriptions">
+              <cvc-tag-list>
+                <nz-tag *ngFor="let desc of variant.hgvsDescriptions">{{
+                  desc
+                }}</nz-tag>
+              </cvc-tag-list>
+            </ng-container>
+            <ng-template #noDescriptions>
+              <span
+                nz-typography
+                nzType="secondary"
+                >None specified</span
+              >
+            </ng-template>
+          </nz-descriptions-item>
+
+          <!-- MANE Select Transcript -->
+          <nz-descriptions-item nzTitle="MANE Select Transcript">
+            <ng-container *ngIf="variant.maneSelectTranscript; else noMane">
+              <cvc-tag-list>
+                <nz-tag>{{ variant.maneSelectTranscript }}</nz-tag>
+              </cvc-tag-list>
+            </ng-container>
+            <ng-template #noMane>
+              <span
+                nz-typography
+                nzType="secondary"
+                >None found</span
+              >
+            </ng-template>
+          </nz-descriptions-item>
+        </nz-descriptions>
+      </nz-col>
+      <!-- coordinates -->
+      <nz-col [nzSpan]="24">
+        <cvc-coordinates-card
+          [cvcVariantId]="variant.id"></cvc-coordinates-card>
+      </nz-col>
+    </nz-row>
+  </nz-col>
+
+  <!-- RIGHT COLUMN -->
+  <nz-col nzSpan="12">
+    <!-- right col layout row -->
+    <nz-row [nzGutter]="[8, 8]">
+      <!-- BLOCK: creation and deprecation events -->
+      <nz-col [nzSpan]="24">
+        <nz-descriptions
+          nzLayout="vertical"
+          nzSize="small"
+          [nzColumn]="{ xxl: 2, xl: 2, lg: 1, md: 1, sm: 1, xs: 1 }"
+          nzBordered="true">
+          <!-- creation/deprecation curation events -->
+          <ng-container *ngIf="variant.creationActivity">
+            <nz-descriptions-item [nzTitle]="createdTitle">
+              by
+              <cvc-user-tag
+                [user]="variant.creationActivity.user"></cvc-user-tag>
+            </nz-descriptions-item>
+            <ng-template #createdTitle>
+              Created
+              <span
+                nz-typography
+                nzType="secondary">
+                ({{ variant.creationActivity.createdAt | timeAgo }})
+              </span>
+            </ng-template>
+          </ng-container>
+          <ng-container *ngIf="variant.deprecationActivity">
+            <nz-descriptions-item [nzTitle]="deprecatedTitle">
+              by
+              <cvc-user-tag
+                [user]="variant.deprecationActivity.user"></cvc-user-tag>
+            </nz-descriptions-item>
+            <ng-template #deprecatedTitle>
+              Deprecated
+              <span
+                nz-typography
+                nzType="secondary">
+                ({{ variant.deprecationActivity.createdAt | timeAgo }})
+              </span>
+            </ng-template>
+          </ng-container>
+        </nz-descriptions>
+      </nz-col>
+
+      <!-- variant related entities, attributes -->
+      <nz-col [nzSpan]="24">
+        <nz-descriptions
+          nzLayout="horizontal"
+          nzSize="small"
+          [nzColumn]="{ xxl: 2, xl: 2, lg: 1, md: 1, sm: 1, xs: 1 }"
+          nzBordered="true">
+          <!-- feature -->
+          <nz-descriptions-item [nzTitle]="variant.feature.__typename">
+            <cvc-feature-tag [feature]="variant.feature"></cvc-feature-tag>
+          </nz-descriptions-item>
+
+          <!-- allele reg. id -->
+          <nz-descriptions-item nzTitle="Allele Registry ID">
+            <cvc-link-tag
+              *ngIf="
+                variant.alleleRegistryId &&
+                  variant.alleleRegistryId != 'unregistered';
+                else noAlleleRegistry
+              "
+              [href]="
+                'https://reg.genome.network/allele/' +
+                variant.alleleRegistryId +
+                '.html'
+              "
+              tooltip="View on ClinGen Allele Registry">
+              {{ variant.alleleRegistryId }}
+            </cvc-link-tag>
+            <ng-template #noAlleleRegistry>
+              <span
+                nz-typography
+                nzType="secondary"
+                >Unregistered</span
+              >
+            </ng-template>
+          </nz-descriptions-item>
+
+          <!-- clinvar ids-->
+          <nz-descriptions-item
+            [nzTitle]="
+              variant.clinvarIds.length > 1 ? 'ClinVar IDs' : 'ClinVar ID'
+            ">
+            <ng-container
+              *ngIf="variant.clinvarIds.length > 0; else noClinvarIds">
+              <cvc-tag-list
+                *ngIf="
+                  variant.clinvarIds[0] !== 'N/A' &&
+                    variant.clinvarIds[0] !== 'NONE FOUND';
+                  else clinvarNotApplicable
+                ">
+                <ng-container *ngFor="let id of variant.clinvarIds">
+                  <cvc-link-tag
+                    [href]="
+                      'https://www.ncbi.nlm.nih.gov/clinvar/variation/' + id
+                    "
+                    tooltip="View on ClinVar">
+                    {{ id }}
+                  </cvc-link-tag>
+                </ng-container>
+              </cvc-tag-list>
+            </ng-container>
+
+            <ng-template #clinvarNotApplicable>
+              <span
+                nz-typography
+                nzType="secondary"
+                >{{ variant.clinvarIds[0] }}</span
+              >
+            </ng-template>
+
+            <ng-template #noClinvarIds>
+              <span
+                nz-typography
+                nzType="secondary"
+                >None provided</span
+              >
+            </ng-template>
+          </nz-descriptions-item>
+
+          <nz-descriptions-item
+            *ngIf="variant.openCravatUrl"
+            nzTitle="OpenCRAVAT">
+            <cvc-link-tag
+              [href]="variant.openCravatUrl"
+              tooltip="View on OpenCRAVAT">
+              Variant Report
+            </cvc-link-tag>
+          </nz-descriptions-item>
+        </nz-descriptions>
+      </nz-col>
+
+      <!-- myvariant info -->
+      <ng-container *ngIf="variant.myVariantInfo; else noVariantInfo">
+        <nz-col [nzSpan]="24">
+          <cvc-my-variant-info
+            [variantInfo]="variant.myVariantInfo"></cvc-my-variant-info>
+        </nz-col>
+      </ng-container>
+      <ng-template #noVariantInfo>
+        <nz-col [nzSpan]="24">
+          <nz-card nzTitle="MyVariantInfo">
+            <cvc-empty-revisable
+              notification="Not available, provide Representative Variant Coordinates">
+            </cvc-empty-revisable>
+          </nz-card>
+        </nz-col>
+      </ng-template>
+    </nz-row>
+  </nz-col>
+  <!-- END RIGHT COL -->
+
+  <!-- evidence table -->
+  <nz-col nzSpan="24">
+    <cvc-molecular-profiles-table
+      [variantId]="variant.id"
+      cvcHeight="300px"
+      cvcTitle="{{ variant.name }} Molecular Profiles">
+    </cvc-molecular-profiles-table>
+  </nz-col>
+</nz-row>
+}
diff --git a/client/src/app/components/variants/gene-variant-summary/gene-variant-summary.page.less b/client/src/app/components/variants/gene-variant-summary/gene-variant-summary.page.less
new file mode 100644
index 000000000..b2848ee08
--- /dev/null
+++ b/client/src/app/components/variants/gene-variant-summary/gene-variant-summary.page.less
@@ -0,0 +1,9 @@
+@import "themes/overrides/descriptions-overrides.less";
+:host {
+  display: block;
+}
+
+nz-space,
+nz-space-item {
+  width: 100%;
+}
diff --git a/client/src/app/components/variants/gene-variant-summary/gene-variant-summary.page.ts b/client/src/app/components/variants/gene-variant-summary/gene-variant-summary.page.ts
new file mode 100644
index 000000000..8f25c021c
--- /dev/null
+++ b/client/src/app/components/variants/gene-variant-summary/gene-variant-summary.page.ts
@@ -0,0 +1,53 @@
+import { CommonModule } from '@angular/common'
+import { Component, Input, OnInit } from '@angular/core'
+import { CvcTagListModule } from '@app/components/shared/tag-list/tag-list.module'
+
+import { NzDescriptionsModule } from 'ng-zorro-antd/descriptions'
+import { NzGridModule } from 'ng-zorro-antd/grid'
+import { NzTagModule } from 'ng-zorro-antd/tag'
+import { CvcVariantTypeTagModule } from '@app/components/variant-types/variant-type-tag/variant-type-tag.module'
+import { CvcCoordinatesCardModule } from '../coordinates-card/coordinates-card.module'
+import { CvcLinkTagModule } from '@app/components/shared/link-tag/link-tag.module'
+import { NzCardModule } from 'ng-zorro-antd/card'
+import { CvcEmptyRevisableModule } from '@app/components/shared/empty-revisable/empty-revisable.module'
+import { CvcMolecularProfilesTableModule } from '@app/components/molecular-profiles/molecular-profile-table/molecular-profile-table.module'
+import { CvcMyVariantInfoModule } from '../my-variant-info/my-variant-info.module'
+import { PushPipe } from '@ngrx/component'
+import { VariantSummaryFieldsFragment } from '@app/generated/civic.apollo'
+import { CvcUserTagModule } from '@app/components/users/user-tag/user-tag.module'
+import { CvcFeatureTagModule } from '@app/components/features/feature-tag/feature-tag.module'
+import { CvcPipesModule } from '@app/core/pipes/pipes.module'
+
+@Component({
+  standalone: true,
+  selector: 'cvc-gene-variant-summary',
+  templateUrl: './gene-variant-summary.page.html',
+  styleUrls: ['./gene-variant-summary.page.less'],
+  imports: [
+    CommonModule,
+    PushPipe,
+    NzGridModule,
+    NzDescriptionsModule,
+    NzTagModule,
+    NzCardModule,
+    CvcEmptyRevisableModule,
+    CvcTagListModule,
+    CvcVariantTypeTagModule,
+    CvcCoordinatesCardModule,
+    CvcLinkTagModule,
+    CvcUserTagModule,
+    CvcFeatureTagModule,
+    CvcMolecularProfilesTableModule,
+    CvcMyVariantInfoModule,
+    CvcPipesModule,
+  ],
+})
+export class CvcGeneVariantSummaryComponent implements OnInit {
+  @Input() variant!: VariantSummaryFieldsFragment
+
+  ngOnInit() {
+    if (this.variant == undefined) {
+      throw new Error('Must pass GeneVariant into GeneVariant summary')
+    }
+  }
+}
diff --git a/client/src/app/components/variants/variant-popover/variant-popover.query.gql b/client/src/app/components/variants/variant-popover/variant-popover.query.gql
index 19376ed3c..7faba1301 100644
--- a/client/src/app/components/variants/variant-popover/variant-popover.query.gql
+++ b/client/src/app/components/variants/variant-popover/variant-popover.query.gql
@@ -4,11 +4,13 @@ query VariantPopover($variantId: Int!) {
   }
 }
 
-fragment variantPopoverFields on Variant {
+fragment variantPopoverFields on VariantInterface {
   id
   name
   variantAliases
-  alleleRegistryId
+  ... on GeneVariant {
+    alleleRegistryId
+  }
   feature {
     id
     name
diff --git a/client/src/app/components/variants/variants-menu/variants-menu.component.ts b/client/src/app/components/variants/variants-menu/variants-menu.component.ts
index 4fb859785..016225b7e 100644
--- a/client/src/app/components/variants/variants-menu/variants-menu.component.ts
+++ b/client/src/app/components/variants/variants-menu/variants-menu.component.ts
@@ -8,7 +8,6 @@ import {
   PageInfo,
   VariantMenuSortColumns,
   SortDirection,
-  VariantConnection,
   MenuVariantTypeFragment,
   VariantTypesForFeatureGQL,
 } from '@app/generated/civic.apollo'
@@ -45,7 +44,6 @@ export class CvcVariantsMenuComponent implements OnInit {
 
   private debouncedQuery = new Subject<void>()
   private result$!: Observable<ApolloQueryResult<VariantsMenuQuery>>
-  connection$!: Observable<VariantConnection>
   private initialQueryVars!: VariantsMenuQueryVariables
   pageSize = 50
 
@@ -77,21 +75,22 @@ export class CvcVariantsMenuComponent implements OnInit {
       startWith(true)
     )
 
-    this.connection$ = this.result$.pipe(
+    const connection$ = this.result$.pipe(
       map((r) => r.data?.variants),
       filter(isNonNulled)
-    ) as Observable<VariantConnection>
+    )
 
-    this.pageInfo$ = this.connection$.pipe(
+    this.pageInfo$ = connection$.pipe(
       map((c) => c.pageInfo),
       filter(isNonNulled)
     )
 
-    this.menuVariants$ = this.connection$.pipe(
-      map((c) => c.edges.map((e) => e.node), filter(isNonNulled))
+    this.menuVariants$ = connection$.pipe(
+      map((c) => c.nodes),
+      filter(isNonNulled)
     )
 
-    this.totalVariants$ = this.connection$.pipe(map((c) => c.totalCount))
+    this.totalVariants$ = connection$.pipe(map((c) => c.totalCount))
 
     this.debouncedQuery
       .pipe(debounceTime(500), untilDestroyed(this))
diff --git a/client/src/app/components/variants/variants-menu/variants-menu.gql b/client/src/app/components/variants/variants-menu/variants-menu.gql
index 6c1ce9292..90aaed734 100644
--- a/client/src/app/components/variants/variants-menu/variants-menu.gql
+++ b/client/src/app/components/variants/variants-menu/variants-menu.gql
@@ -27,11 +27,8 @@ query VariantsMenu(
       hasPreviousPage
       hasNextPage
     }
-    edges {
-      cursor
-      node {
-        ...menuVariant
-      }
+    nodes {
+      ...menuVariant
     }
   }
 }
@@ -57,7 +54,7 @@ fragment menuVariantType on BrowseVariantType {
   link
 }
 
-fragment menuVariant on Variant {
+fragment menuVariant on VariantInterface {
   id
   name
   link
diff --git a/client/src/app/forms/config/gene-variant-revise/gene-variant-revise.form.config.ts b/client/src/app/forms/config/gene-variant-revise/gene-variant-revise.form.config.ts
new file mode 100644
index 000000000..ff35f4cf3
--- /dev/null
+++ b/client/src/app/forms/config/gene-variant-revise/gene-variant-revise.form.config.ts
@@ -0,0 +1,366 @@
+import { AbstractControl } from '@angular/forms'
+import { Chromosomes } from '@app/forms/utilities/input-formatters'
+import { geneVariantReviseFormInitialModel } from '@app/forms/models/gene-variant-revise.model'
+import assignFieldConfigDefaultValues from '@app/forms/utilities/assign-field-default-values'
+import { CvcFormCardWrapperProps } from '@app/forms/wrappers/form-card/form-card.wrapper'
+import { CvcFormLayoutWrapperProps } from '@app/forms/wrappers/form-layout/form-layout.wrapper'
+import { FormlyFieldConfig } from '@ngx-formly/core'
+import { CvcFormRowWrapperProps } from '@app/forms/wrappers/form-row/form-row.wrapper'
+import { CvcOrgSubmitButtonFieldConfig } from '@app/forms/types/org-submit-button/org-submit-button.type'
+
+const formFieldConfig: FormlyFieldConfig[] = [
+  {
+    wrappers: ['form-layout'],
+    props: <CvcFormLayoutWrapperProps>{
+      showDevPanel: false,
+    },
+    fieldGroup: [
+      {
+        key: 'clientMutationId',
+        props: {
+          hidden: true,
+        },
+      },
+      {
+        key: 'fields',
+        wrappers: ['form-card'],
+        props: <CvcFormCardWrapperProps>{
+          formCardOptions: { title: 'Revise Variant' },
+        },
+        fieldGroup: [
+          {
+            wrappers: ['form-row'],
+            props: <CvcFormRowWrapperProps>{
+              formRowOptions: {
+                responsiveIndexed: [
+                  { xs: 24, md: 12, lg: 8 },
+                  { xs: 24, md: 12, lg: 8 },
+                  { xs: 24, lg: 8 },
+                ],
+              },
+            },
+            fieldGroup: [
+              {
+                key: 'featureId',
+                type: 'feature-select',
+                props: {
+                  description: 'Enter an Entrez Gene for this Variant',
+                  required: true,
+                },
+              },
+              {
+                key: 'name',
+                type: 'base-input',
+                props: {
+                  placeholder: 'Enter a name for this Variant',
+                  description:
+                    "Enter the name of the Variant according to the <a href='https://civic.readthedocs.io/en/latest/model/variants/name.html#curating-variant-names' target='blank'>Variant Curation SOP</a>",
+                  label: 'Name',
+                  required: true,
+                  rows: 1,
+                },
+              },
+              {
+                key: 'aliases',
+                type: 'tag-multi-input',
+                props: {
+                  label: 'Aliases',
+                  description:
+                    'List any aliases commonly used to refer to this Variant',
+                  placeholder: 'Enter Alias and hit return',
+                },
+              },
+            ],
+          },
+          {
+            wrappers: ['form-row'],
+            props: <CvcFormRowWrapperProps>{
+              formRowOptions: {
+                responsiveIndexed: [
+                  { xs: 24, lg: 12, xl: 6, xxl: 8 },
+                  { xs: 24, lg: 12, xl: 6, xxl: 8 },
+                  { xs: 24, xl: 12, xxl: 8 },
+                ],
+              },
+            },
+            fieldGroup: [
+              {
+                key: 'hgvsDescriptions',
+                type: 'tag-multi-input',
+                props: {
+                  label: 'HGVS Descriptions',
+                  description:
+                    'Enter any HGVS nomenclature descriptions of this Variant',
+                  tooltip:
+                    'Human Genome Variation Society nomenclature descriptions',
+                  placeholder: 'Enter HGVS and hit return',
+                },
+              },
+              {
+                key: 'variantTypeIds',
+                type: 'variant-type-multi-select',
+              },
+              {
+                key: 'clinvarIds',
+                type: 'clinvar-multi-input',
+                wrappers: ['form-field'],
+                props: {
+                  label: 'ClinVar IDs',
+                },
+              },
+            ],
+          },
+          {
+            wrappers: ['form-row'],
+            props: <CvcFormRowWrapperProps>{
+              formRowOptions: {
+                span: 24,
+              },
+            },
+            fieldGroup: [
+              {
+                wrappers: ['form-card'],
+                props: <CvcFormCardWrapperProps>{
+                  formCardOptions: {
+                    title: `Primary (5') Coordinates`,
+                    size: 'small',
+                  },
+                },
+                fieldGroup: [
+                  {
+                    wrappers: ['form-row'],
+                    props: <CvcFormRowWrapperProps>{
+                      formRowOptions: {
+                        responsive: { xs: 24, md: 12, lg: 8, xxl: 6 },
+                      },
+                    },
+                    fieldGroup: [
+                      {
+                        key: 'referenceBuild',
+                        type: 'reference-build-select',
+                      },
+                      {
+                        key: 'ensemblVersion',
+                        type: 'base-input',
+                        validators: {
+                          nccnVersionNumber: {
+                            expression: (c: AbstractControl) =>
+                              c.value ? /^\d{2,3}$/.test(c.value) : true,
+                            message: (_: any, field: FormlyFieldConfig) =>
+                              `"${field.formControl?.value}" does not appear to be an Ensembl version number`,
+                          },
+                        },
+                        props: {
+                          label: 'Ensembl Version',
+                          description:
+                            'Enter a valid Ensembl database version (e.g. 75)',
+                        },
+                      },
+                      {
+                        key: 'referenceBases',
+                        type: 'base-input',
+                        validators: {
+                          nccnVersionNumber: {
+                            expression: (c: AbstractControl) =>
+                              c.value ? /^[ACTG\\]+$/.test(c.value) : true,
+                            message: (_: any, field: FormlyFieldConfig) =>
+                              `"${field.formControl?.value}" contains invalid characters.`,
+                          },
+                        },
+                        props: {
+                          label: 'Reference Bases',
+                          description:
+                            'The nucleotide(s) of the reference genome affected by the variant. Only used for SNVs and Indels (otherwise leave blank)',
+                        },
+                      },
+                      {
+                        key: 'variantBases',
+                        type: 'base-input',
+                        validators: {
+                          nccnVersionNumber: {
+                            expression: (c: AbstractControl) =>
+                              c.value ? /^[ACTG\\]+$/.test(c.value) : true,
+                            message: (_: any, field: FormlyFieldConfig) =>
+                              `"${field.formControl?.value}" contains invalid characters.`,
+                          },
+                        },
+                        props: {
+                          label: 'Variant Bases',
+                          description:
+                            'The nucleotide(s) of the variant allele. Only used for SNVs and Indels (otherwise leave blank)',
+                        },
+                      },
+                      {
+                        key: 'chromosome',
+                        type: 'base-select',
+                        props: {
+                          label: 'Chromosome',
+                          options: Chromosomes,
+                          description:
+                            'Specify the chromosome in which this variant occurs (e.g. 17).',
+                        },
+                      },
+                      {
+                        key: 'start',
+                        type: 'base-input',
+                        validators: {
+                          isNumeric: {
+                            expression: (c: AbstractControl) =>
+                              c.value ? /^\d+$/.test(c.value) : true,
+                            message: (_: any, field: FormlyFieldConfig) =>
+                              'Start coordinate must be numeric',
+                          },
+                        },
+                        props: {
+                          label: 'Start',
+                          description:
+                            'Enter the left/first coordinate of this variant. Must be ≤ the Stop coordinate. Coordinate must be compatible with the selected reference build.',
+                        },
+                      },
+                      {
+                        key: 'stop',
+                        type: 'base-input',
+                        validators: {
+                          isNumeric: {
+                            expression: (c: AbstractControl) =>
+                              c.value ? /^\d+$/.test(c.value) : true,
+                            message: (_: any, field: FormlyFieldConfig) =>
+                              'Stop coordinate must be numeric',
+                          },
+                        },
+                        props: {
+                          label: 'Stop',
+                          description:
+                            'Provide the right/second coordinate of this variant. Must be ≥ the Start coordinate. Coordinate must be compatible with the selected reference build.',
+                        },
+                      },
+                      {
+                        key: 'representativeTranscript',
+                        type: 'base-input',
+                        props: {
+                          label: 'Representative Transcript',
+                          description:
+                            'Specify a transcript ID, including version number (e.g. ENST00000348159.4, the canonical transcript defined by Ensembl).',
+                        },
+                      },
+                    ],
+                  },
+                ],
+              },
+              {
+                wrappers: ['form-card'],
+                props: <CvcFormCardWrapperProps>{
+                  formCardOptions: {
+                    title: `Secondary (3') Coordinates`,
+                    size: 'small',
+                  },
+                },
+                fieldGroup: [
+                  {
+                    wrappers: ['form-row'],
+                    props: <CvcFormRowWrapperProps>{
+                      formRowOptions: {
+                        responsive: { xs: 24, md: 12, lg: 8, xxl: 6 },
+                      },
+                    },
+                    fieldGroup: [
+                      {
+                        key: 'chromosome2',
+                        type: 'base-select',
+                        props: {
+                          label: 'Chromosome',
+                          options: Chromosomes,
+                          description:
+                            'If this variant is a fusion (e.g. BCR-ABL1), specify the chromosome name, coordinates, and representative transcript for the 3-prime partner.',
+                        },
+                      },
+                      {
+                        key: 'start2',
+                        type: 'base-input',
+                        validators: {
+                          isNumeric: {
+                            expression: (c: AbstractControl) =>
+                              c.value ? /^\d+$/.test(c.value) : true,
+                            message: (_: any, field: FormlyFieldConfig) =>
+                              'Start coordinate must be numeric',
+                          },
+                        },
+                        props: {
+                          label: 'Start',
+                          description:
+                            'Enter the left/first coordinate of this 3-prime partner fusion variant. Must be ≤ the Stop coordinate. Coordinate must be compatible with the selected reference build.',
+                        },
+                      },
+                      {
+                        key: 'stop2',
+                        type: 'base-input',
+                        validators: {
+                          isNumeric: {
+                            expression: (c: AbstractControl) =>
+                              c.value ? /^\d+$/.test(c.value) : true,
+                            message: (_: any, field: FormlyFieldConfig) =>
+                              'Stop coordinate must be numeric',
+                          },
+                        },
+                        props: {
+                          label: 'Stop',
+                          description:
+                            'Provide the right/second coordinate of this 3-prime partner fusion variant. Must be ≥ the Start coordinate. Coordinate must be compatible with the selected reference build.',
+                        },
+                      },
+                      {
+                        key: 'representativeTranscript2',
+                        type: 'base-input',
+                        props: {
+                          label: 'Representative Transcript',
+                          description:
+                            'Specify a transcript ID, including version number (e.g. ENST00000348159.4, the canonical transcript defined by Ensembl).',
+                        },
+                      },
+                    ],
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+      },
+      {
+        wrappers: ['form-row'],
+        props: <CvcFormRowWrapperProps>{
+          formRowOptions: {
+            spanIndexed: [24, 12, 12],
+          },
+        },
+        fieldGroup: [
+          {
+            key: 'comment',
+            type: 'base-textarea',
+            props: {
+              label: 'Comment',
+              placeholder: 'Please enter a comment describing your revisions.',
+              required: true,
+              minLength: 10,
+            },
+          },
+          {
+            type: 'cvc-cancel-button',
+          },
+          <CvcOrgSubmitButtonFieldConfig>{
+            key: 'organizationId',
+            type: 'org-submit-button',
+            props: {
+              submitLabel: 'Submit Variant Revisions',
+              align: 'right',
+            },
+          },
+        ],
+      },
+    ],
+  },
+]
+export const geneVariantReviseFields: FormlyFieldConfig[] =
+  assignFieldConfigDefaultValues(
+    formFieldConfig,
+    geneVariantReviseFormInitialModel
+  )
diff --git a/client/src/app/forms/config/variant-revise/variant-revise.form.html b/client/src/app/forms/config/gene-variant-revise/gene-variant-revise.form.html
similarity index 100%
rename from client/src/app/forms/config/variant-revise/variant-revise.form.html
rename to client/src/app/forms/config/gene-variant-revise/gene-variant-revise.form.html
diff --git a/client/src/app/forms/config/gene-variant-revise/gene-variant-revise.form.module.ts b/client/src/app/forms/config/gene-variant-revise/gene-variant-revise.form.module.ts
new file mode 100644
index 000000000..01a239377
--- /dev/null
+++ b/client/src/app/forms/config/gene-variant-revise/gene-variant-revise.form.module.ts
@@ -0,0 +1,26 @@
+import { NgModule } from '@angular/core'
+import { CommonModule } from '@angular/common'
+import { NzFormModule } from 'ng-zorro-antd/form'
+import { NzButtonModule } from 'ng-zorro-antd/button'
+import { CvcForms2Module } from '@app/forms/forms.module'
+import { NgxJsonViewerModule } from 'ngx-json-viewer'
+import { LetDirective, PushPipe } from '@ngrx/component'
+import { CvcFormSubmissionStatusDisplayModule } from '@app/forms/components/form-submission-status-display/form-submission-status-display.module'
+import { CvcGeneVariantReviseForm } from './gene-variant-revise.form'
+
+@NgModule({
+  declarations: [CvcGeneVariantReviseForm],
+  imports: [
+    CommonModule,
+    LetDirective,
+    PushPipe,
+    NzFormModule,
+    NzButtonModule,
+    CvcForms2Module,
+    CvcFormSubmissionStatusDisplayModule,
+
+    NgxJsonViewerModule, // debug
+  ],
+  exports: [CvcGeneVariantReviseForm],
+})
+export class CvcGeneVariantReviseFormModule {}
diff --git a/client/src/app/forms/config/gene-variant-revise/gene-variant-revise.form.ts b/client/src/app/forms/config/gene-variant-revise/gene-variant-revise.form.ts
new file mode 100644
index 000000000..57943ed72
--- /dev/null
+++ b/client/src/app/forms/config/gene-variant-revise/gene-variant-revise.form.ts
@@ -0,0 +1,100 @@
+import {
+  AfterViewInit,
+  ChangeDetectionStrategy,
+  ChangeDetectorRef,
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core'
+import { UntypedFormGroup } from '@angular/forms'
+import {
+  GeneVariantRevisableFieldsGQL,
+  SuggestGeneVariantRevisionGQL,
+  SuggestGeneVariantRevisionMutation,
+  SuggestGeneVariantRevisionMutationVariables,
+} from '@app/generated/civic.apollo'
+import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy'
+import { FormlyFieldConfig } from '@ngx-formly/core'
+import {
+  MutationState,
+  MutatorWithState,
+} from '@app/core/utilities/mutation-state-wrapper'
+import { NetworkErrorsService } from '@app/core/services/network-errors.service'
+import { GeneVariantReviseModel } from '@app/forms/models/gene-variant-revise.model'
+import { geneVariantReviseFields } from './gene-variant-revise.form.config'
+import {
+  geneVariantFormModelToReviseInput,
+  geneVariantToModelFields,
+} from '@app/forms/utilities/gene-variant-to-model-fields'
+
+@UntilDestroy()
+@Component({
+  selector: 'cvc-gene-variant-revise-form',
+  templateUrl: './gene-variant-revise.form.html',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class CvcGeneVariantReviseForm implements OnInit, AfterViewInit {
+  @Input() variantId!: number
+  model?: GeneVariantReviseModel
+  form: UntypedFormGroup
+  fields: FormlyFieldConfig[]
+
+  reviseVariantMutator: MutatorWithState<
+    SuggestGeneVariantRevisionGQL,
+    SuggestGeneVariantRevisionMutation,
+    SuggestGeneVariantRevisionMutationVariables
+  >
+
+  mutationState?: MutationState
+  url?: string
+
+  constructor(
+    private revisableFieldsGQL: GeneVariantRevisableFieldsGQL,
+    private submitRevisionsGQL: SuggestGeneVariantRevisionGQL,
+    private networkErrorService: NetworkErrorsService,
+    private cdr: ChangeDetectorRef
+  ) {
+    this.form = new UntypedFormGroup({})
+    this.fields = geneVariantReviseFields
+    this.reviseVariantMutator = new MutatorWithState(networkErrorService)
+  }
+
+  ngOnInit() {
+    this.url = `/variants/${this.variantId}/revisions`
+  }
+
+  ngAfterViewInit(): void {
+    this.revisableFieldsGQL
+      .fetch({ variantId: this.variantId })
+      .pipe(untilDestroyed(this))
+      .subscribe({
+        next: ({ data: { variant } }) => {
+          if (variant && variant.__typename == 'GeneVariant') {
+            this.model = {
+              id: variant.id,
+              fields: geneVariantToModelFields(variant),
+            }
+            this.cdr.detectChanges()
+          }
+        },
+        error: (error) => {
+          console.error('Error retrieving Variant.')
+          console.error(error)
+        },
+        complete: () => {},
+      })
+  }
+
+  onSubmit(model: GeneVariantReviseModel) {
+    if (!this.variantId) {
+      return
+    }
+    let input = geneVariantFormModelToReviseInput(this.variantId, model)
+    if (input) {
+      this.mutationState = this.reviseVariantMutator.mutate(
+        this.submitRevisionsGQL,
+        { input: input }
+      )
+    }
+  }
+}
diff --git a/client/src/app/forms/config/variant-revise/variant-revise.query.gql b/client/src/app/forms/config/gene-variant-revise/gene-variant-revise.query.gql
similarity index 65%
rename from client/src/app/forms/config/variant-revise/variant-revise.query.gql
rename to client/src/app/forms/config/gene-variant-revise/gene-variant-revise.query.gql
index 2258f00cd..5de1293ca 100644
--- a/client/src/app/forms/config/variant-revise/variant-revise.query.gql
+++ b/client/src/app/forms/config/gene-variant-revise/gene-variant-revise.query.gql
@@ -1,11 +1,13 @@
-query VariantRevisableFields($variantId: Int!) {
+query GeneVariantRevisableFields($variantId: Int!) {
   variant(id: $variantId) {
-    ...RevisableVariantFields
+    id
+    ... on GeneVariant  {
+      ...RevisableGeneVariantFields
+    }
   }
 }
 
-fragment RevisableVariantFields on Variant {
-  id
+fragment RevisableGeneVariantFields on GeneVariant {
   name
   feature {
     id
@@ -39,8 +41,8 @@ fragment CoordinateFields on Coordinate {
   stop
 }
 
-mutation SuggestVariantRevision($input: SuggestVariantRevisionInput!) {
-  suggestVariantRevision(input: $input) {
+mutation SuggestGeneVariantRevision($input: SuggestGeneVariantRevisionInput!) {
+  suggestGeneVariantRevision(input: $input) {
     clientMutationId
     variant {
       id
diff --git a/client/src/app/forms/config/variant-revise/variant-revise.form.config.ts b/client/src/app/forms/config/gene-variant-revise/variant-revise.form.config.ts
similarity index 98%
rename from client/src/app/forms/config/variant-revise/variant-revise.form.config.ts
rename to client/src/app/forms/config/gene-variant-revise/variant-revise.form.config.ts
index 773576b3b..ff35f4cf3 100644
--- a/client/src/app/forms/config/variant-revise/variant-revise.form.config.ts
+++ b/client/src/app/forms/config/gene-variant-revise/variant-revise.form.config.ts
@@ -1,6 +1,6 @@
 import { AbstractControl } from '@angular/forms'
 import { Chromosomes } from '@app/forms/utilities/input-formatters'
-import { variantReviseFormInitialModel } from '@app/forms/models/variant-revise.model'
+import { geneVariantReviseFormInitialModel } from '@app/forms/models/gene-variant-revise.model'
 import assignFieldConfigDefaultValues from '@app/forms/utilities/assign-field-default-values'
 import { CvcFormCardWrapperProps } from '@app/forms/wrappers/form-card/form-card.wrapper'
 import { CvcFormLayoutWrapperProps } from '@app/forms/wrappers/form-layout/form-layout.wrapper'
@@ -359,5 +359,8 @@ const formFieldConfig: FormlyFieldConfig[] = [
     ],
   },
 ]
-export const variantReviseFields: FormlyFieldConfig[] =
-  assignFieldConfigDefaultValues(formFieldConfig, variantReviseFormInitialModel)
+export const geneVariantReviseFields: FormlyFieldConfig[] =
+  assignFieldConfigDefaultValues(
+    formFieldConfig,
+    geneVariantReviseFormInitialModel
+  )
diff --git a/client/src/app/forms/config/variant-revise/variant-revise.form.module.ts b/client/src/app/forms/config/variant-revise/variant-revise.form.module.ts
deleted file mode 100644
index 544c9ee88..000000000
--- a/client/src/app/forms/config/variant-revise/variant-revise.form.module.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { NzFormModule } from 'ng-zorro-antd/form';
-import { NzButtonModule } from 'ng-zorro-antd/button';
-import { CvcForms2Module } from '@app/forms/forms.module';
-import { NgxJsonViewerModule } from 'ngx-json-viewer';
-import { LetDirective, PushPipe } from '@ngrx/component';
-import { CvcFormSubmissionStatusDisplayModule } from '@app/forms/components/form-submission-status-display/form-submission-status-display.module';
-import { CvcVariantReviseForm } from './variant-revise.form';
-
-@NgModule({
-  declarations: [
-    CvcVariantReviseForm
-  ],
-  imports: [
-    CommonModule,
-    LetDirective, PushPipe,
-    NzFormModule,
-    NzButtonModule,
-    CvcForms2Module,
-    CvcFormSubmissionStatusDisplayModule,
-
-    NgxJsonViewerModule, // debug
-  ],
-  exports: [
-    CvcVariantReviseForm
-  ]
-})
-export class CvcVariantReviseFormModule { }
diff --git a/client/src/app/forms/config/variant-revise/variant-revise.form.ts b/client/src/app/forms/config/variant-revise/variant-revise.form.ts
deleted file mode 100644
index 2f9943289..000000000
--- a/client/src/app/forms/config/variant-revise/variant-revise.form.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-import {
-  AfterViewInit,
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  Input,
-  OnInit,
-} from '@angular/core'
-import { UntypedFormGroup } from '@angular/forms'
-import { SuggestVariantRevisionGQL, SuggestVariantRevisionMutation, SuggestVariantRevisionMutationVariables, VariantRevisableFieldsGQL } from '@app/generated/civic.apollo'
-import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy'
-import { FormlyFieldConfig } from '@ngx-formly/core'
-import { MutationState, MutatorWithState } from '@app/core/utilities/mutation-state-wrapper'
-import { NetworkErrorsService } from '@app/core/services/network-errors.service'
-import { VariantReviseModel } from '@app/forms/models/variant-revise.model'
-import { variantReviseFields } from './variant-revise.form.config'
-import { variantFormModelToReviseInput, variantToModelFields } from '@app/forms/utilities/variant-to-model-fields'
-
-@UntilDestroy()
-@Component({
-  selector: 'cvc-variant-revise-form',
-  templateUrl: './variant-revise.form.html',
-  changeDetection: ChangeDetectionStrategy.OnPush,
-})
-export class CvcVariantReviseForm implements OnInit, AfterViewInit {
-  @Input() variantId!: number
-  model?: VariantReviseModel
-  form: UntypedFormGroup
-  fields: FormlyFieldConfig[]
-
-  reviseVariantMutator: MutatorWithState<
-    SuggestVariantRevisionGQL,
-    SuggestVariantRevisionMutation,
-    SuggestVariantRevisionMutationVariables
-  >
-
-  mutationState?: MutationState
-  url?: string
-
-  constructor(
-    private revisableFieldsGQL: VariantRevisableFieldsGQL,
-    private submitRevisionsGQL: SuggestVariantRevisionGQL,
-    private networkErrorService: NetworkErrorsService,
-    private cdr: ChangeDetectorRef
-  ) {
-    this.form = new UntypedFormGroup({})
-    this.fields = variantReviseFields
-    this.reviseVariantMutator = new MutatorWithState(networkErrorService)
-  }
-
-  ngOnInit() {
-    this.url = `/variants/${this.variantId }/revisions`
-  }
-
-  ngAfterViewInit(): void {
-    this.revisableFieldsGQL
-      .fetch({ variantId: this.variantId })
-      .pipe(untilDestroyed(this))
-      .subscribe({
-        next: ({ data: { variant } }) => {
-          if (variant) {
-            this.model = {
-              id: variant.id,
-              fields: variantToModelFields(variant),
-            }
-            this.cdr.detectChanges()
-          }
-        },
-        error: (error) => {
-          console.error('Error retrieving Variant.')
-          console.error(error)
-        },
-        complete: () => { },
-      })
-  }
-
-  onSubmit(model: VariantReviseModel) {
-    if(!this.variantId) {return}
-    let input = variantFormModelToReviseInput(this.variantId, model)
-    if (input) {
-      this.mutationState = this.reviseVariantMutator.mutate(this.submitRevisionsGQL, { input: input})
-    }
-  }
-}
diff --git a/client/src/app/forms/models/variant-fields.model.ts b/client/src/app/forms/models/gene-variant-fields.model.ts
similarity index 82%
rename from client/src/app/forms/models/variant-fields.model.ts
rename to client/src/app/forms/models/gene-variant-fields.model.ts
index 150e7572f..e4dcbd54a 100644
--- a/client/src/app/forms/models/variant-fields.model.ts
+++ b/client/src/app/forms/models/gene-variant-fields.model.ts
@@ -1,6 +1,6 @@
-import { ReferenceBuild } from "@app/generated/civic.apollo"
+import { ReferenceBuild } from '@app/generated/civic.apollo'
 
-export type VariantFields = {
+export type GeneVariantFields = {
   name?: string
   aliases?: string[]
   hgvsDescriptions?: string[]
diff --git a/client/src/app/forms/models/variant-revise.model.ts b/client/src/app/forms/models/gene-variant-revise.model.ts
similarity index 59%
rename from client/src/app/forms/models/variant-revise.model.ts
rename to client/src/app/forms/models/gene-variant-revise.model.ts
index 3da747aaa..3a650b383 100644
--- a/client/src/app/forms/models/variant-revise.model.ts
+++ b/client/src/app/forms/models/gene-variant-revise.model.ts
@@ -1,11 +1,11 @@
 import { FormReviseBaseModel } from './form-revise-base.model'
-import { VariantFields } from './variant-fields.model'
+import { GeneVariantFields } from './gene-variant-fields.model'
 
-export interface VariantReviseModel extends FormReviseBaseModel {
-  fields: VariantFields
+export interface GeneVariantReviseModel extends FormReviseBaseModel {
+  fields: GeneVariantFields
 }
 
-export const variantReviseFieldsDefaults: VariantFields = {
+export const geneVariantReviseFieldsDefaults: GeneVariantFields = {
   name: undefined,
   aliases: undefined,
   hgvsDescriptions: undefined,
@@ -23,13 +23,13 @@ export const variantReviseFieldsDefaults: VariantFields = {
   representativeTranscript2: undefined,
   featureId: undefined,
   referenceBases: undefined,
-  variantBases: undefined
+  variantBases: undefined,
 }
 
-export const variantReviseFormInitialModel: VariantReviseModel = {
+export const geneVariantReviseFormInitialModel: GeneVariantReviseModel = {
   id: undefined,
   clientMutationId: undefined,
-  fields: variantReviseFieldsDefaults,
+  fields: geneVariantReviseFieldsDefaults,
   comment: undefined,
-  organizationId: undefined
+  organizationId: undefined,
 }
diff --git a/client/src/app/forms/test-pages/variant-revise-test/variant-revise-test.module.ts b/client/src/app/forms/test-pages/variant-revise-test/variant-revise-test.module.ts
index 846f5cfec..ee70679dc 100644
--- a/client/src/app/forms/test-pages/variant-revise-test/variant-revise-test.module.ts
+++ b/client/src/app/forms/test-pages/variant-revise-test/variant-revise-test.module.ts
@@ -1,11 +1,10 @@
 import { NgModule } from '@angular/core'
 import { CommonModule } from '@angular/common'
 import { VariantReviseTestPage } from './variant-revise-test.page'
-import { CvcVariantReviseFormModule } from '@app/forms/config/variant-revise/variant-revise.form.module'
+import { CvcGeneVariantReviseFormModule } from '@app/forms/config/gene-variant-revise/gene-variant-revise.form.module'
 
 @NgModule({
   declarations: [VariantReviseTestPage],
-  imports: [CommonModule, CvcVariantReviseFormModule],
+  imports: [CommonModule, CvcGeneVariantReviseFormModule],
 })
 export class VariantReviseTestModule {}
-
diff --git a/client/src/app/forms/test-pages/variant-revise-test/variant-revise-test.page.html b/client/src/app/forms/test-pages/variant-revise-test/variant-revise-test.page.html
index 0d5b44a62..c747c5617 100644
--- a/client/src/app/forms/test-pages/variant-revise-test/variant-revise-test.page.html
+++ b/client/src/app/forms/test-pages/variant-revise-test/variant-revise-test.page.html
@@ -1 +1,2 @@
-<cvc-variant-revise-form [variantId]="4"></cvc-variant-revise-form>
\ No newline at end of file
+<cvc-gene-variant-revise-form [variantId]="4"></cvc-gene-variant-revise-form>
+
diff --git a/client/src/app/forms/types/variant-select/variant-select.query.gql b/client/src/app/forms/types/variant-select/variant-select.query.gql
index 7e3c2fae4..26271c7c0 100644
--- a/client/src/app/forms/types/variant-select/variant-select.query.gql
+++ b/client/src/app/forms/types/variant-select/variant-select.query.gql
@@ -18,7 +18,7 @@ query VariantSelectTag($variantId: Int!) {
   }
 }
 
-fragment VariantSelectTypeaheadFields on Variant {
+fragment VariantSelectTypeaheadFields on VariantInterface {
   id
   name
   link
diff --git a/client/src/app/forms/utilities/variant-to-model-fields.ts b/client/src/app/forms/utilities/gene-variant-to-model-fields.ts
similarity index 85%
rename from client/src/app/forms/utilities/variant-to-model-fields.ts
rename to client/src/app/forms/utilities/gene-variant-to-model-fields.ts
index c91e9c505..91901b3bf 100644
--- a/client/src/app/forms/utilities/variant-to-model-fields.ts
+++ b/client/src/app/forms/utilities/gene-variant-to-model-fields.ts
@@ -1,16 +1,16 @@
 import {
   ClinvarInput,
   Maybe,
-  RevisableVariantFieldsFragment,
-  SuggestVariantRevisionInput,
+  RevisableGeneVariantFieldsFragment,
+  SuggestGeneVariantRevisionInput,
 } from '@app/generated/civic.apollo'
 import * as fmt from '@app/forms/utilities/input-formatters'
-import { VariantReviseModel } from '../models/variant-revise.model'
-import { VariantFields } from '../models/variant-fields.model'
+import { GeneVariantReviseModel } from '../models/gene-variant-revise.model'
+import { GeneVariantFields } from '../models/gene-variant-fields.model'
 
-export function variantToModelFields(
-  variant: RevisableVariantFieldsFragment
-): VariantFields {
+export function geneVariantToModelFields(
+  variant: RevisableGeneVariantFieldsFragment
+): GeneVariantFields {
   return {
     name: variant.name,
     aliases: variant.variantAliases,
@@ -35,10 +35,10 @@ export function variantToModelFields(
   }
 }
 
-export function variantFormModelToReviseInput(
+export function geneVariantFormModelToReviseInput(
   vid: number,
-  model: VariantReviseModel
-): Maybe<SuggestVariantRevisionInput> {
+  model: GeneVariantReviseModel
+): Maybe<SuggestGeneVariantRevisionInput> {
   const fields = model.fields
   if (!model.comment || !fields.name || !fields.featureId) {
     return undefined
diff --git a/client/src/app/generated/civic.apollo-helpers.ts b/client/src/app/generated/civic.apollo-helpers.ts
index 84d7b0d20..a62ac9d64 100644
--- a/client/src/app/generated/civic.apollo-helpers.ts
+++ b/client/src/app/generated/civic.apollo-helpers.ts
@@ -39,7 +39,7 @@ export type ActivityInterfaceFieldPolicy = {
 	user?: FieldPolicy<any> | FieldReadFunction<any>,
 	verbiage?: FieldPolicy<any> | FieldReadFunction<any>
 };
-export type ActivityInterfaceConnectionKeySpecifier = ('activityTypes' | 'edges' | 'nodes' | 'pageCount' | 'pageInfo' | 'participatingOrganizations' | 'totalCount' | 'unfilteredCount' | 'uniqueParticipants' | ActivityInterfaceConnectionKeySpecifier)[];
+export type ActivityInterfaceConnectionKeySpecifier = ('activityTypes' | 'edges' | 'nodes' | 'pageCount' | 'pageInfo' | 'participatingOrganizations' | 'subjectTypes' | 'totalCount' | 'unfilteredCount' | 'uniqueParticipants' | ActivityInterfaceConnectionKeySpecifier)[];
 export type ActivityInterfaceConnectionFieldPolicy = {
 	activityTypes?: FieldPolicy<any> | FieldReadFunction<any>,
 	edges?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -47,6 +47,7 @@ export type ActivityInterfaceConnectionFieldPolicy = {
 	pageCount?: FieldPolicy<any> | FieldReadFunction<any>,
 	pageInfo?: FieldPolicy<any> | FieldReadFunction<any>,
 	participatingOrganizations?: FieldPolicy<any> | FieldReadFunction<any>,
+	subjectTypes?: FieldPolicy<any> | FieldReadFunction<any>,
 	totalCount?: FieldPolicy<any> | FieldReadFunction<any>,
 	unfilteredCount?: FieldPolicy<any> | FieldReadFunction<any>,
 	uniqueParticipants?: FieldPolicy<any> | FieldReadFunction<any>
@@ -846,6 +847,31 @@ export type FactorFieldPolicy = {
 	sources?: FieldPolicy<any> | FieldReadFunction<any>,
 	variants?: FieldPolicy<any> | FieldReadFunction<any>
 };
+export type FactorVariantKeySpecifier = ('comments' | 'creationActivity' | 'deprecated' | 'deprecationActivity' | 'deprecationReason' | 'events' | 'feature' | 'flagged' | 'flags' | 'id' | 'lastAcceptedRevisionEvent' | 'lastCommentEvent' | 'lastSubmittedRevisionEvent' | 'link' | 'molecularProfiles' | 'name' | 'ncitId' | 'revisions' | 'singleVariantMolecularProfile' | 'singleVariantMolecularProfileId' | 'variantAliases' | 'variantTypes' | FactorVariantKeySpecifier)[];
+export type FactorVariantFieldPolicy = {
+	comments?: FieldPolicy<any> | FieldReadFunction<any>,
+	creationActivity?: FieldPolicy<any> | FieldReadFunction<any>,
+	deprecated?: FieldPolicy<any> | FieldReadFunction<any>,
+	deprecationActivity?: FieldPolicy<any> | FieldReadFunction<any>,
+	deprecationReason?: FieldPolicy<any> | FieldReadFunction<any>,
+	events?: FieldPolicy<any> | FieldReadFunction<any>,
+	feature?: FieldPolicy<any> | FieldReadFunction<any>,
+	flagged?: FieldPolicy<any> | FieldReadFunction<any>,
+	flags?: FieldPolicy<any> | FieldReadFunction<any>,
+	id?: FieldPolicy<any> | FieldReadFunction<any>,
+	lastAcceptedRevisionEvent?: FieldPolicy<any> | FieldReadFunction<any>,
+	lastCommentEvent?: FieldPolicy<any> | FieldReadFunction<any>,
+	lastSubmittedRevisionEvent?: FieldPolicy<any> | FieldReadFunction<any>,
+	link?: FieldPolicy<any> | FieldReadFunction<any>,
+	molecularProfiles?: FieldPolicy<any> | FieldReadFunction<any>,
+	name?: FieldPolicy<any> | FieldReadFunction<any>,
+	ncitId?: FieldPolicy<any> | FieldReadFunction<any>,
+	revisions?: FieldPolicy<any> | FieldReadFunction<any>,
+	singleVariantMolecularProfile?: FieldPolicy<any> | FieldReadFunction<any>,
+	singleVariantMolecularProfileId?: FieldPolicy<any> | FieldReadFunction<any>,
+	variantAliases?: FieldPolicy<any> | FieldReadFunction<any>,
+	variantTypes?: FieldPolicy<any> | FieldReadFunction<any>
+};
 export type FdaCodeKeySpecifier = ('code' | 'description' | FdaCodeKeySpecifier)[];
 export type FdaCodeFieldPolicy = {
 	code?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -982,6 +1008,42 @@ export type GeneEdgeFieldPolicy = {
 	cursor?: FieldPolicy<any> | FieldReadFunction<any>,
 	node?: FieldPolicy<any> | FieldReadFunction<any>
 };
+export type GeneVariantKeySpecifier = ('alleleRegistryId' | 'clinvarIds' | 'comments' | 'creationActivity' | 'deprecated' | 'deprecationActivity' | 'deprecationReason' | 'ensemblVersion' | 'events' | 'feature' | 'flagged' | 'flags' | 'hgvsDescriptions' | 'id' | 'lastAcceptedRevisionEvent' | 'lastCommentEvent' | 'lastSubmittedRevisionEvent' | 'link' | 'maneSelectTranscript' | 'molecularProfiles' | 'myVariantInfo' | 'name' | 'openCravatUrl' | 'primaryCoordinates' | 'referenceBases' | 'referenceBuild' | 'revisions' | 'secondaryCoordinates' | 'singleVariantMolecularProfile' | 'singleVariantMolecularProfileId' | 'variantAliases' | 'variantBases' | 'variantTypes' | GeneVariantKeySpecifier)[];
+export type GeneVariantFieldPolicy = {
+	alleleRegistryId?: FieldPolicy<any> | FieldReadFunction<any>,
+	clinvarIds?: FieldPolicy<any> | FieldReadFunction<any>,
+	comments?: FieldPolicy<any> | FieldReadFunction<any>,
+	creationActivity?: FieldPolicy<any> | FieldReadFunction<any>,
+	deprecated?: FieldPolicy<any> | FieldReadFunction<any>,
+	deprecationActivity?: FieldPolicy<any> | FieldReadFunction<any>,
+	deprecationReason?: FieldPolicy<any> | FieldReadFunction<any>,
+	ensemblVersion?: FieldPolicy<any> | FieldReadFunction<any>,
+	events?: FieldPolicy<any> | FieldReadFunction<any>,
+	feature?: FieldPolicy<any> | FieldReadFunction<any>,
+	flagged?: FieldPolicy<any> | FieldReadFunction<any>,
+	flags?: FieldPolicy<any> | FieldReadFunction<any>,
+	hgvsDescriptions?: FieldPolicy<any> | FieldReadFunction<any>,
+	id?: FieldPolicy<any> | FieldReadFunction<any>,
+	lastAcceptedRevisionEvent?: FieldPolicy<any> | FieldReadFunction<any>,
+	lastCommentEvent?: FieldPolicy<any> | FieldReadFunction<any>,
+	lastSubmittedRevisionEvent?: FieldPolicy<any> | FieldReadFunction<any>,
+	link?: FieldPolicy<any> | FieldReadFunction<any>,
+	maneSelectTranscript?: FieldPolicy<any> | FieldReadFunction<any>,
+	molecularProfiles?: FieldPolicy<any> | FieldReadFunction<any>,
+	myVariantInfo?: FieldPolicy<any> | FieldReadFunction<any>,
+	name?: FieldPolicy<any> | FieldReadFunction<any>,
+	openCravatUrl?: FieldPolicy<any> | FieldReadFunction<any>,
+	primaryCoordinates?: FieldPolicy<any> | FieldReadFunction<any>,
+	referenceBases?: FieldPolicy<any> | FieldReadFunction<any>,
+	referenceBuild?: FieldPolicy<any> | FieldReadFunction<any>,
+	revisions?: FieldPolicy<any> | FieldReadFunction<any>,
+	secondaryCoordinates?: FieldPolicy<any> | FieldReadFunction<any>,
+	singleVariantMolecularProfile?: FieldPolicy<any> | FieldReadFunction<any>,
+	singleVariantMolecularProfileId?: FieldPolicy<any> | FieldReadFunction<any>,
+	variantAliases?: FieldPolicy<any> | FieldReadFunction<any>,
+	variantBases?: FieldPolicy<any> | FieldReadFunction<any>,
+	variantTypes?: FieldPolicy<any> | FieldReadFunction<any>
+};
 export type LeaderboardOrganizationKeySpecifier = ('actionCount' | 'description' | 'eventCount' | 'events' | 'id' | 'memberCount' | 'members' | 'mostRecentActivityTimestamp' | 'name' | 'orgAndSuborgsStatsHash' | 'orgStatsHash' | 'profileImagePath' | 'rank' | 'ranks' | 'subGroups' | 'url' | LeaderboardOrganizationKeySpecifier)[];
 export type LeaderboardOrganizationFieldPolicy = {
 	actionCount?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -1213,7 +1275,7 @@ export type MolecularProfileTextSegmentKeySpecifier = ('text' | MolecularProfile
 export type MolecularProfileTextSegmentFieldPolicy = {
 	text?: FieldPolicy<any> | FieldReadFunction<any>
 };
-export type MutationKeySpecifier = ('acceptRevisions' | 'addComment' | 'addDisease' | 'addRemoteCitation' | 'addTherapy' | 'createFeature' | 'createMolecularProfile' | 'createVariant' | 'deprecateComplexMolecularProfile' | 'deprecateFeature' | 'deprecateVariant' | 'editUser' | 'flagEntity' | 'moderateAssertion' | 'moderateEvidenceItem' | 'rejectRevisions' | 'resolveFlag' | 'submitAssertion' | 'submitEvidence' | 'submitVariantGroup' | 'subscribe' | 'suggestAssertionRevision' | 'suggestEvidenceItemRevision' | 'suggestFactorRevision' | 'suggestGeneRevision' | 'suggestMolecularProfileRevision' | 'suggestSource' | 'suggestVariantGroupRevision' | 'suggestVariantRevision' | 'unsubscribe' | 'updateCoi' | 'updateNotificationStatus' | 'updateSourceSuggestionStatus' | MutationKeySpecifier)[];
+export type MutationKeySpecifier = ('acceptRevisions' | 'addComment' | 'addDisease' | 'addRemoteCitation' | 'addTherapy' | 'createFeature' | 'createMolecularProfile' | 'createVariant' | 'deprecateComplexMolecularProfile' | 'deprecateFeature' | 'deprecateVariant' | 'editUser' | 'flagEntity' | 'moderateAssertion' | 'moderateEvidenceItem' | 'rejectRevisions' | 'resolveFlag' | 'submitAssertion' | 'submitEvidence' | 'submitVariantGroup' | 'subscribe' | 'suggestAssertionRevision' | 'suggestEvidenceItemRevision' | 'suggestFactorRevision' | 'suggestGeneRevision' | 'suggestGeneVariantRevision' | 'suggestMolecularProfileRevision' | 'suggestSource' | 'suggestVariantGroupRevision' | 'unsubscribe' | 'updateCoi' | 'updateNotificationStatus' | 'updateSourceSuggestionStatus' | MutationKeySpecifier)[];
 export type MutationFieldPolicy = {
 	acceptRevisions?: FieldPolicy<any> | FieldReadFunction<any>,
 	addComment?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -1240,10 +1302,10 @@ export type MutationFieldPolicy = {
 	suggestEvidenceItemRevision?: FieldPolicy<any> | FieldReadFunction<any>,
 	suggestFactorRevision?: FieldPolicy<any> | FieldReadFunction<any>,
 	suggestGeneRevision?: FieldPolicy<any> | FieldReadFunction<any>,
+	suggestGeneVariantRevision?: FieldPolicy<any> | FieldReadFunction<any>,
 	suggestMolecularProfileRevision?: FieldPolicy<any> | FieldReadFunction<any>,
 	suggestSource?: FieldPolicy<any> | FieldReadFunction<any>,
 	suggestVariantGroupRevision?: FieldPolicy<any> | FieldReadFunction<any>,
-	suggestVariantRevision?: FieldPolicy<any> | FieldReadFunction<any>,
 	unsubscribe?: FieldPolicy<any> | FieldReadFunction<any>,
 	updateCoi?: FieldPolicy<any> | FieldReadFunction<any>,
 	updateNotificationStatus?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -1860,6 +1922,12 @@ export type SuggestGeneRevisionPayloadFieldPolicy = {
 	gene?: FieldPolicy<any> | FieldReadFunction<any>,
 	results?: FieldPolicy<any> | FieldReadFunction<any>
 };
+export type SuggestGeneVariantRevisionPayloadKeySpecifier = ('clientMutationId' | 'results' | 'variant' | SuggestGeneVariantRevisionPayloadKeySpecifier)[];
+export type SuggestGeneVariantRevisionPayloadFieldPolicy = {
+	clientMutationId?: FieldPolicy<any> | FieldReadFunction<any>,
+	results?: FieldPolicy<any> | FieldReadFunction<any>,
+	variant?: FieldPolicy<any> | FieldReadFunction<any>
+};
 export type SuggestMolecularProfileRevisionPayloadKeySpecifier = ('clientMutationId' | 'molecularProfile' | 'results' | SuggestMolecularProfileRevisionPayloadKeySpecifier)[];
 export type SuggestMolecularProfileRevisionPayloadFieldPolicy = {
 	clientMutationId?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -1904,12 +1972,6 @@ export type SuggestVariantGroupRevisionPayloadFieldPolicy = {
 	results?: FieldPolicy<any> | FieldReadFunction<any>,
 	variantGroup?: FieldPolicy<any> | FieldReadFunction<any>
 };
-export type SuggestVariantRevisionPayloadKeySpecifier = ('clientMutationId' | 'results' | 'variant' | SuggestVariantRevisionPayloadKeySpecifier)[];
-export type SuggestVariantRevisionPayloadFieldPolicy = {
-	clientMutationId?: FieldPolicy<any> | FieldReadFunction<any>,
-	results?: FieldPolicy<any> | FieldReadFunction<any>,
-	variant?: FieldPolicy<any> | FieldReadFunction<any>
-};
 export type TherapyKeySpecifier = ('id' | 'link' | 'myChemInfo' | 'name' | 'ncitId' | 'therapyAliases' | 'therapyUrl' | TherapyKeySpecifier)[];
 export type TherapyFieldPolicy = {
 	id?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -2026,59 +2088,34 @@ export type ValidationErrorsFieldPolicy = {
 	genericErrors?: FieldPolicy<any> | FieldReadFunction<any>,
 	validationErrors?: FieldPolicy<any> | FieldReadFunction<any>
 };
-export type VariantKeySpecifier = ('alleleRegistryId' | 'clinvarIds' | 'comments' | 'creationActivity' | 'deprecated' | 'deprecationActivity' | 'deprecationReason' | 'ensemblVersion' | 'events' | 'feature' | 'flagged' | 'flags' | 'hgvsDescriptions' | 'id' | 'lastAcceptedRevisionEvent' | 'lastCommentEvent' | 'lastSubmittedRevisionEvent' | 'link' | 'maneSelectTranscript' | 'molecularProfiles' | 'myVariantInfo' | 'name' | 'openCravatUrl' | 'primaryCoordinates' | 'referenceBases' | 'referenceBuild' | 'revisions' | 'secondaryCoordinates' | 'singleVariantMolecularProfile' | 'singleVariantMolecularProfileId' | 'variantAliases' | 'variantBases' | 'variantTypes' | VariantKeySpecifier)[];
+export type VariantKeySpecifier = ('comments' | 'creationActivity' | 'deprecated' | 'deprecationActivity' | 'deprecationReason' | 'events' | 'feature' | 'flagged' | 'flags' | 'id' | 'lastAcceptedRevisionEvent' | 'lastCommentEvent' | 'lastSubmittedRevisionEvent' | 'link' | 'molecularProfiles' | 'name' | 'revisions' | 'singleVariantMolecularProfile' | 'singleVariantMolecularProfileId' | 'variantAliases' | 'variantTypes' | VariantKeySpecifier)[];
 export type VariantFieldPolicy = {
-	alleleRegistryId?: FieldPolicy<any> | FieldReadFunction<any>,
-	clinvarIds?: FieldPolicy<any> | FieldReadFunction<any>,
 	comments?: FieldPolicy<any> | FieldReadFunction<any>,
 	creationActivity?: FieldPolicy<any> | FieldReadFunction<any>,
 	deprecated?: FieldPolicy<any> | FieldReadFunction<any>,
 	deprecationActivity?: FieldPolicy<any> | FieldReadFunction<any>,
 	deprecationReason?: FieldPolicy<any> | FieldReadFunction<any>,
-	ensemblVersion?: FieldPolicy<any> | FieldReadFunction<any>,
 	events?: FieldPolicy<any> | FieldReadFunction<any>,
 	feature?: FieldPolicy<any> | FieldReadFunction<any>,
 	flagged?: FieldPolicy<any> | FieldReadFunction<any>,
 	flags?: FieldPolicy<any> | FieldReadFunction<any>,
-	hgvsDescriptions?: FieldPolicy<any> | FieldReadFunction<any>,
 	id?: FieldPolicy<any> | FieldReadFunction<any>,
 	lastAcceptedRevisionEvent?: FieldPolicy<any> | FieldReadFunction<any>,
 	lastCommentEvent?: FieldPolicy<any> | FieldReadFunction<any>,
 	lastSubmittedRevisionEvent?: FieldPolicy<any> | FieldReadFunction<any>,
 	link?: FieldPolicy<any> | FieldReadFunction<any>,
-	maneSelectTranscript?: FieldPolicy<any> | FieldReadFunction<any>,
 	molecularProfiles?: FieldPolicy<any> | FieldReadFunction<any>,
-	myVariantInfo?: FieldPolicy<any> | FieldReadFunction<any>,
 	name?: FieldPolicy<any> | FieldReadFunction<any>,
-	openCravatUrl?: FieldPolicy<any> | FieldReadFunction<any>,
-	primaryCoordinates?: FieldPolicy<any> | FieldReadFunction<any>,
-	referenceBases?: FieldPolicy<any> | FieldReadFunction<any>,
-	referenceBuild?: FieldPolicy<any> | FieldReadFunction<any>,
 	revisions?: FieldPolicy<any> | FieldReadFunction<any>,
-	secondaryCoordinates?: FieldPolicy<any> | FieldReadFunction<any>,
 	singleVariantMolecularProfile?: FieldPolicy<any> | FieldReadFunction<any>,
 	singleVariantMolecularProfileId?: FieldPolicy<any> | FieldReadFunction<any>,
 	variantAliases?: FieldPolicy<any> | FieldReadFunction<any>,
-	variantBases?: FieldPolicy<any> | FieldReadFunction<any>,
 	variantTypes?: FieldPolicy<any> | FieldReadFunction<any>
 };
 export type VariantAliasKeySpecifier = ('name' | VariantAliasKeySpecifier)[];
 export type VariantAliasFieldPolicy = {
 	name?: FieldPolicy<any> | FieldReadFunction<any>
 };
-export type VariantConnectionKeySpecifier = ('edges' | 'nodes' | 'pageCount' | 'pageInfo' | 'totalCount' | VariantConnectionKeySpecifier)[];
-export type VariantConnectionFieldPolicy = {
-	edges?: FieldPolicy<any> | FieldReadFunction<any>,
-	nodes?: FieldPolicy<any> | FieldReadFunction<any>,
-	pageCount?: FieldPolicy<any> | FieldReadFunction<any>,
-	pageInfo?: FieldPolicy<any> | FieldReadFunction<any>,
-	totalCount?: FieldPolicy<any> | FieldReadFunction<any>
-};
-export type VariantEdgeKeySpecifier = ('cursor' | 'node' | VariantEdgeKeySpecifier)[];
-export type VariantEdgeFieldPolicy = {
-	cursor?: FieldPolicy<any> | FieldReadFunction<any>,
-	node?: FieldPolicy<any> | FieldReadFunction<any>
-};
 export type VariantGroupKeySpecifier = ('comments' | 'description' | 'events' | 'flagged' | 'flags' | 'id' | 'lastAcceptedRevisionEvent' | 'lastCommentEvent' | 'lastSubmittedRevisionEvent' | 'link' | 'name' | 'revisions' | 'sources' | 'variants' | VariantGroupKeySpecifier)[];
 export type VariantGroupFieldPolicy = {
 	comments?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -2109,6 +2146,43 @@ export type VariantGroupEdgeFieldPolicy = {
 	cursor?: FieldPolicy<any> | FieldReadFunction<any>,
 	node?: FieldPolicy<any> | FieldReadFunction<any>
 };
+export type VariantInterfaceKeySpecifier = ('comments' | 'creationActivity' | 'deprecated' | 'deprecationActivity' | 'deprecationReason' | 'events' | 'feature' | 'flagged' | 'flags' | 'id' | 'lastAcceptedRevisionEvent' | 'lastCommentEvent' | 'lastSubmittedRevisionEvent' | 'link' | 'molecularProfiles' | 'name' | 'revisions' | 'singleVariantMolecularProfile' | 'singleVariantMolecularProfileId' | 'variantAliases' | 'variantTypes' | VariantInterfaceKeySpecifier)[];
+export type VariantInterfaceFieldPolicy = {
+	comments?: FieldPolicy<any> | FieldReadFunction<any>,
+	creationActivity?: FieldPolicy<any> | FieldReadFunction<any>,
+	deprecated?: FieldPolicy<any> | FieldReadFunction<any>,
+	deprecationActivity?: FieldPolicy<any> | FieldReadFunction<any>,
+	deprecationReason?: FieldPolicy<any> | FieldReadFunction<any>,
+	events?: FieldPolicy<any> | FieldReadFunction<any>,
+	feature?: FieldPolicy<any> | FieldReadFunction<any>,
+	flagged?: FieldPolicy<any> | FieldReadFunction<any>,
+	flags?: FieldPolicy<any> | FieldReadFunction<any>,
+	id?: FieldPolicy<any> | FieldReadFunction<any>,
+	lastAcceptedRevisionEvent?: FieldPolicy<any> | FieldReadFunction<any>,
+	lastCommentEvent?: FieldPolicy<any> | FieldReadFunction<any>,
+	lastSubmittedRevisionEvent?: FieldPolicy<any> | FieldReadFunction<any>,
+	link?: FieldPolicy<any> | FieldReadFunction<any>,
+	molecularProfiles?: FieldPolicy<any> | FieldReadFunction<any>,
+	name?: FieldPolicy<any> | FieldReadFunction<any>,
+	revisions?: FieldPolicy<any> | FieldReadFunction<any>,
+	singleVariantMolecularProfile?: FieldPolicy<any> | FieldReadFunction<any>,
+	singleVariantMolecularProfileId?: FieldPolicy<any> | FieldReadFunction<any>,
+	variantAliases?: FieldPolicy<any> | FieldReadFunction<any>,
+	variantTypes?: FieldPolicy<any> | FieldReadFunction<any>
+};
+export type VariantInterfaceConnectionKeySpecifier = ('edges' | 'nodes' | 'pageCount' | 'pageInfo' | 'totalCount' | VariantInterfaceConnectionKeySpecifier)[];
+export type VariantInterfaceConnectionFieldPolicy = {
+	edges?: FieldPolicy<any> | FieldReadFunction<any>,
+	nodes?: FieldPolicy<any> | FieldReadFunction<any>,
+	pageCount?: FieldPolicy<any> | FieldReadFunction<any>,
+	pageInfo?: FieldPolicy<any> | FieldReadFunction<any>,
+	totalCount?: FieldPolicy<any> | FieldReadFunction<any>
+};
+export type VariantInterfaceEdgeKeySpecifier = ('cursor' | 'node' | VariantInterfaceEdgeKeySpecifier)[];
+export type VariantInterfaceEdgeFieldPolicy = {
+	cursor?: FieldPolicy<any> | FieldReadFunction<any>,
+	node?: FieldPolicy<any> | FieldReadFunction<any>
+};
 export type VariantTypeKeySpecifier = ('description' | 'id' | 'link' | 'name' | 'soid' | 'url' | VariantTypeKeySpecifier)[];
 export type VariantTypeFieldPolicy = {
 	description?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -2491,6 +2565,10 @@ export type StrictTypedTypePolicies = {
 		keyFields?: false | FactorKeySpecifier | (() => undefined | FactorKeySpecifier),
 		fields?: FactorFieldPolicy,
 	},
+	FactorVariant?: Omit<TypePolicy, "fields" | "keyFields"> & {
+		keyFields?: false | FactorVariantKeySpecifier | (() => undefined | FactorVariantKeySpecifier),
+		fields?: FactorVariantFieldPolicy,
+	},
 	FdaCode?: Omit<TypePolicy, "fields" | "keyFields"> & {
 		keyFields?: false | FdaCodeKeySpecifier | (() => undefined | FdaCodeKeySpecifier),
 		fields?: FdaCodeFieldPolicy,
@@ -2543,6 +2621,10 @@ export type StrictTypedTypePolicies = {
 		keyFields?: false | GeneEdgeKeySpecifier | (() => undefined | GeneEdgeKeySpecifier),
 		fields?: GeneEdgeFieldPolicy,
 	},
+	GeneVariant?: Omit<TypePolicy, "fields" | "keyFields"> & {
+		keyFields?: false | GeneVariantKeySpecifier | (() => undefined | GeneVariantKeySpecifier),
+		fields?: GeneVariantFieldPolicy,
+	},
 	LeaderboardOrganization?: Omit<TypePolicy, "fields" | "keyFields"> & {
 		keyFields?: false | LeaderboardOrganizationKeySpecifier | (() => undefined | LeaderboardOrganizationKeySpecifier),
 		fields?: LeaderboardOrganizationFieldPolicy,
@@ -2859,6 +2941,10 @@ export type StrictTypedTypePolicies = {
 		keyFields?: false | SuggestGeneRevisionPayloadKeySpecifier | (() => undefined | SuggestGeneRevisionPayloadKeySpecifier),
 		fields?: SuggestGeneRevisionPayloadFieldPolicy,
 	},
+	SuggestGeneVariantRevisionPayload?: Omit<TypePolicy, "fields" | "keyFields"> & {
+		keyFields?: false | SuggestGeneVariantRevisionPayloadKeySpecifier | (() => undefined | SuggestGeneVariantRevisionPayloadKeySpecifier),
+		fields?: SuggestGeneVariantRevisionPayloadFieldPolicy,
+	},
 	SuggestMolecularProfileRevisionPayload?: Omit<TypePolicy, "fields" | "keyFields"> & {
 		keyFields?: false | SuggestMolecularProfileRevisionPayloadKeySpecifier | (() => undefined | SuggestMolecularProfileRevisionPayloadKeySpecifier),
 		fields?: SuggestMolecularProfileRevisionPayloadFieldPolicy,
@@ -2879,10 +2965,6 @@ export type StrictTypedTypePolicies = {
 		keyFields?: false | SuggestVariantGroupRevisionPayloadKeySpecifier | (() => undefined | SuggestVariantGroupRevisionPayloadKeySpecifier),
 		fields?: SuggestVariantGroupRevisionPayloadFieldPolicy,
 	},
-	SuggestVariantRevisionPayload?: Omit<TypePolicy, "fields" | "keyFields"> & {
-		keyFields?: false | SuggestVariantRevisionPayloadKeySpecifier | (() => undefined | SuggestVariantRevisionPayloadKeySpecifier),
-		fields?: SuggestVariantRevisionPayloadFieldPolicy,
-	},
 	Therapy?: Omit<TypePolicy, "fields" | "keyFields"> & {
 		keyFields?: false | TherapyKeySpecifier | (() => undefined | TherapyKeySpecifier),
 		fields?: TherapyFieldPolicy,
@@ -2943,14 +3025,6 @@ export type StrictTypedTypePolicies = {
 		keyFields?: false | VariantAliasKeySpecifier | (() => undefined | VariantAliasKeySpecifier),
 		fields?: VariantAliasFieldPolicy,
 	},
-	VariantConnection?: Omit<TypePolicy, "fields" | "keyFields"> & {
-		keyFields?: false | VariantConnectionKeySpecifier | (() => undefined | VariantConnectionKeySpecifier),
-		fields?: VariantConnectionFieldPolicy,
-	},
-	VariantEdge?: Omit<TypePolicy, "fields" | "keyFields"> & {
-		keyFields?: false | VariantEdgeKeySpecifier | (() => undefined | VariantEdgeKeySpecifier),
-		fields?: VariantEdgeFieldPolicy,
-	},
 	VariantGroup?: Omit<TypePolicy, "fields" | "keyFields"> & {
 		keyFields?: false | VariantGroupKeySpecifier | (() => undefined | VariantGroupKeySpecifier),
 		fields?: VariantGroupFieldPolicy,
@@ -2963,6 +3037,18 @@ export type StrictTypedTypePolicies = {
 		keyFields?: false | VariantGroupEdgeKeySpecifier | (() => undefined | VariantGroupEdgeKeySpecifier),
 		fields?: VariantGroupEdgeFieldPolicy,
 	},
+	VariantInterface?: Omit<TypePolicy, "fields" | "keyFields"> & {
+		keyFields?: false | VariantInterfaceKeySpecifier | (() => undefined | VariantInterfaceKeySpecifier),
+		fields?: VariantInterfaceFieldPolicy,
+	},
+	VariantInterfaceConnection?: Omit<TypePolicy, "fields" | "keyFields"> & {
+		keyFields?: false | VariantInterfaceConnectionKeySpecifier | (() => undefined | VariantInterfaceConnectionKeySpecifier),
+		fields?: VariantInterfaceConnectionFieldPolicy,
+	},
+	VariantInterfaceEdge?: Omit<TypePolicy, "fields" | "keyFields"> & {
+		keyFields?: false | VariantInterfaceEdgeKeySpecifier | (() => undefined | VariantInterfaceEdgeKeySpecifier),
+		fields?: VariantInterfaceEdgeFieldPolicy,
+	},
 	VariantType?: Omit<TypePolicy, "fields" | "keyFields"> & {
 		keyFields?: false | VariantTypeKeySpecifier | (() => undefined | VariantTypeKeySpecifier),
 		fields?: VariantTypeFieldPolicy,
diff --git a/client/src/app/generated/civic.apollo.ts b/client/src/app/generated/civic.apollo.ts
index cff60f903..aee224d68 100644
--- a/client/src/app/generated/civic.apollo.ts
+++ b/client/src/app/generated/civic.apollo.ts
@@ -54,7 +54,7 @@ export type AcceptRevisionsInput = {
   revisionSetId?: InputMaybe<Scalars['Int']>;
 };
 
-/** Autogenerated return type of AcceptRevisions */
+/** Autogenerated return type of AcceptRevisions. */
 export type AcceptRevisionsPayload = {
   __typename: 'AcceptRevisionsPayload';
   /** A unique identifier for the client performing the mutation. */
@@ -102,6 +102,7 @@ export type ActivityInterfaceConnection = {
   pageInfo: PageInfo;
   /** List of all organizations who are involved in this activity stream. */
   participatingOrganizations: Array<Organization>;
+  subjectTypes: Array<ActivitySubjectInput>;
   /** The total number of records in this filtered collection. */
   totalCount: Scalars['Int'];
   /**
@@ -122,6 +123,20 @@ export type ActivityInterfaceEdge = {
   node?: Maybe<ActivityInterface>;
 };
 
+export enum ActivitySubjectInput {
+  Assertion = 'ASSERTION',
+  EvidenceItem = 'EVIDENCE_ITEM',
+  Feature = 'FEATURE',
+  Flag = 'FLAG',
+  MolecularProfile = 'MOLECULAR_PROFILE',
+  Revision = 'REVISION',
+  RevisionSet = 'REVISION_SET',
+  Source = 'SOURCE',
+  SourceSuggestion = 'SOURCE_SUGGESTION',
+  Variant = 'VARIANT',
+  VariantGroup = 'VARIANT_GROUP'
+}
+
 export enum ActivityTypeInput {
   AcceptRevisions = 'ACCEPT_REVISIONS',
   Comment = 'COMMENT',
@@ -162,7 +177,7 @@ export type AddCommentInput = {
   title?: InputMaybe<Scalars['String']>;
 };
 
-/** Autogenerated return type of AddComment */
+/** Autogenerated return type of AddComment. */
 export type AddCommentPayload = {
   __typename: 'AddCommentPayload';
   /** A unique identifier for the client performing the mutation. */
@@ -181,7 +196,7 @@ export type AddDiseaseInput = {
   name: Scalars['String'];
 };
 
-/** Autogenerated return type of AddDisease */
+/** Autogenerated return type of AddDisease. */
 export type AddDiseasePayload = {
   __typename: 'AddDiseasePayload';
   /** A unique identifier for the client performing the mutation. */
@@ -202,7 +217,7 @@ export type AddRemoteCitationInput = {
   sourceType: SourceSource;
 };
 
-/** Autogenerated return type of AddRemoteCitation */
+/** Autogenerated return type of AddRemoteCitation. */
 export type AddRemoteCitationPayload = {
   __typename: 'AddRemoteCitationPayload';
   /** A unique identifier for the client performing the mutation. */
@@ -221,7 +236,7 @@ export type AddTherapyInput = {
   ncitId?: InputMaybe<Scalars['String']>;
 };
 
-/** Autogenerated return type of AddTherapy */
+/** Autogenerated return type of AddTherapy. */
 export type AddTherapyPayload = {
   __typename: 'AddTherapyPayload';
   /** A unique identifier for the client performing the mutation. */
@@ -1198,7 +1213,7 @@ export type CreateFeatureInput = {
   organizationId?: InputMaybe<Scalars['Int']>;
 };
 
-/** Autogenerated return type of CreateFeature */
+/** Autogenerated return type of CreateFeature. */
 export type CreateFeaturePayload = {
   __typename: 'CreateFeaturePayload';
   /** A unique identifier for the client performing the mutation. */
@@ -1224,7 +1239,7 @@ export type CreateMolecularProfileInput = {
   structure: MolecularProfileComponentInput;
 };
 
-/** Autogenerated return type of CreateMolecularProfile */
+/** Autogenerated return type of CreateMolecularProfile. */
 export type CreateMolecularProfilePayload = {
   __typename: 'CreateMolecularProfilePayload';
   /** A unique identifier for the client performing the mutation. */
@@ -1264,7 +1279,7 @@ export type CreateVariantInput = {
   organizationId?: InputMaybe<Scalars['Int']>;
 };
 
-/** Autogenerated return type of CreateVariant */
+/** Autogenerated return type of CreateVariant. */
 export type CreateVariantPayload = {
   __typename: 'CreateVariantPayload';
   /** A unique identifier for the client performing the mutation. */
@@ -1274,7 +1289,7 @@ export type CreateVariantPayload = {
   /** True if the variant was newly created. False if the returned variant was already in the database. */
   new: Scalars['Boolean'];
   /** The newly created Variant. */
-  variant: Variant;
+  variant: VariantInterface;
 };
 
 /** Enum representing Feature types that can be user-created */
@@ -1339,7 +1354,7 @@ export type DeprecateComplexMolecularProfileInput = {
   organizationId?: InputMaybe<Scalars['Int']>;
 };
 
-/** Autogenerated return type of DeprecateComplexMolecularProfile */
+/** Autogenerated return type of DeprecateComplexMolecularProfile. */
 export type DeprecateComplexMolecularProfilePayload = {
   __typename: 'DeprecateComplexMolecularProfilePayload';
   /** A unique identifier for the client performing the mutation. */
@@ -1359,7 +1374,7 @@ export type DeprecateFeatureActivity = ActivityInterface & {
   parsedNote: Array<CommentBodySegment>;
   subject: EventSubject;
   user: User;
-  variants: Array<Variant>;
+  variants: Array<VariantInterface>;
   verbiage: Scalars['String'];
 };
 
@@ -1382,7 +1397,7 @@ export type DeprecateFeatureInput = {
   organizationId?: InputMaybe<Scalars['Int']>;
 };
 
-/** Autogenerated return type of DeprecateFeature */
+/** Autogenerated return type of DeprecateFeature. */
 export type DeprecateFeaturePayload = {
   __typename: 'DeprecateFeaturePayload';
   /** A unique identifier for the client performing the mutation. */
@@ -1395,7 +1410,7 @@ export type DeprecateFeaturePayload = {
    */
   newlyDeprecatedMolecularProfiles?: Maybe<Array<MolecularProfile>>;
   /** The variants linked to this feature that are newly deprecated. */
-  newlyDeprecatedVariants?: Maybe<Array<Variant>>;
+  newlyDeprecatedVariants?: Maybe<Array<VariantInterface>>;
 };
 
 export type DeprecateVariantActivity = ActivityInterface & {
@@ -1431,7 +1446,7 @@ export type DeprecateVariantInput = {
   variantId: Scalars['Int'];
 };
 
-/** Autogenerated return type of DeprecateVariant */
+/** Autogenerated return type of DeprecateVariant. */
 export type DeprecateVariantPayload = {
   __typename: 'DeprecateVariantPayload';
   /** A unique identifier for the client performing the mutation. */
@@ -1442,7 +1457,7 @@ export type DeprecateVariantPayload = {
    */
   newlyDeprecatedMolecularProfiles?: Maybe<Array<MolecularProfile>>;
   /** The deprecated Variant. */
-  variant?: Maybe<Variant>;
+  variant?: Maybe<VariantInterface>;
 };
 
 export type Disease = {
@@ -1526,7 +1541,7 @@ export type EditUserInput = {
   username: Scalars['String'];
 };
 
-/** Autogenerated return type of EditUser */
+/** Autogenerated return type of EditUser. */
 export type EditUserPayload = {
   __typename: 'EditUserPayload';
   /** A unique identifier for the client performing the mutation. */
@@ -1936,7 +1951,7 @@ export type Factor = Commentable & EventOriginObject & EventSubject & Flaggable
   revisions: RevisionConnection;
   sources: Array<Source>;
   /** List and filter variants. */
-  variants: VariantConnection;
+  variants: VariantInterfaceConnection;
 };
 
 
@@ -2019,6 +2034,94 @@ export type FactorFields = {
   sourceIds: Array<Scalars['Int']>;
 };
 
+export type FactorVariant = Commentable & EventOriginObject & EventSubject & Flaggable & MolecularProfileComponent & VariantInterface & WithRevisions & {
+  __typename: 'FactorVariant';
+  /** List and filter comments. */
+  comments: CommentConnection;
+  creationActivity?: Maybe<CreateVariantActivity>;
+  deprecated: Scalars['Boolean'];
+  deprecationActivity?: Maybe<DeprecateVariantActivity>;
+  deprecationReason?: Maybe<VariantDeprecationReason>;
+  /** List and filter events for an object */
+  events: EventConnection;
+  feature: Feature;
+  flagged: Scalars['Boolean'];
+  /** List and filter flags. */
+  flags: FlagConnection;
+  id: Scalars['Int'];
+  lastAcceptedRevisionEvent?: Maybe<Event>;
+  lastCommentEvent?: Maybe<Event>;
+  lastSubmittedRevisionEvent?: Maybe<Event>;
+  link: Scalars['String'];
+  molecularProfiles: MolecularProfileConnection;
+  name: Scalars['String'];
+  ncitId?: Maybe<Scalars['String']>;
+  /** List and filter revisions. */
+  revisions: RevisionConnection;
+  singleVariantMolecularProfile: MolecularProfile;
+  singleVariantMolecularProfileId: Scalars['Int'];
+  variantAliases: Array<Scalars['String']>;
+  variantTypes: Array<VariantType>;
+};
+
+
+export type FactorVariantCommentsArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  first?: InputMaybe<Scalars['Int']>;
+  last?: InputMaybe<Scalars['Int']>;
+  mentionedEntity?: InputMaybe<TaggableEntityInput>;
+  mentionedRole?: InputMaybe<UserRole>;
+  mentionedUserId?: InputMaybe<Scalars['Int']>;
+  originatingUserId?: InputMaybe<Scalars['Int']>;
+  sortBy?: InputMaybe<DateSort>;
+};
+
+
+export type FactorVariantEventsArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  eventType?: InputMaybe<EventAction>;
+  first?: InputMaybe<Scalars['Int']>;
+  last?: InputMaybe<Scalars['Int']>;
+  organizationId?: InputMaybe<Scalars['Int']>;
+  originatingUserId?: InputMaybe<Scalars['Int']>;
+  sortBy?: InputMaybe<DateSort>;
+};
+
+
+export type FactorVariantFlagsArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  first?: InputMaybe<Scalars['Int']>;
+  flaggingUserId?: InputMaybe<Scalars['Int']>;
+  last?: InputMaybe<Scalars['Int']>;
+  resolvingUserId?: InputMaybe<Scalars['Int']>;
+  sortBy?: InputMaybe<DateSort>;
+  state?: InputMaybe<FlagState>;
+};
+
+
+export type FactorVariantMolecularProfilesArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  first?: InputMaybe<Scalars['Int']>;
+  last?: InputMaybe<Scalars['Int']>;
+};
+
+
+export type FactorVariantRevisionsArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  fieldName?: InputMaybe<Scalars['String']>;
+  first?: InputMaybe<Scalars['Int']>;
+  last?: InputMaybe<Scalars['Int']>;
+  originatingUserId?: InputMaybe<Scalars['Int']>;
+  revisionSetId?: InputMaybe<Scalars['Int']>;
+  sortBy?: InputMaybe<DateSort>;
+  status?: InputMaybe<RevisionStatus>;
+};
+
 export type FdaCode = {
   __typename: 'FdaCode';
   code: Scalars['String'];
@@ -2053,7 +2156,7 @@ export type Feature = Commentable & EventOriginObject & EventSubject & Flaggable
   revisions: RevisionConnection;
   sources: Array<Source>;
   /** List and filter variants. */
-  variants: VariantConnection;
+  variants: VariantInterfaceConnection;
 };
 
 
@@ -2274,7 +2377,7 @@ export type FlagEntityInput = {
   subject: FlaggableInput;
 };
 
-/** Autogenerated return type of FlagEntity */
+/** Autogenerated return type of FlagEntity. */
 export type FlagEntityPayload = {
   __typename: 'FlagEntityPayload';
   /** A unique identifier for the client performing the mutation. */
@@ -2359,7 +2462,7 @@ export type Gene = Commentable & EventOriginObject & EventSubject & Flaggable &
   revisions: RevisionConnection;
   sources: Array<Source>;
   /** List and filter variants. */
-  variants: VariantConnection;
+  variants: VariantInterfaceConnection;
 };
 
 
@@ -2470,6 +2573,133 @@ export type GeneSearchFilter = {
   subFilters?: InputMaybe<Array<GeneSearchFilter>>;
 };
 
+export type GeneVariant = Commentable & EventOriginObject & EventSubject & Flaggable & MolecularProfileComponent & VariantInterface & WithRevisions & {
+  __typename: 'GeneVariant';
+  alleleRegistryId?: Maybe<Scalars['String']>;
+  clinvarIds: Array<Scalars['String']>;
+  /** List and filter comments. */
+  comments: CommentConnection;
+  creationActivity?: Maybe<CreateVariantActivity>;
+  deprecated: Scalars['Boolean'];
+  deprecationActivity?: Maybe<DeprecateVariantActivity>;
+  deprecationReason?: Maybe<VariantDeprecationReason>;
+  ensemblVersion?: Maybe<Scalars['Int']>;
+  /** List and filter events for an object */
+  events: EventConnection;
+  feature: Feature;
+  flagged: Scalars['Boolean'];
+  /** List and filter flags. */
+  flags: FlagConnection;
+  hgvsDescriptions: Array<Scalars['String']>;
+  id: Scalars['Int'];
+  lastAcceptedRevisionEvent?: Maybe<Event>;
+  lastCommentEvent?: Maybe<Event>;
+  lastSubmittedRevisionEvent?: Maybe<Event>;
+  link: Scalars['String'];
+  maneSelectTranscript?: Maybe<Scalars['String']>;
+  molecularProfiles: MolecularProfileConnection;
+  myVariantInfo?: Maybe<MyVariantInfo>;
+  name: Scalars['String'];
+  openCravatUrl?: Maybe<Scalars['String']>;
+  primaryCoordinates?: Maybe<Coordinate>;
+  referenceBases?: Maybe<Scalars['String']>;
+  referenceBuild?: Maybe<ReferenceBuild>;
+  /** List and filter revisions. */
+  revisions: RevisionConnection;
+  secondaryCoordinates?: Maybe<Coordinate>;
+  singleVariantMolecularProfile: MolecularProfile;
+  singleVariantMolecularProfileId: Scalars['Int'];
+  variantAliases: Array<Scalars['String']>;
+  variantBases?: Maybe<Scalars['String']>;
+  variantTypes: Array<VariantType>;
+};
+
+
+export type GeneVariantCommentsArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  first?: InputMaybe<Scalars['Int']>;
+  last?: InputMaybe<Scalars['Int']>;
+  mentionedEntity?: InputMaybe<TaggableEntityInput>;
+  mentionedRole?: InputMaybe<UserRole>;
+  mentionedUserId?: InputMaybe<Scalars['Int']>;
+  originatingUserId?: InputMaybe<Scalars['Int']>;
+  sortBy?: InputMaybe<DateSort>;
+};
+
+
+export type GeneVariantEventsArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  eventType?: InputMaybe<EventAction>;
+  first?: InputMaybe<Scalars['Int']>;
+  last?: InputMaybe<Scalars['Int']>;
+  organizationId?: InputMaybe<Scalars['Int']>;
+  originatingUserId?: InputMaybe<Scalars['Int']>;
+  sortBy?: InputMaybe<DateSort>;
+};
+
+
+export type GeneVariantFlagsArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  first?: InputMaybe<Scalars['Int']>;
+  flaggingUserId?: InputMaybe<Scalars['Int']>;
+  last?: InputMaybe<Scalars['Int']>;
+  resolvingUserId?: InputMaybe<Scalars['Int']>;
+  sortBy?: InputMaybe<DateSort>;
+  state?: InputMaybe<FlagState>;
+};
+
+
+export type GeneVariantMolecularProfilesArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  first?: InputMaybe<Scalars['Int']>;
+  last?: InputMaybe<Scalars['Int']>;
+};
+
+
+export type GeneVariantRevisionsArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  fieldName?: InputMaybe<Scalars['String']>;
+  first?: InputMaybe<Scalars['Int']>;
+  last?: InputMaybe<Scalars['Int']>;
+  originatingUserId?: InputMaybe<Scalars['Int']>;
+  revisionSetId?: InputMaybe<Scalars['Int']>;
+  sortBy?: InputMaybe<DateSort>;
+  status?: InputMaybe<RevisionStatus>;
+};
+
+/** Fields on a GeneVariant that curators may propose revisions to. */
+export type GeneVariantFields = {
+  /** List of aliases or alternate names for the Variant. */
+  aliases: Array<Scalars['String']>;
+  /** List of ClinVar IDs for the Variant. */
+  clinvarIds: ClinvarInput;
+  /** The Ensembl database version. */
+  ensemblVersion: NullableIntInput;
+  /** The ID of the Feature this Variant corresponds to. */
+  featureId: Scalars['Int'];
+  /** List of HGVS descriptions for the Variant. */
+  hgvsDescriptions: Array<Scalars['String']>;
+  /** The Variant's name. */
+  name: Scalars['String'];
+  /** The primary coordinates for this Variant. In the case of Fusions this will be the coordinates of the 5' partner. */
+  primaryCoordinates: CoordinateInput;
+  /** Reference bases for this variant */
+  referenceBases: NullableStringInput;
+  /** The reference build for the genomic coordinates of this Variant. */
+  referenceBuild: NullableReferenceBuildTypeInput;
+  /** In the case of Fusions these will be the coordinates of the 3' partner, otherwise set the values to null. */
+  secondaryCoordinates: CoordinateInput;
+  /** Variant bases for this variant */
+  variantBases: NullableStringInput;
+  /** List of IDs for the variant types for this Variant */
+  variantTypeIds: Array<Scalars['Int']>;
+};
+
 export type IntSearchInput = {
   comparisonOperator: IntSearchOperator;
   value: Scalars['Int'];
@@ -2712,7 +2942,7 @@ export type ModerateAssertionInput = {
   organizationId?: InputMaybe<Scalars['Int']>;
 };
 
-/** Autogenerated return type of ModerateAssertion */
+/** Autogenerated return type of ModerateAssertion. */
 export type ModerateAssertionPayload = {
   __typename: 'ModerateAssertionPayload';
   /** The moderated Assertion */
@@ -2751,7 +2981,7 @@ export type ModerateEvidenceItemInput = {
   organizationId?: InputMaybe<Scalars['Int']>;
 };
 
-/** Autogenerated return type of ModerateEvidenceItem */
+/** Autogenerated return type of ModerateEvidenceItem. */
 export type ModerateEvidenceItemPayload = {
   __typename: 'ModerateEvidenceItemPayload';
   /** A unique identifier for the client performing the mutation. */
@@ -2805,7 +3035,7 @@ export type MolecularProfile = Commentable & EventOriginObject & EventSubject &
   complexMolecularProfileCreationActivity?: Maybe<CreateComplexMolecularProfileActivity>;
   complexMolecularProfileDeprecationActivity?: Maybe<DeprecateComplexMolecularProfileActivity>;
   deprecated: Scalars['Boolean'];
-  deprecatedVariants: Array<Variant>;
+  deprecatedVariants: Array<VariantInterface>;
   deprecationReason?: Maybe<MolecularProfileDeprecationReason>;
   description?: Maybe<Scalars['String']>;
   /** List and filter events for an object */
@@ -2838,7 +3068,7 @@ export type MolecularProfile = Commentable & EventOriginObject & EventSubject &
   variantCreationActivity?: Maybe<CreateVariantActivity>;
   variantDeprecationActivity?: Maybe<DeprecateVariantActivity>;
   /** The collection of variants included in this molecular profile. Please note the name for their relation to each other. */
-  variants: Array<Variant>;
+  variants: Array<VariantInterface>;
 };
 
 
@@ -2988,7 +3218,7 @@ export type MolecularProfileFields = {
 
 export type MolecularProfileNamePreview = {
   __typename: 'MolecularProfileNamePreview';
-  deprecatedVariants: Array<Variant>;
+  deprecatedVariants: Array<VariantInterface>;
   /** The already existing MP matching this name, if it exists */
   existingMolecularProfile?: Maybe<MolecularProfile>;
   segments: Array<MolecularProfileSegment>;
@@ -3094,14 +3324,14 @@ export type Mutation = {
   suggestFactorRevision?: Maybe<SuggestFactorRevisionPayload>;
   /** Suggest a Revision to a Feature entity of instance type "Gene". */
   suggestGeneRevision?: Maybe<SuggestGeneRevisionPayload>;
+  /** Suggest a Revision to a Variant entity. */
+  suggestGeneVariantRevision?: Maybe<SuggestGeneVariantRevisionPayload>;
   /** Suggest a Revision to a MolecularProfile entity. */
   suggestMolecularProfileRevision?: Maybe<SuggestMolecularProfileRevisionPayload>;
   /** Suggest a source for curation in CIViC. */
   suggestSource?: Maybe<SuggestSourcePayload>;
   /** Suggested a Revision to a Variant Group entity */
   suggestVariantGroupRevision?: Maybe<SuggestVariantGroupRevisionPayload>;
-  /** Suggest a Revision to a Variant entity. */
-  suggestVariantRevision?: Maybe<SuggestVariantRevisionPayload>;
   /** Unsubscribe from a CIViC entity to stop receiving notifications about it. */
   unsubscribe?: Maybe<UnsubscribePayload>;
   /** Update the currentlly logged in User's Conflict of Interest statement */
@@ -3238,6 +3468,11 @@ export type MutationSuggestGeneRevisionArgs = {
 };
 
 
+export type MutationSuggestGeneVariantRevisionArgs = {
+  input: SuggestGeneVariantRevisionInput;
+};
+
+
 export type MutationSuggestMolecularProfileRevisionArgs = {
   input: SuggestMolecularProfileRevisionInput;
 };
@@ -3253,11 +3488,6 @@ export type MutationSuggestVariantGroupRevisionArgs = {
 };
 
 
-export type MutationSuggestVariantRevisionArgs = {
-  input: SuggestVariantRevisionInput;
-};
-
-
 export type MutationUnsubscribeArgs = {
   input: UnsubscribeInput;
 };
@@ -3877,7 +4107,7 @@ export type Query = {
   users: UserConnection;
   validateRevisionsForAcceptance: ValidationErrors;
   /** Find a variant by CIViC ID */
-  variant?: Maybe<Variant>;
+  variant?: Maybe<VariantInterface>;
   /** Find a variant group by CIViC ID */
   variantGroup?: Maybe<VariantGroup>;
   /** List and filter variant groups. */
@@ -3891,7 +4121,7 @@ export type Query = {
   /** List and filter Variant Types from the Sequence Ontology. */
   variantTypes: BrowseVariantTypeConnection;
   /** List and filter variants. */
-  variants: VariantConnection;
+  variants: VariantInterfaceConnection;
   viewer?: Maybe<User>;
 };
 
@@ -3907,16 +4137,17 @@ export type QueryAcmgCodesTypeaheadArgs = {
 
 
 export type QueryActivitiesArgs = {
-  activityType?: InputMaybe<ActivityTypeInput>;
+  activityType?: InputMaybe<Array<ActivityTypeInput>>;
   after?: InputMaybe<Scalars['String']>;
   before?: InputMaybe<Scalars['String']>;
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
   mode?: InputMaybe<EventFeedMode>;
-  organizationId?: InputMaybe<Scalars['Int']>;
+  organizationId?: InputMaybe<Array<Scalars['Int']>>;
   sortBy?: InputMaybe<DateSort>;
-  subject?: InputMaybe<SubscribableQueryInput>;
-  userId?: InputMaybe<Scalars['Int']>;
+  subject?: InputMaybe<Array<SubscribableQueryInput>>;
+  subjectType?: InputMaybe<Array<ActivitySubjectInput>>;
+  userId?: InputMaybe<Array<Scalars['Int']>>;
 };
 
 
@@ -4571,7 +4802,7 @@ export type RejectRevisionsInput = {
   revisionSetId?: InputMaybe<Scalars['Int']>;
 };
 
-/** Autogenerated return type of RejectRevisions */
+/** Autogenerated return type of RejectRevisions. */
 export type RejectRevisionsPayload = {
   __typename: 'RejectRevisionsPayload';
   /** A unique identifier for the client performing the mutation. */
@@ -4611,7 +4842,7 @@ export type ResolveFlagInput = {
   organizationId?: InputMaybe<Scalars['Int']>;
 };
 
-/** Autogenerated return type of ResolveFlag */
+/** Autogenerated return type of ResolveFlag. */
 export type ResolveFlagPayload = {
   __typename: 'ResolveFlagPayload';
   /** A unique identifier for the client performing the mutation. */
@@ -5070,7 +5301,7 @@ export type SubmitAssertionInput = {
   organizationId?: InputMaybe<Scalars['Int']>;
 };
 
-/** Autogenerated return type of SubmitAssertion */
+/** Autogenerated return type of SubmitAssertion. */
 export type SubmitAssertionPayload = {
   __typename: 'SubmitAssertionPayload';
   /** The newly created Assertion */
@@ -5109,7 +5340,7 @@ export type SubmitEvidenceItemInput = {
   organizationId?: InputMaybe<Scalars['Int']>;
 };
 
-/** Autogenerated return type of SubmitEvidenceItem */
+/** Autogenerated return type of SubmitEvidenceItem. */
 export type SubmitEvidenceItemPayload = {
   __typename: 'SubmitEvidenceItemPayload';
   /** A unique identifier for the client performing the mutation. */
@@ -5139,7 +5370,7 @@ export type SubmitVariantGroupInput = {
   variantIds: Array<Scalars['Int']>;
 };
 
-/** Autogenerated return type of SubmitVariantGroup */
+/** Autogenerated return type of SubmitVariantGroup. */
 export type SubmitVariantGroupPayload = {
   __typename: 'SubmitVariantGroupPayload';
   /** A unique identifier for the client performing the mutation. */
@@ -5197,7 +5428,7 @@ export type SubscribeInput = {
   subscribeToChildren?: InputMaybe<Scalars['Boolean']>;
 };
 
-/** Autogenerated return type of Subscribe */
+/** Autogenerated return type of Subscribe. */
 export type SubscribePayload = {
   __typename: 'SubscribePayload';
   /** A unique identifier for the client performing the mutation. */
@@ -5234,7 +5465,7 @@ export type SuggestAssertionRevisionInput = {
   organizationId?: InputMaybe<Scalars['Int']>;
 };
 
-/** Autogenerated return type of SuggestAssertionRevision */
+/** Autogenerated return type of SuggestAssertionRevision. */
 export type SuggestAssertionRevisionPayload = {
   __typename: 'SuggestAssertionRevisionPayload';
   /** The Assertion the user has proposed a Revision to. */
@@ -5273,7 +5504,7 @@ export type SuggestEvidenceItemRevisionInput = {
   organizationId?: InputMaybe<Scalars['Int']>;
 };
 
-/** Autogenerated return type of SuggestEvidenceItemRevision */
+/** Autogenerated return type of SuggestEvidenceItemRevision. */
 export type SuggestEvidenceItemRevisionPayload = {
   __typename: 'SuggestEvidenceItemRevisionPayload';
   /** A unique identifier for the client performing the mutation. */
@@ -5312,7 +5543,7 @@ export type SuggestFactorRevisionInput = {
   organizationId?: InputMaybe<Scalars['Int']>;
 };
 
-/** Autogenerated return type of SuggestFactorRevision */
+/** Autogenerated return type of SuggestFactorRevision. */
 export type SuggestFactorRevisionPayload = {
   __typename: 'SuggestFactorRevisionPayload';
   /** A unique identifier for the client performing the mutation. */
@@ -5351,7 +5582,7 @@ export type SuggestGeneRevisionInput = {
   organizationId?: InputMaybe<Scalars['Int']>;
 };
 
-/** Autogenerated return type of SuggestGeneRevision */
+/** Autogenerated return type of SuggestGeneRevision. */
 export type SuggestGeneRevisionPayload = {
   __typename: 'SuggestGeneRevisionPayload';
   /** A unique identifier for the client performing the mutation. */
@@ -5368,6 +5599,45 @@ export type SuggestGeneRevisionPayload = {
   results: Array<RevisionResult>;
 };
 
+/** Autogenerated input type of SuggestGeneVariantRevision */
+export type SuggestGeneVariantRevisionInput = {
+  /** A unique identifier for the client performing the mutation. */
+  clientMutationId?: InputMaybe<Scalars['String']>;
+  /** Text describing the reason for the change. Will be attached to the Revision as a comment. */
+  comment?: InputMaybe<Scalars['String']>;
+  /**
+   * The desired state of the Variant's editable fields if the change were applied.
+   * If no change is desired for a particular field, pass in the current value of that field.
+   */
+  fields: GeneVariantFields;
+  /** The ID of the Variant to suggest a Revision to. */
+  id: Scalars['Int'];
+  /**
+   * The ID of the organization to credit the user's contributions to.
+   * If the user belongs to a single organization or no organizations, this field is not required.
+   * This field is required if the user belongs to more than one organization.
+   * The user must belong to the organization provided.
+   */
+  organizationId?: InputMaybe<Scalars['Int']>;
+};
+
+/** Autogenerated return type of SuggestGeneVariantRevision. */
+export type SuggestGeneVariantRevisionPayload = {
+  __typename: 'SuggestGeneVariantRevisionPayload';
+  /** A unique identifier for the client performing the mutation. */
+  clientMutationId?: Maybe<Scalars['String']>;
+  /**
+   * A list of Revisions generated as a result of this suggestion.
+   * If an existing Revision exactly matches the proposed one, it will be returned instead.
+   * This is indicated via the 'newlyCreated' Boolean.
+   * Revisions are stored on a per-field basis.
+   * The changesetId can be used to group Revisions proposed at the same time.
+   */
+  results: Array<RevisionResult>;
+  /** The Variant the user has proposed a Revision to. */
+  variant: VariantInterface;
+};
+
 /** Autogenerated input type of SuggestMolecularProfileRevision */
 export type SuggestMolecularProfileRevisionInput = {
   /** A unique identifier for the client performing the mutation. */
@@ -5390,7 +5660,7 @@ export type SuggestMolecularProfileRevisionInput = {
   organizationId?: InputMaybe<Scalars['Int']>;
 };
 
-/** Autogenerated return type of SuggestMolecularProfileRevision */
+/** Autogenerated return type of SuggestMolecularProfileRevision. */
 export type SuggestMolecularProfileRevisionPayload = {
   __typename: 'SuggestMolecularProfileRevisionPayload';
   /** A unique identifier for the client performing the mutation. */
@@ -5457,7 +5727,7 @@ export type SuggestSourceInput = {
   sourceId: Scalars['Int'];
 };
 
-/** Autogenerated return type of SuggestSource */
+/** Autogenerated return type of SuggestSource. */
 export type SuggestSourcePayload = {
   __typename: 'SuggestSourcePayload';
   /** A unique identifier for the client performing the mutation. */
@@ -5488,7 +5758,7 @@ export type SuggestVariantGroupRevisionInput = {
   organizationId?: InputMaybe<Scalars['Int']>;
 };
 
-/** Autogenerated return type of SuggestVariantGroupRevision */
+/** Autogenerated return type of SuggestVariantGroupRevision. */
 export type SuggestVariantGroupRevisionPayload = {
   __typename: 'SuggestVariantGroupRevisionPayload';
   /** A unique identifier for the client performing the mutation. */
@@ -5505,45 +5775,6 @@ export type SuggestVariantGroupRevisionPayload = {
   variantGroup: VariantGroup;
 };
 
-/** Autogenerated input type of SuggestVariantRevision */
-export type SuggestVariantRevisionInput = {
-  /** A unique identifier for the client performing the mutation. */
-  clientMutationId?: InputMaybe<Scalars['String']>;
-  /** Text describing the reason for the change. Will be attached to the Revision as a comment. */
-  comment?: InputMaybe<Scalars['String']>;
-  /**
-   * The desired state of the Variant's editable fields if the change were applied.
-   * If no change is desired for a particular field, pass in the current value of that field.
-   */
-  fields: VariantFields;
-  /** The ID of the Variant to suggest a Revision to. */
-  id: Scalars['Int'];
-  /**
-   * The ID of the organization to credit the user's contributions to.
-   * If the user belongs to a single organization or no organizations, this field is not required.
-   * This field is required if the user belongs to more than one organization.
-   * The user must belong to the organization provided.
-   */
-  organizationId?: InputMaybe<Scalars['Int']>;
-};
-
-/** Autogenerated return type of SuggestVariantRevision */
-export type SuggestVariantRevisionPayload = {
-  __typename: 'SuggestVariantRevisionPayload';
-  /** A unique identifier for the client performing the mutation. */
-  clientMutationId?: Maybe<Scalars['String']>;
-  /**
-   * A list of Revisions generated as a result of this suggestion.
-   * If an existing Revision exactly matches the proposed one, it will be returned instead.
-   * This is indicated via the 'newlyCreated' Boolean.
-   * Revisions are stored on a per-field basis.
-   * The changesetId can be used to group Revisions proposed at the same time.
-   */
-  results: Array<RevisionResult>;
-  /** The Variant the user has proposed a Revision to. */
-  variant: Variant;
-};
-
 export enum TaggableEntity {
   Assertion = 'ASSERTION',
   EvidenceItem = 'EVIDENCE_ITEM',
@@ -5636,7 +5867,7 @@ export type UnsubscribeInput = {
   unsubscribeFromChildren?: InputMaybe<Scalars['Boolean']>;
 };
 
-/** Autogenerated return type of Unsubscribe */
+/** Autogenerated return type of Unsubscribe. */
 export type UnsubscribePayload = {
   __typename: 'UnsubscribePayload';
   /** A unique identifier for the client performing the mutation. */
@@ -5655,7 +5886,7 @@ export type UpdateCoiInput = {
   statement?: InputMaybe<Scalars['String']>;
 };
 
-/** Autogenerated return type of UpdateCoi */
+/** Autogenerated return type of UpdateCoi. */
 export type UpdateCoiPayload = {
   __typename: 'UpdateCoiPayload';
   /** A unique identifier for the client performing the mutation. */
@@ -5673,7 +5904,7 @@ export type UpdateNotificationStatusInput = {
   newStatus: ReadStatus;
 };
 
-/** Autogenerated return type of UpdateNotificationStatus */
+/** Autogenerated return type of UpdateNotificationStatus. */
 export type UpdateNotificationStatusPayload = {
   __typename: 'UpdateNotificationStatusPayload';
   /** A unique identifier for the client performing the mutation. */
@@ -5715,7 +5946,7 @@ export type UpdateSourceSuggestionStatusInput = {
   reason?: InputMaybe<Scalars['String']>;
 };
 
-/** Autogenerated return type of UpdateSourceSuggestionStatus */
+/** Autogenerated return type of UpdateSourceSuggestionStatus. */
 export type UpdateSourceSuggestionStatusPayload = {
   __typename: 'UpdateSourceSuggestionStatusPayload';
   /** A unique identifier for the client performing the mutation. */
@@ -5881,44 +6112,32 @@ export type ValidationErrors = {
   validationErrors: Array<FieldValidationError>;
 };
 
-export type Variant = Commentable & EventOriginObject & EventSubject & Flaggable & MolecularProfileComponent & WithRevisions & {
+export type Variant = Commentable & EventOriginObject & EventSubject & Flaggable & MolecularProfileComponent & VariantInterface & WithRevisions & {
   __typename: 'Variant';
-  alleleRegistryId?: Maybe<Scalars['String']>;
-  clinvarIds: Array<Scalars['String']>;
   /** List and filter comments. */
   comments: CommentConnection;
   creationActivity?: Maybe<CreateVariantActivity>;
   deprecated: Scalars['Boolean'];
   deprecationActivity?: Maybe<DeprecateVariantActivity>;
   deprecationReason?: Maybe<VariantDeprecationReason>;
-  ensemblVersion?: Maybe<Scalars['Int']>;
   /** List and filter events for an object */
   events: EventConnection;
   feature: Feature;
   flagged: Scalars['Boolean'];
   /** List and filter flags. */
   flags: FlagConnection;
-  hgvsDescriptions: Array<Scalars['String']>;
   id: Scalars['Int'];
   lastAcceptedRevisionEvent?: Maybe<Event>;
   lastCommentEvent?: Maybe<Event>;
   lastSubmittedRevisionEvent?: Maybe<Event>;
   link: Scalars['String'];
-  maneSelectTranscript?: Maybe<Scalars['String']>;
   molecularProfiles: MolecularProfileConnection;
-  myVariantInfo?: Maybe<MyVariantInfo>;
   name: Scalars['String'];
-  openCravatUrl?: Maybe<Scalars['String']>;
-  primaryCoordinates?: Maybe<Coordinate>;
-  referenceBases?: Maybe<Scalars['String']>;
-  referenceBuild?: Maybe<ReferenceBuild>;
   /** List and filter revisions. */
   revisions: RevisionConnection;
-  secondaryCoordinates?: Maybe<Coordinate>;
   singleVariantMolecularProfile: MolecularProfile;
   singleVariantMolecularProfileId: Scalars['Int'];
   variantAliases: Array<Scalars['String']>;
-  variantBases?: Maybe<Scalars['String']>;
   variantTypes: Array<VariantType>;
 };
 
@@ -5993,21 +6212,6 @@ export type VariantComponent = {
   variantId: Scalars['Int'];
 };
 
-/** The connection type for Variant. */
-export type VariantConnection = {
-  __typename: 'VariantConnection';
-  /** A list of edges. */
-  edges: Array<VariantEdge>;
-  /** A list of nodes. */
-  nodes: Array<Variant>;
-  /** Total number of pages, based on filtered count and pagesize. */
-  pageCount: Scalars['Int'];
-  /** Information to aid in pagination. */
-  pageInfo: PageInfo;
-  /** The total number of records in this filtered collection. */
-  totalCount: Scalars['Int'];
-};
-
 export enum VariantDeprecationReason {
   Duplicate = 'DUPLICATE',
   FeatureDeprecated = 'FEATURE_DEPRECATED',
@@ -6015,43 +6219,6 @@ export enum VariantDeprecationReason {
   Other = 'OTHER'
 }
 
-/** An edge in a connection. */
-export type VariantEdge = {
-  __typename: 'VariantEdge';
-  /** A cursor for use in pagination. */
-  cursor: Scalars['String'];
-  /** The item at the end of the edge. */
-  node?: Maybe<Variant>;
-};
-
-/** Fields on a Variant that curators may propose revisions to. */
-export type VariantFields = {
-  /** List of aliases or alternate names for the Variant. */
-  aliases: Array<Scalars['String']>;
-  /** List of ClinVar IDs for the Variant. */
-  clinvarIds: ClinvarInput;
-  /** The Ensembl database version. */
-  ensemblVersion: NullableIntInput;
-  /** The ID of the Feature this Variant corresponds to. */
-  featureId: Scalars['Int'];
-  /** List of HGVS descriptions for the Variant. */
-  hgvsDescriptions: Array<Scalars['String']>;
-  /** The Variant's name. */
-  name: Scalars['String'];
-  /** The primary coordinates for this Variant. In the case of Fusions this will be the coordinates of the 5' partner. */
-  primaryCoordinates: CoordinateInput;
-  /** Reference bases for this variant */
-  referenceBases: NullableStringInput;
-  /** The reference build for the genomic coordinates of this Variant. */
-  referenceBuild: NullableReferenceBuildTypeInput;
-  /** In the case of Fusions these will be the coordinates of the 3' partner, otherwise set the values to null. */
-  secondaryCoordinates: CoordinateInput;
-  /** Variant bases for this variant */
-  variantBases: NullableStringInput;
-  /** List of IDs for the variant types for this Variant */
-  variantTypeIds: Array<Scalars['Int']>;
-};
-
 export type VariantGroup = Commentable & EventSubject & Flaggable & WithRevisions & {
   __typename: 'VariantGroup';
   /** List and filter comments. */
@@ -6072,7 +6239,7 @@ export type VariantGroup = Commentable & EventSubject & Flaggable & WithRevision
   revisions: RevisionConnection;
   sources: Array<Source>;
   /** List and filter variants. */
-  variants: VariantConnection;
+  variants: VariantInterfaceConnection;
 };
 
 
@@ -6185,6 +6352,122 @@ export enum VariantGroupsSortColumns {
   VariantNames = 'VARIANT_NAMES'
 }
 
+/** A taggable/linkable component of a molecular profile */
+export type VariantInterface = {
+  /** List and filter comments. */
+  comments: CommentConnection;
+  creationActivity?: Maybe<CreateVariantActivity>;
+  deprecated: Scalars['Boolean'];
+  deprecationActivity?: Maybe<DeprecateVariantActivity>;
+  deprecationReason?: Maybe<VariantDeprecationReason>;
+  /** List and filter events for an object */
+  events: EventConnection;
+  feature: Feature;
+  flagged: Scalars['Boolean'];
+  /** List and filter flags. */
+  flags: FlagConnection;
+  id: Scalars['Int'];
+  lastAcceptedRevisionEvent?: Maybe<Event>;
+  lastCommentEvent?: Maybe<Event>;
+  lastSubmittedRevisionEvent?: Maybe<Event>;
+  link: Scalars['String'];
+  molecularProfiles: MolecularProfileConnection;
+  name: Scalars['String'];
+  /** List and filter revisions. */
+  revisions: RevisionConnection;
+  singleVariantMolecularProfile: MolecularProfile;
+  singleVariantMolecularProfileId: Scalars['Int'];
+  variantAliases: Array<Scalars['String']>;
+  variantTypes: Array<VariantType>;
+};
+
+
+/** A taggable/linkable component of a molecular profile */
+export type VariantInterfaceCommentsArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  first?: InputMaybe<Scalars['Int']>;
+  last?: InputMaybe<Scalars['Int']>;
+  mentionedEntity?: InputMaybe<TaggableEntityInput>;
+  mentionedRole?: InputMaybe<UserRole>;
+  mentionedUserId?: InputMaybe<Scalars['Int']>;
+  originatingUserId?: InputMaybe<Scalars['Int']>;
+  sortBy?: InputMaybe<DateSort>;
+};
+
+
+/** A taggable/linkable component of a molecular profile */
+export type VariantInterfaceEventsArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  eventType?: InputMaybe<EventAction>;
+  first?: InputMaybe<Scalars['Int']>;
+  last?: InputMaybe<Scalars['Int']>;
+  organizationId?: InputMaybe<Scalars['Int']>;
+  originatingUserId?: InputMaybe<Scalars['Int']>;
+  sortBy?: InputMaybe<DateSort>;
+};
+
+
+/** A taggable/linkable component of a molecular profile */
+export type VariantInterfaceFlagsArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  first?: InputMaybe<Scalars['Int']>;
+  flaggingUserId?: InputMaybe<Scalars['Int']>;
+  last?: InputMaybe<Scalars['Int']>;
+  resolvingUserId?: InputMaybe<Scalars['Int']>;
+  sortBy?: InputMaybe<DateSort>;
+  state?: InputMaybe<FlagState>;
+};
+
+
+/** A taggable/linkable component of a molecular profile */
+export type VariantInterfaceMolecularProfilesArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  first?: InputMaybe<Scalars['Int']>;
+  last?: InputMaybe<Scalars['Int']>;
+};
+
+
+/** A taggable/linkable component of a molecular profile */
+export type VariantInterfaceRevisionsArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  fieldName?: InputMaybe<Scalars['String']>;
+  first?: InputMaybe<Scalars['Int']>;
+  last?: InputMaybe<Scalars['Int']>;
+  originatingUserId?: InputMaybe<Scalars['Int']>;
+  revisionSetId?: InputMaybe<Scalars['Int']>;
+  sortBy?: InputMaybe<DateSort>;
+  status?: InputMaybe<RevisionStatus>;
+};
+
+/** The connection type for VariantInterface. */
+export type VariantInterfaceConnection = {
+  __typename: 'VariantInterfaceConnection';
+  /** A list of edges. */
+  edges: Array<VariantInterfaceEdge>;
+  /** A list of nodes. */
+  nodes: Array<VariantInterface>;
+  /** Total number of pages, based on filtered count and pagesize. */
+  pageCount: Scalars['Int'];
+  /** Information to aid in pagination. */
+  pageInfo: PageInfo;
+  /** The total number of records in this filtered collection. */
+  totalCount: Scalars['Int'];
+};
+
+/** An edge in a connection. */
+export type VariantInterfaceEdge = {
+  __typename: 'VariantInterfaceEdge';
+  /** A cursor for use in pagination. */
+  cursor: Scalars['String'];
+  /** The item at the end of the edge. */
+  node?: Maybe<VariantInterface>;
+};
+
 export type VariantMenuSort = {
   /** Available columns for sorting */
   column: VariantMenuSortColumns;
@@ -6327,49 +6610,49 @@ export type ActivityFeedQueryVariables = Exact<{
   last?: InputMaybe<Scalars['Int']>;
   before?: InputMaybe<Scalars['String']>;
   after?: InputMaybe<Scalars['String']>;
-  userId?: InputMaybe<Scalars['Int']>;
+  userId?: InputMaybe<Array<Scalars['Int']> | Scalars['Int']>;
 }>;
 
 
-export type ActivityFeedQuery = { __typename: 'Query', activities: { __typename: 'ActivityInterfaceConnection', pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, edges: Array<{ __typename: 'ActivityInterfaceEdge', cursor: string, node?: { __typename: 'AcceptRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CommentActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CreateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CreateFeatureActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CreateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'DeprecateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'DeprecateFeatureActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'DeprecateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'FlagEntityActivity', id: number, verbiage: string, createdAt: any, flag: { __typename: 'Flag', id: number, name: string, link: string }, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ModerateAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ModerateEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'RejectRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ResolveFlagActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SubmitAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SubmitEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SuggestRevisionSetActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SuggestSourceActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'UpdateSourceSuggestionStatusActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | undefined }> } };
+export type ActivityFeedQuery = { __typename: 'Query', activities: { __typename: 'ActivityInterfaceConnection', pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, edges: Array<{ __typename: 'ActivityInterfaceEdge', cursor: string, node?: { __typename: 'AcceptRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CommentActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CreateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CreateFeatureActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CreateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'DeprecateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'DeprecateFeatureActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'DeprecateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'FlagEntityActivity', id: number, verbiage: string, createdAt: any, flag: { __typename: 'Flag', id: number, name: string, link: string }, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ModerateAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ModerateEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'RejectRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ResolveFlagActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SubmitAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SubmitEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SuggestRevisionSetActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SuggestSourceActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'UpdateSourceSuggestionStatusActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | undefined }> } };
 
-export type ActivityFeedFragment = { __typename: 'ActivityInterfaceConnection', pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, edges: Array<{ __typename: 'ActivityInterfaceEdge', cursor: string, node?: { __typename: 'AcceptRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CommentActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CreateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CreateFeatureActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CreateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'DeprecateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'DeprecateFeatureActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'DeprecateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'FlagEntityActivity', id: number, verbiage: string, createdAt: any, flag: { __typename: 'Flag', id: number, name: string, link: string }, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ModerateAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ModerateEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'RejectRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ResolveFlagActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SubmitAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SubmitEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SuggestRevisionSetActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SuggestSourceActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'UpdateSourceSuggestionStatusActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | undefined }> };
+export type ActivityFeedFragment = { __typename: 'ActivityInterfaceConnection', pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, edges: Array<{ __typename: 'ActivityInterfaceEdge', cursor: string, node?: { __typename: 'AcceptRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CommentActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CreateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CreateFeatureActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CreateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'DeprecateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'DeprecateFeatureActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'DeprecateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'FlagEntityActivity', id: number, verbiage: string, createdAt: any, flag: { __typename: 'Flag', id: number, name: string, link: string }, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ModerateAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ModerateEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'RejectRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ResolveFlagActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SubmitAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SubmitEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SuggestRevisionSetActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SuggestSourceActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'UpdateSourceSuggestionStatusActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | undefined }> };
 
-type ActivityFeedNode_AcceptRevisionsActivity_Fragment = { __typename: 'AcceptRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_AcceptRevisionsActivity_Fragment = { __typename: 'AcceptRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_CommentActivity_Fragment = { __typename: 'CommentActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_CommentActivity_Fragment = { __typename: 'CommentActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_CreateComplexMolecularProfileActivity_Fragment = { __typename: 'CreateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_CreateComplexMolecularProfileActivity_Fragment = { __typename: 'CreateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_CreateFeatureActivity_Fragment = { __typename: 'CreateFeatureActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_CreateFeatureActivity_Fragment = { __typename: 'CreateFeatureActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_CreateVariantActivity_Fragment = { __typename: 'CreateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_CreateVariantActivity_Fragment = { __typename: 'CreateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_DeprecateComplexMolecularProfileActivity_Fragment = { __typename: 'DeprecateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_DeprecateComplexMolecularProfileActivity_Fragment = { __typename: 'DeprecateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_DeprecateFeatureActivity_Fragment = { __typename: 'DeprecateFeatureActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_DeprecateFeatureActivity_Fragment = { __typename: 'DeprecateFeatureActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_DeprecateVariantActivity_Fragment = { __typename: 'DeprecateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_DeprecateVariantActivity_Fragment = { __typename: 'DeprecateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_FlagEntityActivity_Fragment = { __typename: 'FlagEntityActivity', id: number, verbiage: string, createdAt: any, flag: { __typename: 'Flag', id: number, name: string, link: string }, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_FlagEntityActivity_Fragment = { __typename: 'FlagEntityActivity', id: number, verbiage: string, createdAt: any, flag: { __typename: 'Flag', id: number, name: string, link: string }, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_ModerateAssertionActivity_Fragment = { __typename: 'ModerateAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_ModerateAssertionActivity_Fragment = { __typename: 'ModerateAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_ModerateEvidenceItemActivity_Fragment = { __typename: 'ModerateEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_ModerateEvidenceItemActivity_Fragment = { __typename: 'ModerateEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_RejectRevisionsActivity_Fragment = { __typename: 'RejectRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_RejectRevisionsActivity_Fragment = { __typename: 'RejectRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_ResolveFlagActivity_Fragment = { __typename: 'ResolveFlagActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_ResolveFlagActivity_Fragment = { __typename: 'ResolveFlagActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_SubmitAssertionActivity_Fragment = { __typename: 'SubmitAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_SubmitAssertionActivity_Fragment = { __typename: 'SubmitAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_SubmitEvidenceItemActivity_Fragment = { __typename: 'SubmitEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_SubmitEvidenceItemActivity_Fragment = { __typename: 'SubmitEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_SuggestRevisionSetActivity_Fragment = { __typename: 'SuggestRevisionSetActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_SuggestRevisionSetActivity_Fragment = { __typename: 'SuggestRevisionSetActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_SuggestSourceActivity_Fragment = { __typename: 'SuggestSourceActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_SuggestSourceActivity_Fragment = { __typename: 'SuggestSourceActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_UpdateSourceSuggestionStatusActivity_Fragment = { __typename: 'UpdateSourceSuggestionStatusActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_UpdateSourceSuggestionStatusActivity_Fragment = { __typename: 'UpdateSourceSuggestionStatusActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
 export type ActivityFeedNodeFragment = ActivityFeedNode_AcceptRevisionsActivity_Fragment | ActivityFeedNode_CommentActivity_Fragment | ActivityFeedNode_CreateComplexMolecularProfileActivity_Fragment | ActivityFeedNode_CreateFeatureActivity_Fragment | ActivityFeedNode_CreateVariantActivity_Fragment | ActivityFeedNode_DeprecateComplexMolecularProfileActivity_Fragment | ActivityFeedNode_DeprecateFeatureActivity_Fragment | ActivityFeedNode_DeprecateVariantActivity_Fragment | ActivityFeedNode_FlagEntityActivity_Fragment | ActivityFeedNode_ModerateAssertionActivity_Fragment | ActivityFeedNode_ModerateEvidenceItemActivity_Fragment | ActivityFeedNode_RejectRevisionsActivity_Fragment | ActivityFeedNode_ResolveFlagActivity_Fragment | ActivityFeedNode_SubmitAssertionActivity_Fragment | ActivityFeedNode_SubmitEvidenceItemActivity_Fragment | ActivityFeedNode_SuggestRevisionSetActivity_Fragment | ActivityFeedNode_SuggestSourceActivity_Fragment | ActivityFeedNode_UpdateSourceSuggestionStatusActivity_Fragment;
 
@@ -6468,9 +6751,9 @@ export type CommentPopoverQueryVariables = Exact<{
 }>;
 
 
-export type CommentPopoverQuery = { __typename: 'Query', comment?: { __typename: 'Comment', id: number, name: string, createdAt: any, title?: string | undefined, comment: string, commenter: { __typename: 'User', id: number, displayName: string, role: UserRole }, commentable: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Factor', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, name: string, link: string } | { __typename: 'Source', id: number, name: string, link: string } | { __typename: 'SourcePopover', id: number, name: string, link: string } | { __typename: 'Variant', deprecated: boolean, id: number, name: string, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', id: number, name: string, link: string } } | undefined };
+export type CommentPopoverQuery = { __typename: 'Query', comment?: { __typename: 'Comment', id: number, name: string, createdAt: any, title?: string | undefined, comment: string, commenter: { __typename: 'User', id: number, displayName: string, role: UserRole }, commentable: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Factor', id: number, name: string, link: string } | { __typename: 'FactorVariant', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'GeneVariant', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, name: string, link: string } | { __typename: 'Source', id: number, name: string, link: string } | { __typename: 'SourcePopover', id: number, name: string, link: string } | { __typename: 'Variant', deprecated: boolean, id: number, name: string, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', id: number, name: string, link: string } } | undefined };
 
-export type CommentPopoverFragment = { __typename: 'Comment', id: number, name: string, createdAt: any, title?: string | undefined, comment: string, commenter: { __typename: 'User', id: number, displayName: string, role: UserRole }, commentable: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Factor', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, name: string, link: string } | { __typename: 'Source', id: number, name: string, link: string } | { __typename: 'SourcePopover', id: number, name: string, link: string } | { __typename: 'Variant', deprecated: boolean, id: number, name: string, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', id: number, name: string, link: string } };
+export type CommentPopoverFragment = { __typename: 'Comment', id: number, name: string, createdAt: any, title?: string | undefined, comment: string, commenter: { __typename: 'User', id: number, displayName: string, role: UserRole }, commentable: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Factor', id: number, name: string, link: string } | { __typename: 'FactorVariant', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'GeneVariant', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, name: string, link: string } | { __typename: 'Source', id: number, name: string, link: string } | { __typename: 'SourcePopover', id: number, name: string, link: string } | { __typename: 'Variant', deprecated: boolean, id: number, name: string, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', id: number, name: string, link: string } };
 
 export type DiseasePopoverQueryVariables = Exact<{
   diseaseId: Scalars['Int'];
@@ -6526,11 +6809,11 @@ export type EventFeedQueryVariables = Exact<{
 }>;
 
 
-export type EventFeedQuery = { __typename: 'Query', events: { __typename: 'EventConnection', eventTypes?: Array<EventAction>, unfilteredCount: number, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, uniqueParticipants?: Array<{ __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined }>, participatingOrganizations?: Array<{ __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined }>, edges: Array<{ __typename: 'EventEdge', cursor: string, node?: { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', deprecated: boolean, id: number, link: string, name: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Factor', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined } | undefined }> } };
+export type EventFeedQuery = { __typename: 'Query', events: { __typename: 'EventConnection', eventTypes?: Array<EventAction>, unfilteredCount: number, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, uniqueParticipants?: Array<{ __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined }>, participatingOrganizations?: Array<{ __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined }>, edges: Array<{ __typename: 'EventEdge', cursor: string, node?: { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', deprecated: boolean, id: number, link: string, name: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Factor', id: number, name: string, link: string } | { __typename: 'FactorVariant', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'GeneVariant', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined } | undefined }> } };
 
-export type EventFeedFragment = { __typename: 'EventConnection', eventTypes?: Array<EventAction>, unfilteredCount: number, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, uniqueParticipants?: Array<{ __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined }>, participatingOrganizations?: Array<{ __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined }>, edges: Array<{ __typename: 'EventEdge', cursor: string, node?: { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', deprecated: boolean, id: number, link: string, name: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Factor', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined } | undefined }> };
+export type EventFeedFragment = { __typename: 'EventConnection', eventTypes?: Array<EventAction>, unfilteredCount: number, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, uniqueParticipants?: Array<{ __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined }>, participatingOrganizations?: Array<{ __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined }>, edges: Array<{ __typename: 'EventEdge', cursor: string, node?: { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', deprecated: boolean, id: number, link: string, name: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Factor', id: number, name: string, link: string } | { __typename: 'FactorVariant', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'GeneVariant', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined } | undefined }> };
 
-export type EventFeedNodeFragment = { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', deprecated: boolean, id: number, link: string, name: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Factor', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined };
+export type EventFeedNodeFragment = { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', deprecated: boolean, id: number, link: string, name: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Factor', id: number, name: string, link: string } | { __typename: 'FactorVariant', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'GeneVariant', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined };
 
 export type EvidencePopoverQueryVariables = Exact<{
   evidenceId: Scalars['Int'];
@@ -6581,9 +6864,9 @@ export type FeaturePopoverQueryVariables = Exact<{
 }>;
 
 
-export type FeaturePopoverQuery = { __typename: 'Query', feature?: { __typename: 'Feature', id: number, name: string, featureAliases: Array<string>, featureInstance: { __typename: 'Factor' } | { __typename: 'Gene' }, variants: { __typename: 'VariantConnection', totalCount: number }, flags: { __typename: 'FlagConnection', totalCount: number } } | undefined };
+export type FeaturePopoverQuery = { __typename: 'Query', feature?: { __typename: 'Feature', id: number, name: string, featureAliases: Array<string>, featureInstance: { __typename: 'Factor' } | { __typename: 'Gene' }, variants: { __typename: 'VariantInterfaceConnection', totalCount: number }, flags: { __typename: 'FlagConnection', totalCount: number } } | undefined };
 
-export type FeaturePopoverFragment = { __typename: 'Feature', id: number, name: string, featureAliases: Array<string>, featureInstance: { __typename: 'Factor' } | { __typename: 'Gene' }, variants: { __typename: 'VariantConnection', totalCount: number }, flags: { __typename: 'FlagConnection', totalCount: number } };
+export type FeaturePopoverFragment = { __typename: 'Feature', id: number, name: string, featureAliases: Array<string>, featureInstance: { __typename: 'Factor' } | { __typename: 'Gene' }, variants: { __typename: 'VariantInterfaceConnection', totalCount: number }, flags: { __typename: 'FlagConnection', totalCount: number } };
 
 export type BrowseFeaturesQueryVariables = Exact<{
   featureName?: InputMaybe<Scalars['String']>;
@@ -6616,20 +6899,20 @@ export type FlagListQueryVariables = Exact<{
 }>;
 
 
-export type FlagListQuery = { __typename: 'Query', flags: { __typename: 'FlagConnection', totalCount: number, unfilteredCountForSubject?: number | undefined, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, uniqueFlaggingUsers: Array<{ __typename: 'User', username: string, id: number, profileImagePath?: string | undefined }>, uniqueResolvingUsers?: Array<{ __typename: 'User', username: string, id: number, profileImagePath?: string | undefined }> | undefined, edges: Array<{ __typename: 'FlagEdge', node?: { __typename: 'Flag', id: number, state: FlagState, flaggable: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'BrowseFeature', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Factor', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | { __typename: 'VariantGroup', id: number, name: string, link: string }, openActivity: { __typename: 'FlagEntityActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } }, resolutionActivity?: { __typename: 'ResolveFlagActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined } | undefined }> } };
+export type FlagListQuery = { __typename: 'Query', flags: { __typename: 'FlagConnection', totalCount: number, unfilteredCountForSubject?: number | undefined, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, uniqueFlaggingUsers: Array<{ __typename: 'User', username: string, id: number, profileImagePath?: string | undefined }>, uniqueResolvingUsers?: Array<{ __typename: 'User', username: string, id: number, profileImagePath?: string | undefined }> | undefined, edges: Array<{ __typename: 'FlagEdge', node?: { __typename: 'Flag', id: number, state: FlagState, flaggable: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'BrowseFeature', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Factor', id: number, name: string, link: string } | { __typename: 'FactorVariant', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'GeneVariant', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | { __typename: 'VariantGroup', id: number, name: string, link: string }, openActivity: { __typename: 'FlagEntityActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } }, resolutionActivity?: { __typename: 'ResolveFlagActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined } | undefined }> } };
 
-export type FlagListFragment = { __typename: 'FlagConnection', totalCount: number, unfilteredCountForSubject?: number | undefined, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, uniqueFlaggingUsers: Array<{ __typename: 'User', username: string, id: number, profileImagePath?: string | undefined }>, uniqueResolvingUsers?: Array<{ __typename: 'User', username: string, id: number, profileImagePath?: string | undefined }> | undefined, edges: Array<{ __typename: 'FlagEdge', node?: { __typename: 'Flag', id: number, state: FlagState, flaggable: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'BrowseFeature', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Factor', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | { __typename: 'VariantGroup', id: number, name: string, link: string }, openActivity: { __typename: 'FlagEntityActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } }, resolutionActivity?: { __typename: 'ResolveFlagActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined } | undefined }> };
+export type FlagListFragment = { __typename: 'FlagConnection', totalCount: number, unfilteredCountForSubject?: number | undefined, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, uniqueFlaggingUsers: Array<{ __typename: 'User', username: string, id: number, profileImagePath?: string | undefined }>, uniqueResolvingUsers?: Array<{ __typename: 'User', username: string, id: number, profileImagePath?: string | undefined }> | undefined, edges: Array<{ __typename: 'FlagEdge', node?: { __typename: 'Flag', id: number, state: FlagState, flaggable: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'BrowseFeature', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Factor', id: number, name: string, link: string } | { __typename: 'FactorVariant', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'GeneVariant', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | { __typename: 'VariantGroup', id: number, name: string, link: string }, openActivity: { __typename: 'FlagEntityActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } }, resolutionActivity?: { __typename: 'ResolveFlagActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined } | undefined }> };
 
-export type FlagFragment = { __typename: 'Flag', id: number, state: FlagState, flaggable: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'BrowseFeature', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Factor', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | { __typename: 'VariantGroup', id: number, name: string, link: string }, openActivity: { __typename: 'FlagEntityActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } }, resolutionActivity?: { __typename: 'ResolveFlagActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined };
+export type FlagFragment = { __typename: 'Flag', id: number, state: FlagState, flaggable: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'BrowseFeature', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Factor', id: number, name: string, link: string } | { __typename: 'FactorVariant', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'GeneVariant', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | { __typename: 'VariantGroup', id: number, name: string, link: string }, openActivity: { __typename: 'FlagEntityActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } }, resolutionActivity?: { __typename: 'ResolveFlagActivity', id: number, createdAt: any, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }>, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined };
 
 export type FlagPopoverQueryVariables = Exact<{
   flagId: Scalars['Int'];
 }>;
 
 
-export type FlagPopoverQuery = { __typename: 'Query', flag?: { __typename: 'Flag', id: number, name: string, state: FlagState, createdAt: any, flaggingUser: { __typename: 'User', id: number, displayName: string, role: UserRole }, flaggable: { __typename: 'Assertion', id: number, link: string, name: string } | { __typename: 'BrowseFeature', id: number, link: string, name: string } | { __typename: 'EvidenceItem', id: number, link: string, name: string } | { __typename: 'Factor', id: number, link: string, name: string } | { __typename: 'Feature', id: number, link: string, name: string } | { __typename: 'Gene', id: number, link: string, name: string } | { __typename: 'MolecularProfile', id: number, link: string, name: string } | { __typename: 'Variant', deprecated: boolean, id: number, link: string, name: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', id: number, link: string, name: string }, openActivity: { __typename: 'FlagEntityActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } } | undefined };
+export type FlagPopoverQuery = { __typename: 'Query', flag?: { __typename: 'Flag', id: number, name: string, state: FlagState, createdAt: any, flaggingUser: { __typename: 'User', id: number, displayName: string, role: UserRole }, flaggable: { __typename: 'Assertion', id: number, link: string, name: string } | { __typename: 'BrowseFeature', id: number, link: string, name: string } | { __typename: 'EvidenceItem', id: number, link: string, name: string } | { __typename: 'Factor', id: number, link: string, name: string } | { __typename: 'FactorVariant', id: number, link: string, name: string } | { __typename: 'Feature', id: number, link: string, name: string } | { __typename: 'Gene', id: number, link: string, name: string } | { __typename: 'GeneVariant', id: number, link: string, name: string } | { __typename: 'MolecularProfile', id: number, link: string, name: string } | { __typename: 'Variant', deprecated: boolean, id: number, link: string, name: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', id: number, link: string, name: string }, openActivity: { __typename: 'FlagEntityActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } } | undefined };
 
-export type FlagPopoverFragment = { __typename: 'Flag', id: number, name: string, state: FlagState, createdAt: any, flaggingUser: { __typename: 'User', id: number, displayName: string, role: UserRole }, flaggable: { __typename: 'Assertion', id: number, link: string, name: string } | { __typename: 'BrowseFeature', id: number, link: string, name: string } | { __typename: 'EvidenceItem', id: number, link: string, name: string } | { __typename: 'Factor', id: number, link: string, name: string } | { __typename: 'Feature', id: number, link: string, name: string } | { __typename: 'Gene', id: number, link: string, name: string } | { __typename: 'MolecularProfile', id: number, link: string, name: string } | { __typename: 'Variant', deprecated: boolean, id: number, link: string, name: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', id: number, link: string, name: string }, openActivity: { __typename: 'FlagEntityActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } };
+export type FlagPopoverFragment = { __typename: 'Flag', id: number, name: string, state: FlagState, createdAt: any, flaggingUser: { __typename: 'User', id: number, displayName: string, role: UserRole }, flaggable: { __typename: 'Assertion', id: number, link: string, name: string } | { __typename: 'BrowseFeature', id: number, link: string, name: string } | { __typename: 'EvidenceItem', id: number, link: string, name: string } | { __typename: 'Factor', id: number, link: string, name: string } | { __typename: 'FactorVariant', id: number, link: string, name: string } | { __typename: 'Feature', id: number, link: string, name: string } | { __typename: 'Gene', id: number, link: string, name: string } | { __typename: 'GeneVariant', id: number, link: string, name: string } | { __typename: 'MolecularProfile', id: number, link: string, name: string } | { __typename: 'Variant', deprecated: boolean, id: number, link: string, name: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', id: number, link: string, name: string }, openActivity: { __typename: 'FlagEntityActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } };
 
 export type QuicksearchQueryVariables = Exact<{
   query: Scalars['String'];
@@ -6807,9 +7090,9 @@ export type RevisionPopoverQueryVariables = Exact<{
 }>;
 
 
-export type RevisionPopoverQuery = { __typename: 'Query', revision?: { __typename: 'Revision', id: number, name: string, link: string, status: RevisionStatus, createdAt: any, creationActivity?: { __typename: 'SuggestRevisionSetActivity', user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, subject: { __typename: 'Assertion', id: number, link: string, name: string } | { __typename: 'EvidenceItem', id: number, link: string, name: string } | { __typename: 'Factor', id: number, link: string, name: string } | { __typename: 'Feature', id: number, link: string, name: string } | { __typename: 'Flag', id: number, link: string, name: string } | { __typename: 'Gene', id: number, link: string, name: string } | { __typename: 'MolecularProfile', id: number, link: string, name: string } | { __typename: 'Revision', id: number, link: string, name: string } | { __typename: 'RevisionSet', id: number, link: string, name: string } | { __typename: 'Source', id: number, link: string, name: string } | { __typename: 'SourcePopover', id: number, link: string, name: string } | { __typename: 'SourceSuggestion', id: number, link: string, name: string } | { __typename: 'Variant', deprecated: boolean, id: number, link: string, name: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', id: number, link: string, name: string }, linkoutData: { __typename: 'LinkoutData', name: string } } | undefined };
+export type RevisionPopoverQuery = { __typename: 'Query', revision?: { __typename: 'Revision', id: number, name: string, link: string, status: RevisionStatus, createdAt: any, creationActivity?: { __typename: 'SuggestRevisionSetActivity', user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, subject: { __typename: 'Assertion', id: number, link: string, name: string } | { __typename: 'EvidenceItem', id: number, link: string, name: string } | { __typename: 'Factor', id: number, link: string, name: string } | { __typename: 'FactorVariant', id: number, link: string, name: string } | { __typename: 'Feature', id: number, link: string, name: string } | { __typename: 'Flag', id: number, link: string, name: string } | { __typename: 'Gene', id: number, link: string, name: string } | { __typename: 'GeneVariant', id: number, link: string, name: string } | { __typename: 'MolecularProfile', id: number, link: string, name: string } | { __typename: 'Revision', id: number, link: string, name: string } | { __typename: 'RevisionSet', id: number, link: string, name: string } | { __typename: 'Source', id: number, link: string, name: string } | { __typename: 'SourcePopover', id: number, link: string, name: string } | { __typename: 'SourceSuggestion', id: number, link: string, name: string } | { __typename: 'Variant', deprecated: boolean, id: number, link: string, name: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', id: number, link: string, name: string }, linkoutData: { __typename: 'LinkoutData', name: string } } | undefined };
 
-export type RevisionPopoverFragment = { __typename: 'Revision', id: number, name: string, link: string, status: RevisionStatus, createdAt: any, creationActivity?: { __typename: 'SuggestRevisionSetActivity', user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, subject: { __typename: 'Assertion', id: number, link: string, name: string } | { __typename: 'EvidenceItem', id: number, link: string, name: string } | { __typename: 'Factor', id: number, link: string, name: string } | { __typename: 'Feature', id: number, link: string, name: string } | { __typename: 'Flag', id: number, link: string, name: string } | { __typename: 'Gene', id: number, link: string, name: string } | { __typename: 'MolecularProfile', id: number, link: string, name: string } | { __typename: 'Revision', id: number, link: string, name: string } | { __typename: 'RevisionSet', id: number, link: string, name: string } | { __typename: 'Source', id: number, link: string, name: string } | { __typename: 'SourcePopover', id: number, link: string, name: string } | { __typename: 'SourceSuggestion', id: number, link: string, name: string } | { __typename: 'Variant', deprecated: boolean, id: number, link: string, name: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', id: number, link: string, name: string }, linkoutData: { __typename: 'LinkoutData', name: string } };
+export type RevisionPopoverFragment = { __typename: 'Revision', id: number, name: string, link: string, status: RevisionStatus, createdAt: any, creationActivity?: { __typename: 'SuggestRevisionSetActivity', user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, subject: { __typename: 'Assertion', id: number, link: string, name: string } | { __typename: 'EvidenceItem', id: number, link: string, name: string } | { __typename: 'Factor', id: number, link: string, name: string } | { __typename: 'FactorVariant', id: number, link: string, name: string } | { __typename: 'Feature', id: number, link: string, name: string } | { __typename: 'Flag', id: number, link: string, name: string } | { __typename: 'Gene', id: number, link: string, name: string } | { __typename: 'GeneVariant', id: number, link: string, name: string } | { __typename: 'MolecularProfile', id: number, link: string, name: string } | { __typename: 'Revision', id: number, link: string, name: string } | { __typename: 'RevisionSet', id: number, link: string, name: string } | { __typename: 'Source', id: number, link: string, name: string } | { __typename: 'SourcePopover', id: number, link: string, name: string } | { __typename: 'SourceSuggestion', id: number, link: string, name: string } | { __typename: 'Variant', deprecated: boolean, id: number, link: string, name: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', id: number, link: string, name: string }, linkoutData: { __typename: 'LinkoutData', name: string } };
 
 export type RevisionsQueryVariables = Exact<{
   subject?: InputMaybe<ModeratedInput>;
@@ -7026,9 +7309,9 @@ export type VariantGroupPopoverQueryVariables = Exact<{
 }>;
 
 
-export type VariantGroupPopoverQuery = { __typename: 'Query', variantGroup?: { __typename: 'VariantGroup', id: number, name: string, description: string, variants: { __typename: 'VariantConnection', edges: Array<{ __typename: 'VariantEdge', node?: { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean, feature: { __typename: 'Feature', id: number, name: string, link: string } } | undefined }> }, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, sourceType: SourceSource, link: string }> } | undefined };
+export type VariantGroupPopoverQuery = { __typename: 'Query', variantGroup?: { __typename: 'VariantGroup', id: number, name: string, description: string, variants: { __typename: 'VariantInterfaceConnection', edges: Array<{ __typename: 'VariantInterfaceEdge', node?: { __typename: 'FactorVariant', id: number, name: string, link: string, deprecated: boolean, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'GeneVariant', id: number, name: string, link: string, deprecated: boolean, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean, feature: { __typename: 'Feature', id: number, name: string, link: string } } | undefined }> }, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, sourceType: SourceSource, link: string }> } | undefined };
 
-export type VariantGroupPopoverFieldsFragment = { __typename: 'VariantGroup', id: number, name: string, description: string, variants: { __typename: 'VariantConnection', edges: Array<{ __typename: 'VariantEdge', node?: { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean, feature: { __typename: 'Feature', id: number, name: string, link: string } } | undefined }> }, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, sourceType: SourceSource, link: string }> };
+export type VariantGroupPopoverFieldsFragment = { __typename: 'VariantGroup', id: number, name: string, description: string, variants: { __typename: 'VariantInterfaceConnection', edges: Array<{ __typename: 'VariantInterfaceEdge', node?: { __typename: 'FactorVariant', id: number, name: string, link: string, deprecated: boolean, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'GeneVariant', id: number, name: string, link: string, deprecated: boolean, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean, feature: { __typename: 'Feature', id: number, name: string, link: string } } | undefined }> }, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, sourceType: SourceSource, link: string }> };
 
 export type BrowseVariantGroupsQueryVariables = Exact<{
   first?: InputMaybe<Scalars['Int']>;
@@ -7075,18 +7358,30 @@ export type CoordinatesCardQueryVariables = Exact<{
 }>;
 
 
-export type CoordinatesCardQuery = { __typename: 'Query', variant?: { __typename: 'Variant', id: number, name: string, referenceBuild?: ReferenceBuild | undefined, ensemblVersion?: number | undefined, referenceBases?: string | undefined, variantBases?: string | undefined, primaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, secondaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined } | undefined };
+export type CoordinatesCardQuery = { __typename: 'Query', variant?: { __typename: 'FactorVariant', id: number, name: string } | { __typename: 'GeneVariant', referenceBuild?: ReferenceBuild | undefined, ensemblVersion?: number | undefined, referenceBases?: string | undefined, variantBases?: string | undefined, id: number, name: string, primaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, secondaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined } | { __typename: 'Variant', id: number, name: string } | undefined };
+
+type CoordinatesCardFields_FactorVariant_Fragment = { __typename: 'FactorVariant', id: number, name: string };
+
+type CoordinatesCardFields_GeneVariant_Fragment = { __typename: 'GeneVariant', referenceBuild?: ReferenceBuild | undefined, ensemblVersion?: number | undefined, referenceBases?: string | undefined, variantBases?: string | undefined, id: number, name: string, primaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, secondaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined };
 
-export type CoordinatesCardFieldsFragment = { __typename: 'Variant', id: number, name: string, referenceBuild?: ReferenceBuild | undefined, ensemblVersion?: number | undefined, referenceBases?: string | undefined, variantBases?: string | undefined, primaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, secondaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined };
+type CoordinatesCardFields_Variant_Fragment = { __typename: 'Variant', id: number, name: string };
+
+export type CoordinatesCardFieldsFragment = CoordinatesCardFields_FactorVariant_Fragment | CoordinatesCardFields_GeneVariant_Fragment | CoordinatesCardFields_Variant_Fragment;
 
 export type VariantPopoverQueryVariables = Exact<{
   variantId: Scalars['Int'];
 }>;
 
 
-export type VariantPopoverQuery = { __typename: 'Query', variant?: { __typename: 'Variant', id: number, name: string, variantAliases: Array<string>, alleleRegistryId?: string | undefined, feature: { __typename: 'Feature', id: number, name: string, link: string }, molecularProfiles: { __typename: 'MolecularProfileConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, flags: { __typename: 'FlagConnection', totalCount: number } } | undefined };
+export type VariantPopoverQuery = { __typename: 'Query', variant?: { __typename: 'FactorVariant', id: number, name: string, variantAliases: Array<string>, feature: { __typename: 'Feature', id: number, name: string, link: string }, molecularProfiles: { __typename: 'MolecularProfileConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, flags: { __typename: 'FlagConnection', totalCount: number } } | { __typename: 'GeneVariant', alleleRegistryId?: string | undefined, id: number, name: string, variantAliases: Array<string>, feature: { __typename: 'Feature', id: number, name: string, link: string }, molecularProfiles: { __typename: 'MolecularProfileConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, flags: { __typename: 'FlagConnection', totalCount: number } } | { __typename: 'Variant', id: number, name: string, variantAliases: Array<string>, feature: { __typename: 'Feature', id: number, name: string, link: string }, molecularProfiles: { __typename: 'MolecularProfileConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, flags: { __typename: 'FlagConnection', totalCount: number } } | undefined };
+
+type VariantPopoverFields_FactorVariant_Fragment = { __typename: 'FactorVariant', id: number, name: string, variantAliases: Array<string>, feature: { __typename: 'Feature', id: number, name: string, link: string }, molecularProfiles: { __typename: 'MolecularProfileConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, flags: { __typename: 'FlagConnection', totalCount: number } };
+
+type VariantPopoverFields_GeneVariant_Fragment = { __typename: 'GeneVariant', alleleRegistryId?: string | undefined, id: number, name: string, variantAliases: Array<string>, feature: { __typename: 'Feature', id: number, name: string, link: string }, molecularProfiles: { __typename: 'MolecularProfileConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, flags: { __typename: 'FlagConnection', totalCount: number } };
+
+type VariantPopoverFields_Variant_Fragment = { __typename: 'Variant', id: number, name: string, variantAliases: Array<string>, feature: { __typename: 'Feature', id: number, name: string, link: string }, molecularProfiles: { __typename: 'MolecularProfileConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, flags: { __typename: 'FlagConnection', totalCount: number } };
 
-export type VariantPopoverFieldsFragment = { __typename: 'Variant', id: number, name: string, variantAliases: Array<string>, alleleRegistryId?: string | undefined, feature: { __typename: 'Feature', id: number, name: string, link: string }, molecularProfiles: { __typename: 'MolecularProfileConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, flags: { __typename: 'FlagConnection', totalCount: number } };
+export type VariantPopoverFieldsFragment = VariantPopoverFields_FactorVariant_Fragment | VariantPopoverFields_GeneVariant_Fragment | VariantPopoverFields_Variant_Fragment;
 
 export type VariantsMenuQueryVariables = Exact<{
   featureId?: InputMaybe<Scalars['Int']>;
@@ -7101,7 +7396,7 @@ export type VariantsMenuQueryVariables = Exact<{
 }>;
 
 
-export type VariantsMenuQuery = { __typename: 'Query', variants: { __typename: 'VariantConnection', totalCount: number, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasPreviousPage: boolean, hasNextPage: boolean }, edges: Array<{ __typename: 'VariantEdge', cursor: string, node?: { __typename: 'Variant', id: number, name: string, link: string, flagged: boolean } | undefined }> } };
+export type VariantsMenuQuery = { __typename: 'Query', variants: { __typename: 'VariantInterfaceConnection', totalCount: number, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasPreviousPage: boolean, hasNextPage: boolean }, nodes: Array<{ __typename: 'FactorVariant', id: number, name: string, link: string, flagged: boolean } | { __typename: 'GeneVariant', id: number, name: string, link: string, flagged: boolean } | { __typename: 'Variant', id: number, name: string, link: string, flagged: boolean }> } };
 
 export type VariantTypesForFeatureQueryVariables = Exact<{
   featureId?: InputMaybe<Scalars['Int']>;
@@ -7112,7 +7407,13 @@ export type VariantTypesForFeatureQuery = { __typename: 'Query', variantTypes: {
 
 export type MenuVariantTypeFragment = { __typename: 'BrowseVariantType', id: number, name: string, link: string };
 
-export type MenuVariantFragment = { __typename: 'Variant', id: number, name: string, link: string, flagged: boolean };
+type MenuVariant_FactorVariant_Fragment = { __typename: 'FactorVariant', id: number, name: string, link: string, flagged: boolean };
+
+type MenuVariant_GeneVariant_Fragment = { __typename: 'GeneVariant', id: number, name: string, link: string, flagged: boolean };
+
+type MenuVariant_Variant_Fragment = { __typename: 'Variant', id: number, name: string, link: string, flagged: boolean };
+
+export type MenuVariantFragment = MenuVariant_FactorVariant_Fragment | MenuVariant_GeneVariant_Fragment | MenuVariant_Variant_Fragment;
 
 export type BrowseVariantsQueryVariables = Exact<{
   variantName?: InputMaybe<Scalars['String']>;
@@ -7203,7 +7504,7 @@ export type LinkableVariantQueryVariables = Exact<{
 }>;
 
 
-export type LinkableVariantQuery = { __typename: 'Query', variant?: { __typename: 'Variant', id: number, name: string, link: string } | undefined };
+export type LinkableVariantQuery = { __typename: 'Query', variant?: { __typename: 'FactorVariant', id: number, name: string, link: string } | { __typename: 'GeneVariant', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined };
 
 export type LinkableTherapyQueryVariables = Exact<{
   therapyId: Scalars['Int'];
@@ -7267,7 +7568,7 @@ export type DeprecateVariantMutationVariables = Exact<{
 }>;
 
 
-export type DeprecateVariantMutation = { __typename: 'Mutation', deprecateVariant?: { __typename: 'DeprecateVariantPayload', newlyDeprecatedMolecularProfiles?: Array<{ __typename: 'MolecularProfile', id: number }> | undefined, variant?: { __typename: 'Variant', id: number, name: string } | undefined } | undefined };
+export type DeprecateVariantMutation = { __typename: 'Mutation', deprecateVariant?: { __typename: 'DeprecateVariantPayload', newlyDeprecatedMolecularProfiles?: Array<{ __typename: 'MolecularProfile', id: number }> | undefined, variant?: { __typename: 'FactorVariant', id: number, name: string } | { __typename: 'GeneVariant', id: number, name: string } | { __typename: 'Variant', id: number, name: string } | undefined } | undefined };
 
 export type MolecularProfilesForVariantQueryVariables = Exact<{
   variantId: Scalars['Int'];
@@ -7387,6 +7688,24 @@ export type SuggestGeneRevisionMutationVariables = Exact<{
 
 export type SuggestGeneRevisionMutation = { __typename: 'Mutation', suggestGeneRevision?: { __typename: 'SuggestGeneRevisionPayload', clientMutationId?: string | undefined, results: Array<{ __typename: 'RevisionResult', newlyCreated: boolean, id: number, fieldName: string }> } | undefined };
 
+export type GeneVariantRevisableFieldsQueryVariables = Exact<{
+  variantId: Scalars['Int'];
+}>;
+
+
+export type GeneVariantRevisableFieldsQuery = { __typename: 'Query', variant?: { __typename: 'FactorVariant', id: number } | { __typename: 'GeneVariant', id: number, name: string, variantAliases: Array<string>, alleleRegistryId?: string | undefined, clinvarIds: Array<string>, ensemblVersion?: number | undefined, hgvsDescriptions: Array<string>, referenceBuild?: ReferenceBuild | undefined, referenceBases?: string | undefined, variantBases?: string | undefined, feature: { __typename: 'Feature', id: number, name: string }, variantTypes: Array<{ __typename: 'VariantType', id: number, name: string, soid: string }>, primaryCoordinates?: { __typename: 'Coordinate', chromosome?: string | undefined, representativeTranscript?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, secondaryCoordinates?: { __typename: 'Coordinate', chromosome?: string | undefined, representativeTranscript?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined } | { __typename: 'Variant', id: number } | undefined };
+
+export type RevisableGeneVariantFieldsFragment = { __typename: 'GeneVariant', name: string, variantAliases: Array<string>, alleleRegistryId?: string | undefined, clinvarIds: Array<string>, ensemblVersion?: number | undefined, hgvsDescriptions: Array<string>, referenceBuild?: ReferenceBuild | undefined, referenceBases?: string | undefined, variantBases?: string | undefined, feature: { __typename: 'Feature', id: number, name: string }, variantTypes: Array<{ __typename: 'VariantType', id: number, name: string, soid: string }>, primaryCoordinates?: { __typename: 'Coordinate', chromosome?: string | undefined, representativeTranscript?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, secondaryCoordinates?: { __typename: 'Coordinate', chromosome?: string | undefined, representativeTranscript?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined };
+
+export type CoordinateFieldsFragment = { __typename: 'Coordinate', chromosome?: string | undefined, representativeTranscript?: string | undefined, start?: number | undefined, stop?: number | undefined };
+
+export type SuggestGeneVariantRevisionMutationVariables = Exact<{
+  input: SuggestGeneVariantRevisionInput;
+}>;
+
+
+export type SuggestGeneVariantRevisionMutation = { __typename: 'Mutation', suggestGeneVariantRevision?: { __typename: 'SuggestGeneVariantRevisionPayload', clientMutationId?: string | undefined, variant: { __typename: 'FactorVariant', id: number } | { __typename: 'GeneVariant', id: number } | { __typename: 'Variant', id: number }, results: Array<{ __typename: 'RevisionResult', id: number, fieldName: string, newlyCreated: boolean }> } | undefined };
+
 export type MolecularProfileRevisableFieldsQueryVariables = Exact<{
   molecularProfileId: Scalars['Int'];
 }>;
@@ -7417,32 +7736,14 @@ export type SourceSuggestionChecksQueryVariables = Exact<{
 
 export type SourceSuggestionChecksQuery = { __typename: 'Query', source?: { __typename: 'Source', fullyCurated: boolean } | undefined, sourceSuggestions: { __typename: 'SourceSuggestionConnection', filteredCount: number } };
 
-export type VariantRevisableFieldsQueryVariables = Exact<{
-  variantId: Scalars['Int'];
-}>;
-
-
-export type VariantRevisableFieldsQuery = { __typename: 'Query', variant?: { __typename: 'Variant', id: number, name: string, variantAliases: Array<string>, alleleRegistryId?: string | undefined, clinvarIds: Array<string>, ensemblVersion?: number | undefined, hgvsDescriptions: Array<string>, referenceBuild?: ReferenceBuild | undefined, referenceBases?: string | undefined, variantBases?: string | undefined, feature: { __typename: 'Feature', id: number, name: string }, variantTypes: Array<{ __typename: 'VariantType', id: number, name: string, soid: string }>, primaryCoordinates?: { __typename: 'Coordinate', chromosome?: string | undefined, representativeTranscript?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, secondaryCoordinates?: { __typename: 'Coordinate', chromosome?: string | undefined, representativeTranscript?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined } | undefined };
-
-export type RevisableVariantFieldsFragment = { __typename: 'Variant', id: number, name: string, variantAliases: Array<string>, alleleRegistryId?: string | undefined, clinvarIds: Array<string>, ensemblVersion?: number | undefined, hgvsDescriptions: Array<string>, referenceBuild?: ReferenceBuild | undefined, referenceBases?: string | undefined, variantBases?: string | undefined, feature: { __typename: 'Feature', id: number, name: string }, variantTypes: Array<{ __typename: 'VariantType', id: number, name: string, soid: string }>, primaryCoordinates?: { __typename: 'Coordinate', chromosome?: string | undefined, representativeTranscript?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, secondaryCoordinates?: { __typename: 'Coordinate', chromosome?: string | undefined, representativeTranscript?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined };
-
-export type CoordinateFieldsFragment = { __typename: 'Coordinate', chromosome?: string | undefined, representativeTranscript?: string | undefined, start?: number | undefined, stop?: number | undefined };
-
-export type SuggestVariantRevisionMutationVariables = Exact<{
-  input: SuggestVariantRevisionInput;
-}>;
-
-
-export type SuggestVariantRevisionMutation = { __typename: 'Mutation', suggestVariantRevision?: { __typename: 'SuggestVariantRevisionPayload', clientMutationId?: string | undefined, variant: { __typename: 'Variant', id: number }, results: Array<{ __typename: 'RevisionResult', id: number, fieldName: string, newlyCreated: boolean }> } | undefined };
-
 export type VariantGroupRevisableFieldsQueryVariables = Exact<{
   variantGroupId: Scalars['Int'];
 }>;
 
 
-export type VariantGroupRevisableFieldsQuery = { __typename: 'Query', variantGroup?: { __typename: 'VariantGroup', id: number, name: string, description: string, variants: { __typename: 'VariantConnection', totalCount: number, edges: Array<{ __typename: 'VariantEdge', cursor: string, node?: { __typename: 'Variant', id: number, name: string, link: string } | undefined }>, nodes: Array<{ __typename: 'Variant', id: number, name: string, link: string }> }, sources: Array<{ __typename: 'Source', id: number, name: string, link: string }> } | undefined };
+export type VariantGroupRevisableFieldsQuery = { __typename: 'Query', variantGroup?: { __typename: 'VariantGroup', id: number, name: string, description: string, variants: { __typename: 'VariantInterfaceConnection', totalCount: number, edges: Array<{ __typename: 'VariantInterfaceEdge', cursor: string, node?: { __typename: 'FactorVariant', id: number, name: string, link: string } | { __typename: 'GeneVariant', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined }>, nodes: Array<{ __typename: 'FactorVariant', id: number, name: string, link: string } | { __typename: 'GeneVariant', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string }> }, sources: Array<{ __typename: 'Source', id: number, name: string, link: string }> } | undefined };
 
-export type VariantGroupRevisableFieldsFragment = { __typename: 'VariantGroup', id: number, name: string, description: string, variants: { __typename: 'VariantConnection', totalCount: number, edges: Array<{ __typename: 'VariantEdge', cursor: string, node?: { __typename: 'Variant', id: number, name: string, link: string } | undefined }>, nodes: Array<{ __typename: 'Variant', id: number, name: string, link: string }> }, sources: Array<{ __typename: 'Source', id: number, name: string, link: string }> };
+export type VariantGroupRevisableFieldsFragment = { __typename: 'VariantGroup', id: number, name: string, description: string, variants: { __typename: 'VariantInterfaceConnection', totalCount: number, edges: Array<{ __typename: 'VariantInterfaceEdge', cursor: string, node?: { __typename: 'FactorVariant', id: number, name: string, link: string } | { __typename: 'GeneVariant', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined }>, nodes: Array<{ __typename: 'FactorVariant', id: number, name: string, link: string } | { __typename: 'GeneVariant', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string }> }, sources: Array<{ __typename: 'Source', id: number, name: string, link: string }> };
 
 export type SuggestVariantGroupRevisionMutationVariables = Exact<{
   input: SuggestVariantGroupRevisionInput;
@@ -7456,9 +7757,9 @@ export type VariantGroupSubmittableFieldsQueryVariables = Exact<{
 }>;
 
 
-export type VariantGroupSubmittableFieldsQuery = { __typename: 'Query', variantGroup?: { __typename: 'VariantGroup', id: number, name: string, description: string, variants: { __typename: 'VariantConnection', nodes: Array<{ __typename: 'Variant', id: number, name: string, link: string, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string } }> }, sources: Array<{ __typename: 'Source', id: number, link: string, citation?: string | undefined, sourceType: SourceSource }> } | undefined };
+export type VariantGroupSubmittableFieldsQuery = { __typename: 'Query', variantGroup?: { __typename: 'VariantGroup', id: number, name: string, description: string, variants: { __typename: 'VariantInterfaceConnection', nodes: Array<{ __typename: 'FactorVariant', id: number, name: string, link: string, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string } } | { __typename: 'GeneVariant', id: number, name: string, link: string, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string } } | { __typename: 'Variant', id: number, name: string, link: string, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string } }> }, sources: Array<{ __typename: 'Source', id: number, link: string, citation?: string | undefined, sourceType: SourceSource }> } | undefined };
 
-export type SubmittableVariantGroupFieldsFragment = { __typename: 'VariantGroup', id: number, name: string, description: string, variants: { __typename: 'VariantConnection', nodes: Array<{ __typename: 'Variant', id: number, name: string, link: string, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string } }> }, sources: Array<{ __typename: 'Source', id: number, link: string, citation?: string | undefined, sourceType: SourceSource }> };
+export type SubmittableVariantGroupFieldsFragment = { __typename: 'VariantGroup', id: number, name: string, description: string, variants: { __typename: 'VariantInterfaceConnection', nodes: Array<{ __typename: 'FactorVariant', id: number, name: string, link: string, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string } } | { __typename: 'GeneVariant', id: number, name: string, link: string, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string } } | { __typename: 'Variant', id: number, name: string, link: string, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string } }> }, sources: Array<{ __typename: 'Source', id: number, link: string, citation?: string | undefined, sourceType: SourceSource }> };
 
 export type SubmitVariantGroupMutationVariables = Exact<{
   input: SubmitVariantGroupInput;
@@ -7477,7 +7778,7 @@ export type EntityTagsTestQueryVariables = Exact<{
 }>;
 
 
-export type EntityTagsTestQuery = { __typename: 'Query', evidenceItem?: { __typename: 'EvidenceItem', id: number, name: string, link: string } | undefined, molecularProfile?: { __typename: 'MolecularProfile', id: number, name: string, link: string } | undefined, gene?: { __typename: 'Gene', id: number, name: string, link: string } | undefined, variant?: { __typename: 'Variant', id: number, name: string, link: string } | undefined, therapy?: { __typename: 'Therapy', id: number, name: string, link: string } | undefined, disease?: { __typename: 'Disease', id: number, name: string, link: string } | undefined };
+export type EntityTagsTestQuery = { __typename: 'Query', evidenceItem?: { __typename: 'EvidenceItem', id: number, name: string, link: string } | undefined, molecularProfile?: { __typename: 'MolecularProfile', id: number, name: string, link: string } | undefined, gene?: { __typename: 'Gene', id: number, name: string, link: string } | undefined, variant?: { __typename: 'FactorVariant', id: number, name: string, link: string } | { __typename: 'GeneVariant', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined, therapy?: { __typename: 'Therapy', id: number, name: string, link: string } | undefined, disease?: { __typename: 'Disease', id: number, name: string, link: string } | undefined };
 
 export type AcmgCodeSelectTypeaheadQueryVariables = Exact<{
   code: Scalars['String'];
@@ -7638,7 +7939,7 @@ export type PreviewMolecularProfileName2QueryVariables = Exact<{
 }>;
 
 
-export type PreviewMolecularProfileName2Query = { __typename: 'Query', previewMolecularProfileName: { __typename: 'MolecularProfileNamePreview', existingMolecularProfile?: { __typename: 'MolecularProfile', id: number, name: string, link: string } | undefined, segments: Array<{ __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'MolecularProfileTextSegment', text: string } | { __typename: 'Variant', id: number, name: string, link: string }>, deprecatedVariants: Array<{ __typename: 'Variant', id: number, name: string, link: string }> } };
+export type PreviewMolecularProfileName2Query = { __typename: 'Query', previewMolecularProfileName: { __typename: 'MolecularProfileNamePreview', existingMolecularProfile?: { __typename: 'MolecularProfile', id: number, name: string, link: string } | undefined, segments: Array<{ __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'MolecularProfileTextSegment', text: string } | { __typename: 'Variant', id: number, name: string, link: string }>, deprecatedVariants: Array<{ __typename: 'FactorVariant', id: number, name: string, link: string } | { __typename: 'GeneVariant', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string }> } };
 
 export type MpExpressionEditorPrepopulateQueryVariables = Exact<{
   mpId: Scalars['Int'];
@@ -7780,9 +8081,9 @@ export type QuickAddVariantMutationVariables = Exact<{
 }>;
 
 
-export type QuickAddVariantMutation = { __typename: 'Mutation', createVariant?: { __typename: 'CreateVariantPayload', clientMutationId?: string | undefined, new: boolean, variant: { __typename: 'Variant', id: number, name: string, link: string, variantAliases: Array<string>, singleVariantMolecularProfileId: number, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, molecularProfileAliases: Array<string> } } } | undefined };
+export type QuickAddVariantMutation = { __typename: 'Mutation', createVariant?: { __typename: 'CreateVariantPayload', clientMutationId?: string | undefined, new: boolean, variant: { __typename: 'FactorVariant', id: number, name: string, link: string, variantAliases: Array<string>, singleVariantMolecularProfileId: number, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, molecularProfileAliases: Array<string> } } | { __typename: 'GeneVariant', id: number, name: string, link: string, variantAliases: Array<string>, singleVariantMolecularProfileId: number, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, molecularProfileAliases: Array<string> } } | { __typename: 'Variant', id: number, name: string, link: string, variantAliases: Array<string>, singleVariantMolecularProfileId: number, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, molecularProfileAliases: Array<string> } } } | undefined };
 
-export type QuickAddVariantFieldsFragment = { __typename: 'CreateVariantPayload', clientMutationId?: string | undefined, new: boolean, variant: { __typename: 'Variant', id: number, name: string, link: string, variantAliases: Array<string>, singleVariantMolecularProfileId: number, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, molecularProfileAliases: Array<string> } } };
+export type QuickAddVariantFieldsFragment = { __typename: 'CreateVariantPayload', clientMutationId?: string | undefined, new: boolean, variant: { __typename: 'FactorVariant', id: number, name: string, link: string, variantAliases: Array<string>, singleVariantMolecularProfileId: number, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, molecularProfileAliases: Array<string> } } | { __typename: 'GeneVariant', id: number, name: string, link: string, variantAliases: Array<string>, singleVariantMolecularProfileId: number, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, molecularProfileAliases: Array<string> } } | { __typename: 'Variant', id: number, name: string, link: string, variantAliases: Array<string>, singleVariantMolecularProfileId: number, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, molecularProfileAliases: Array<string> } } };
 
 export type VariantSelectTypeaheadQueryVariables = Exact<{
   name: Scalars['String'];
@@ -7790,16 +8091,22 @@ export type VariantSelectTypeaheadQueryVariables = Exact<{
 }>;
 
 
-export type VariantSelectTypeaheadQuery = { __typename: 'Query', variants: { __typename: 'VariantConnection', totalCount: number, edges: Array<{ __typename: 'VariantEdge', node?: { __typename: 'Variant', id: number, name: string, link: string, variantAliases: Array<string>, singleVariantMolecularProfileId: number, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, molecularProfileAliases: Array<string> } } | undefined }>, nodes: Array<{ __typename: 'Variant', id: number, name: string, link: string, variantAliases: Array<string>, singleVariantMolecularProfileId: number, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, molecularProfileAliases: Array<string> } }> } };
+export type VariantSelectTypeaheadQuery = { __typename: 'Query', variants: { __typename: 'VariantInterfaceConnection', totalCount: number, edges: Array<{ __typename: 'VariantInterfaceEdge', node?: { __typename: 'FactorVariant', id: number, name: string, link: string, variantAliases: Array<string>, singleVariantMolecularProfileId: number, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, molecularProfileAliases: Array<string> } } | { __typename: 'GeneVariant', id: number, name: string, link: string, variantAliases: Array<string>, singleVariantMolecularProfileId: number, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, molecularProfileAliases: Array<string> } } | { __typename: 'Variant', id: number, name: string, link: string, variantAliases: Array<string>, singleVariantMolecularProfileId: number, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, molecularProfileAliases: Array<string> } } | undefined }>, nodes: Array<{ __typename: 'FactorVariant', id: number, name: string, link: string, variantAliases: Array<string>, singleVariantMolecularProfileId: number, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, molecularProfileAliases: Array<string> } } | { __typename: 'GeneVariant', id: number, name: string, link: string, variantAliases: Array<string>, singleVariantMolecularProfileId: number, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, molecularProfileAliases: Array<string> } } | { __typename: 'Variant', id: number, name: string, link: string, variantAliases: Array<string>, singleVariantMolecularProfileId: number, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, molecularProfileAliases: Array<string> } }> } };
 
 export type VariantSelectTagQueryVariables = Exact<{
   variantId: Scalars['Int'];
 }>;
 
 
-export type VariantSelectTagQuery = { __typename: 'Query', variant?: { __typename: 'Variant', id: number, name: string, link: string, variantAliases: Array<string>, singleVariantMolecularProfileId: number, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, molecularProfileAliases: Array<string> } } | undefined };
+export type VariantSelectTagQuery = { __typename: 'Query', variant?: { __typename: 'FactorVariant', id: number, name: string, link: string, variantAliases: Array<string>, singleVariantMolecularProfileId: number, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, molecularProfileAliases: Array<string> } } | { __typename: 'GeneVariant', id: number, name: string, link: string, variantAliases: Array<string>, singleVariantMolecularProfileId: number, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, molecularProfileAliases: Array<string> } } | { __typename: 'Variant', id: number, name: string, link: string, variantAliases: Array<string>, singleVariantMolecularProfileId: number, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, molecularProfileAliases: Array<string> } } | undefined };
+
+type VariantSelectTypeaheadFields_FactorVariant_Fragment = { __typename: 'FactorVariant', id: number, name: string, link: string, variantAliases: Array<string>, singleVariantMolecularProfileId: number, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, molecularProfileAliases: Array<string> } };
 
-export type VariantSelectTypeaheadFieldsFragment = { __typename: 'Variant', id: number, name: string, link: string, variantAliases: Array<string>, singleVariantMolecularProfileId: number, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, molecularProfileAliases: Array<string> } };
+type VariantSelectTypeaheadFields_GeneVariant_Fragment = { __typename: 'GeneVariant', id: number, name: string, link: string, variantAliases: Array<string>, singleVariantMolecularProfileId: number, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, molecularProfileAliases: Array<string> } };
+
+type VariantSelectTypeaheadFields_Variant_Fragment = { __typename: 'Variant', id: number, name: string, link: string, variantAliases: Array<string>, singleVariantMolecularProfileId: number, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, molecularProfileAliases: Array<string> } };
+
+export type VariantSelectTypeaheadFieldsFragment = VariantSelectTypeaheadFields_FactorVariant_Fragment | VariantSelectTypeaheadFields_GeneVariant_Fragment | VariantSelectTypeaheadFields_Variant_Fragment;
 
 export type VariantTypeSelectTypeaheadQueryVariables = Exact<{
   name: Scalars['String'];
@@ -7918,18 +8225,18 @@ export type MolecularProfileDetailQueryVariables = Exact<{
 }>;
 
 
-export type MolecularProfileDetailQuery = { __typename: 'Query', molecularProfile?: { __typename: 'MolecularProfile', id: number, name: string, deprecated: boolean, deprecationReason?: MolecularProfileDeprecationReason | undefined, molecularProfileAliases: Array<string>, complexMolecularProfileDeprecationActivity?: { __typename: 'DeprecateComplexMolecularProfileActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, deprecatedVariants: Array<{ __typename: 'Variant', deprecationReason?: VariantDeprecationReason | undefined, id: number, deprecated: boolean, name: string, link: string, deprecationActivity?: { __typename: 'DeprecateVariantActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, feature: { __typename: 'Feature', id: number, name: string, link: string } }>, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, variants: Array<{ __typename: 'Variant', id: number }> } | undefined };
+export type MolecularProfileDetailQuery = { __typename: 'Query', molecularProfile?: { __typename: 'MolecularProfile', id: number, name: string, deprecated: boolean, deprecationReason?: MolecularProfileDeprecationReason | undefined, molecularProfileAliases: Array<string>, complexMolecularProfileDeprecationActivity?: { __typename: 'DeprecateComplexMolecularProfileActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, deprecatedVariants: Array<{ __typename: 'FactorVariant', deprecationReason?: VariantDeprecationReason | undefined, id: number, deprecated: boolean, name: string, link: string, deprecationActivity?: { __typename: 'DeprecateVariantActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'GeneVariant', deprecationReason?: VariantDeprecationReason | undefined, id: number, deprecated: boolean, name: string, link: string, deprecationActivity?: { __typename: 'DeprecateVariantActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'Variant', deprecationReason?: VariantDeprecationReason | undefined, id: number, deprecated: boolean, name: string, link: string, deprecationActivity?: { __typename: 'DeprecateVariantActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, feature: { __typename: 'Feature', id: number, name: string, link: string } }>, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, variants: Array<{ __typename: 'FactorVariant', id: number } | { __typename: 'GeneVariant', id: number } | { __typename: 'Variant', id: number }> } | undefined };
 
-export type MolecularProfileDetailFieldsFragment = { __typename: 'MolecularProfile', id: number, name: string, deprecated: boolean, deprecationReason?: MolecularProfileDeprecationReason | undefined, molecularProfileAliases: Array<string>, complexMolecularProfileDeprecationActivity?: { __typename: 'DeprecateComplexMolecularProfileActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, deprecatedVariants: Array<{ __typename: 'Variant', deprecationReason?: VariantDeprecationReason | undefined, id: number, deprecated: boolean, name: string, link: string, deprecationActivity?: { __typename: 'DeprecateVariantActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, feature: { __typename: 'Feature', id: number, name: string, link: string } }>, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, variants: Array<{ __typename: 'Variant', id: number }> };
+export type MolecularProfileDetailFieldsFragment = { __typename: 'MolecularProfile', id: number, name: string, deprecated: boolean, deprecationReason?: MolecularProfileDeprecationReason | undefined, molecularProfileAliases: Array<string>, complexMolecularProfileDeprecationActivity?: { __typename: 'DeprecateComplexMolecularProfileActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, deprecatedVariants: Array<{ __typename: 'FactorVariant', deprecationReason?: VariantDeprecationReason | undefined, id: number, deprecated: boolean, name: string, link: string, deprecationActivity?: { __typename: 'DeprecateVariantActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'GeneVariant', deprecationReason?: VariantDeprecationReason | undefined, id: number, deprecated: boolean, name: string, link: string, deprecationActivity?: { __typename: 'DeprecateVariantActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'Variant', deprecationReason?: VariantDeprecationReason | undefined, id: number, deprecated: boolean, name: string, link: string, deprecationActivity?: { __typename: 'DeprecateVariantActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, feature: { __typename: 'Feature', id: number, name: string, link: string } }>, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, variants: Array<{ __typename: 'FactorVariant', id: number } | { __typename: 'GeneVariant', id: number } | { __typename: 'Variant', id: number }> };
 
 export type MolecularProfileSummaryQueryVariables = Exact<{
   mpId: Scalars['Int'];
 }>;
 
 
-export type MolecularProfileSummaryQuery = { __typename: 'Query', molecularProfile?: { __typename: 'MolecularProfile', id: number, name: string, description?: string | undefined, molecularProfileAliases: Array<string>, molecularProfileScore: number, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceType: SourceSource }>, variants: Array<{ __typename: 'Variant', id: number, name: string, link: string, variantAliases: Array<string>, clinvarIds: Array<string>, alleleRegistryId?: string | undefined, openCravatUrl?: string | undefined, referenceBuild?: ReferenceBuild | undefined, ensemblVersion?: number | undefined, referenceBases?: string | undefined, variantBases?: string | undefined, hgvsDescriptions: Array<string>, feature: { __typename: 'Feature', id: number, name: string, link: string }, molecularProfiles: { __typename: 'MolecularProfileConnection', totalCount: number, nodes: Array<{ __typename: 'MolecularProfile', id: number, link: string, name: string, deprecated: boolean }> }, variantTypes: Array<{ __typename: 'VariantType', id: number, link: string, soid: string, name: string }>, primaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, secondaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined }>, parsedName: Array<{ __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'MolecularProfileTextSegment', text: string } | { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean }>, complexMolecularProfileCreationActivity?: { __typename: 'CreateComplexMolecularProfileActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, variantDeprecationActivity?: { __typename: 'DeprecateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, complexMolecularProfileDeprecationActivity?: { __typename: 'DeprecateComplexMolecularProfileActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined } | undefined };
+export type MolecularProfileSummaryQuery = { __typename: 'Query', molecularProfile?: { __typename: 'MolecularProfile', id: number, name: string, description?: string | undefined, molecularProfileAliases: Array<string>, molecularProfileScore: number, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceType: SourceSource }>, variants: Array<{ __typename: 'FactorVariant', id: number, name: string, link: string, variantAliases: Array<string>, ncitId?: string | undefined, feature: { __typename: 'Feature', id: number, name: string, link: string }, molecularProfiles: { __typename: 'MolecularProfileConnection', totalCount: number, nodes: Array<{ __typename: 'MolecularProfile', id: number, link: string, name: string, deprecated: boolean }> }, variantTypes: Array<{ __typename: 'VariantType', id: number, link: string, soid: string, name: string }> } | { __typename: 'GeneVariant', id: number, name: string, link: string, variantAliases: Array<string>, alleleRegistryId?: string | undefined, openCravatUrl?: string | undefined, maneSelectTranscript?: string | undefined, hgvsDescriptions: Array<string>, clinvarIds: Array<string>, referenceBuild?: ReferenceBuild | undefined, ensemblVersion?: number | undefined, referenceBases?: string | undefined, variantBases?: string | undefined, feature: { __typename: 'Feature', id: number, name: string, link: string }, molecularProfiles: { __typename: 'MolecularProfileConnection', totalCount: number, nodes: Array<{ __typename: 'MolecularProfile', id: number, link: string, name: string, deprecated: boolean }> }, variantTypes: Array<{ __typename: 'VariantType', id: number, link: string, soid: string, name: string }>, primaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, secondaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, myVariantInfo?: { __typename: 'MyVariantInfo', myVariantInfoId: string, caddConsequence: Array<string>, caddDetail: Array<string>, caddScore?: number | undefined, caddPhred?: number | undefined, clinvarClinicalSignificance: Array<string>, clinvarHgvsCoding: Array<string>, clinvarHgvsGenomic: Array<string>, clinvarHgvsNonCoding: Array<string>, clinvarHgvsProtein: Array<string>, clinvarId?: number | undefined, clinvarOmim?: string | undefined, cosmicId?: string | undefined, dbnsfpInterproDomain: Array<string>, dbsnpRsid?: string | undefined, eglClass?: string | undefined, eglHgvs: Array<string>, eglProtein?: string | undefined, eglTranscript?: string | undefined, exacAlleleCount?: number | undefined, exacAlleleFrequency?: number | undefined, exacAlleleNumber?: number | undefined, fathmmMklPrediction?: string | undefined, fathmmMklScore?: number | undefined, fathmmPrediction: Array<string>, fathmmScore: Array<number>, fitconsScore?: number | undefined, gerp?: number | undefined, gnomadExomeAlleleCount?: number | undefined, gnomadExomeAlleleFrequency?: number | undefined, gnomadExomeAlleleNumber?: number | undefined, gnomadExomeFilter?: string | undefined, gnomadGenomeAlleleCount?: number | undefined, gnomadGenomeAlleleFrequency?: number | undefined, gnomadGenomeAlleleNumber?: number | undefined, gnomadGenomeFilter?: string | undefined, lrtPrediction?: string | undefined, lrtScore?: number | undefined, metalrPrediction?: string | undefined, metalrScore?: number | undefined, metasvmPrediction?: string | undefined, metasvmScore?: number | undefined, mutationassessorPrediction: Array<string>, mutationassessorScore: Array<number>, mutationtasterPrediction: Array<string>, mutationtasterScore: Array<number>, phastcons100way?: number | undefined, phastcons30way?: number | undefined, phyloP100way?: number | undefined, phyloP30way?: number | undefined, polyphen2HdivPrediction: Array<string>, polyphen2HdivScore: Array<number>, polyphen2HvarPrediction: Array<string>, polyphen2HvarScore: Array<number>, proveanPrediction: Array<string>, proveanScore: Array<number>, revelScore?: Array<number> | undefined, siftPrediction: Array<string>, siftScore: Array<number>, siphy?: number | undefined, snpeffSnpEffect: Array<string>, snpeffSnpImpact: Array<string> } | undefined } | { __typename: 'Variant', id: number, name: string, link: string, variantAliases: Array<string>, feature: { __typename: 'Feature', id: number, name: string, link: string }, molecularProfiles: { __typename: 'MolecularProfileConnection', totalCount: number, nodes: Array<{ __typename: 'MolecularProfile', id: number, link: string, name: string, deprecated: boolean }> }, variantTypes: Array<{ __typename: 'VariantType', id: number, link: string, soid: string, name: string }> }>, parsedName: Array<{ __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'MolecularProfileTextSegment', text: string } | { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean }>, complexMolecularProfileCreationActivity?: { __typename: 'CreateComplexMolecularProfileActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, variantDeprecationActivity?: { __typename: 'DeprecateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, complexMolecularProfileDeprecationActivity?: { __typename: 'DeprecateComplexMolecularProfileActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined } | undefined };
 
-export type MolecularProfileSummaryFieldsFragment = { __typename: 'MolecularProfile', id: number, name: string, description?: string | undefined, molecularProfileAliases: Array<string>, molecularProfileScore: number, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceType: SourceSource }>, variants: Array<{ __typename: 'Variant', id: number, name: string, link: string, variantAliases: Array<string>, clinvarIds: Array<string>, alleleRegistryId?: string | undefined, openCravatUrl?: string | undefined, referenceBuild?: ReferenceBuild | undefined, ensemblVersion?: number | undefined, referenceBases?: string | undefined, variantBases?: string | undefined, hgvsDescriptions: Array<string>, feature: { __typename: 'Feature', id: number, name: string, link: string }, molecularProfiles: { __typename: 'MolecularProfileConnection', totalCount: number, nodes: Array<{ __typename: 'MolecularProfile', id: number, link: string, name: string, deprecated: boolean }> }, variantTypes: Array<{ __typename: 'VariantType', id: number, link: string, soid: string, name: string }>, primaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, secondaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined }>, parsedName: Array<{ __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'MolecularProfileTextSegment', text: string } | { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean }>, complexMolecularProfileCreationActivity?: { __typename: 'CreateComplexMolecularProfileActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, variantDeprecationActivity?: { __typename: 'DeprecateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, complexMolecularProfileDeprecationActivity?: { __typename: 'DeprecateComplexMolecularProfileActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined };
+export type MolecularProfileSummaryFieldsFragment = { __typename: 'MolecularProfile', id: number, name: string, description?: string | undefined, molecularProfileAliases: Array<string>, molecularProfileScore: number, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceType: SourceSource }>, variants: Array<{ __typename: 'FactorVariant', id: number, name: string, link: string, variantAliases: Array<string>, ncitId?: string | undefined, feature: { __typename: 'Feature', id: number, name: string, link: string }, molecularProfiles: { __typename: 'MolecularProfileConnection', totalCount: number, nodes: Array<{ __typename: 'MolecularProfile', id: number, link: string, name: string, deprecated: boolean }> }, variantTypes: Array<{ __typename: 'VariantType', id: number, link: string, soid: string, name: string }> } | { __typename: 'GeneVariant', id: number, name: string, link: string, variantAliases: Array<string>, alleleRegistryId?: string | undefined, openCravatUrl?: string | undefined, maneSelectTranscript?: string | undefined, hgvsDescriptions: Array<string>, clinvarIds: Array<string>, referenceBuild?: ReferenceBuild | undefined, ensemblVersion?: number | undefined, referenceBases?: string | undefined, variantBases?: string | undefined, feature: { __typename: 'Feature', id: number, name: string, link: string }, molecularProfiles: { __typename: 'MolecularProfileConnection', totalCount: number, nodes: Array<{ __typename: 'MolecularProfile', id: number, link: string, name: string, deprecated: boolean }> }, variantTypes: Array<{ __typename: 'VariantType', id: number, link: string, soid: string, name: string }>, primaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, secondaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, myVariantInfo?: { __typename: 'MyVariantInfo', myVariantInfoId: string, caddConsequence: Array<string>, caddDetail: Array<string>, caddScore?: number | undefined, caddPhred?: number | undefined, clinvarClinicalSignificance: Array<string>, clinvarHgvsCoding: Array<string>, clinvarHgvsGenomic: Array<string>, clinvarHgvsNonCoding: Array<string>, clinvarHgvsProtein: Array<string>, clinvarId?: number | undefined, clinvarOmim?: string | undefined, cosmicId?: string | undefined, dbnsfpInterproDomain: Array<string>, dbsnpRsid?: string | undefined, eglClass?: string | undefined, eglHgvs: Array<string>, eglProtein?: string | undefined, eglTranscript?: string | undefined, exacAlleleCount?: number | undefined, exacAlleleFrequency?: number | undefined, exacAlleleNumber?: number | undefined, fathmmMklPrediction?: string | undefined, fathmmMklScore?: number | undefined, fathmmPrediction: Array<string>, fathmmScore: Array<number>, fitconsScore?: number | undefined, gerp?: number | undefined, gnomadExomeAlleleCount?: number | undefined, gnomadExomeAlleleFrequency?: number | undefined, gnomadExomeAlleleNumber?: number | undefined, gnomadExomeFilter?: string | undefined, gnomadGenomeAlleleCount?: number | undefined, gnomadGenomeAlleleFrequency?: number | undefined, gnomadGenomeAlleleNumber?: number | undefined, gnomadGenomeFilter?: string | undefined, lrtPrediction?: string | undefined, lrtScore?: number | undefined, metalrPrediction?: string | undefined, metalrScore?: number | undefined, metasvmPrediction?: string | undefined, metasvmScore?: number | undefined, mutationassessorPrediction: Array<string>, mutationassessorScore: Array<number>, mutationtasterPrediction: Array<string>, mutationtasterScore: Array<number>, phastcons100way?: number | undefined, phastcons30way?: number | undefined, phyloP100way?: number | undefined, phyloP30way?: number | undefined, polyphen2HdivPrediction: Array<string>, polyphen2HdivScore: Array<number>, polyphen2HvarPrediction: Array<string>, polyphen2HvarScore: Array<number>, proveanPrediction: Array<string>, proveanScore: Array<number>, revelScore?: Array<number> | undefined, siftPrediction: Array<string>, siftScore: Array<number>, siphy?: number | undefined, snpeffSnpEffect: Array<string>, snpeffSnpImpact: Array<string> } | undefined } | { __typename: 'Variant', id: number, name: string, link: string, variantAliases: Array<string>, feature: { __typename: 'Feature', id: number, name: string, link: string }, molecularProfiles: { __typename: 'MolecularProfileConnection', totalCount: number, nodes: Array<{ __typename: 'MolecularProfile', id: number, link: string, name: string, deprecated: boolean }> }, variantTypes: Array<{ __typename: 'VariantType', id: number, link: string, soid: string, name: string }> }>, parsedName: Array<{ __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'MolecularProfileTextSegment', text: string } | { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean }>, complexMolecularProfileCreationActivity?: { __typename: 'CreateComplexMolecularProfileActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, variantDeprecationActivity?: { __typename: 'DeprecateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, complexMolecularProfileDeprecationActivity?: { __typename: 'DeprecateComplexMolecularProfileActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined };
 
 type MolecularProfileParsedName_Feature_Fragment = { __typename: 'Feature', id: number, name: string, link: string };
 
@@ -7939,7 +8246,13 @@ type MolecularProfileParsedName_Variant_Fragment = { __typename: 'Variant', id:
 
 export type MolecularProfileParsedNameFragment = MolecularProfileParsedName_Feature_Fragment | MolecularProfileParsedName_MolecularProfileTextSegment_Fragment | MolecularProfileParsedName_Variant_Fragment;
 
-export type VariantMolecularProfileCardFieldsFragment = { __typename: 'Variant', id: number, name: string, link: string, variantAliases: Array<string>, clinvarIds: Array<string>, alleleRegistryId?: string | undefined, openCravatUrl?: string | undefined, referenceBuild?: ReferenceBuild | undefined, ensemblVersion?: number | undefined, referenceBases?: string | undefined, variantBases?: string | undefined, hgvsDescriptions: Array<string>, feature: { __typename: 'Feature', id: number, name: string, link: string }, molecularProfiles: { __typename: 'MolecularProfileConnection', totalCount: number, nodes: Array<{ __typename: 'MolecularProfile', id: number, link: string, name: string, deprecated: boolean }> }, variantTypes: Array<{ __typename: 'VariantType', id: number, link: string, soid: string, name: string }>, primaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, secondaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined };
+type VariantMolecularProfileCardFields_FactorVariant_Fragment = { __typename: 'FactorVariant', id: number, name: string, link: string, variantAliases: Array<string>, ncitId?: string | undefined, feature: { __typename: 'Feature', id: number, name: string, link: string }, molecularProfiles: { __typename: 'MolecularProfileConnection', totalCount: number, nodes: Array<{ __typename: 'MolecularProfile', id: number, link: string, name: string, deprecated: boolean }> }, variantTypes: Array<{ __typename: 'VariantType', id: number, link: string, soid: string, name: string }> };
+
+type VariantMolecularProfileCardFields_GeneVariant_Fragment = { __typename: 'GeneVariant', id: number, name: string, link: string, variantAliases: Array<string>, alleleRegistryId?: string | undefined, openCravatUrl?: string | undefined, maneSelectTranscript?: string | undefined, hgvsDescriptions: Array<string>, clinvarIds: Array<string>, referenceBuild?: ReferenceBuild | undefined, ensemblVersion?: number | undefined, referenceBases?: string | undefined, variantBases?: string | undefined, feature: { __typename: 'Feature', id: number, name: string, link: string }, molecularProfiles: { __typename: 'MolecularProfileConnection', totalCount: number, nodes: Array<{ __typename: 'MolecularProfile', id: number, link: string, name: string, deprecated: boolean }> }, variantTypes: Array<{ __typename: 'VariantType', id: number, link: string, soid: string, name: string }>, primaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, secondaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, myVariantInfo?: { __typename: 'MyVariantInfo', myVariantInfoId: string, caddConsequence: Array<string>, caddDetail: Array<string>, caddScore?: number | undefined, caddPhred?: number | undefined, clinvarClinicalSignificance: Array<string>, clinvarHgvsCoding: Array<string>, clinvarHgvsGenomic: Array<string>, clinvarHgvsNonCoding: Array<string>, clinvarHgvsProtein: Array<string>, clinvarId?: number | undefined, clinvarOmim?: string | undefined, cosmicId?: string | undefined, dbnsfpInterproDomain: Array<string>, dbsnpRsid?: string | undefined, eglClass?: string | undefined, eglHgvs: Array<string>, eglProtein?: string | undefined, eglTranscript?: string | undefined, exacAlleleCount?: number | undefined, exacAlleleFrequency?: number | undefined, exacAlleleNumber?: number | undefined, fathmmMklPrediction?: string | undefined, fathmmMklScore?: number | undefined, fathmmPrediction: Array<string>, fathmmScore: Array<number>, fitconsScore?: number | undefined, gerp?: number | undefined, gnomadExomeAlleleCount?: number | undefined, gnomadExomeAlleleFrequency?: number | undefined, gnomadExomeAlleleNumber?: number | undefined, gnomadExomeFilter?: string | undefined, gnomadGenomeAlleleCount?: number | undefined, gnomadGenomeAlleleFrequency?: number | undefined, gnomadGenomeAlleleNumber?: number | undefined, gnomadGenomeFilter?: string | undefined, lrtPrediction?: string | undefined, lrtScore?: number | undefined, metalrPrediction?: string | undefined, metalrScore?: number | undefined, metasvmPrediction?: string | undefined, metasvmScore?: number | undefined, mutationassessorPrediction: Array<string>, mutationassessorScore: Array<number>, mutationtasterPrediction: Array<string>, mutationtasterScore: Array<number>, phastcons100way?: number | undefined, phastcons30way?: number | undefined, phyloP100way?: number | undefined, phyloP30way?: number | undefined, polyphen2HdivPrediction: Array<string>, polyphen2HdivScore: Array<number>, polyphen2HvarPrediction: Array<string>, polyphen2HvarScore: Array<number>, proveanPrediction: Array<string>, proveanScore: Array<number>, revelScore?: Array<number> | undefined, siftPrediction: Array<string>, siftScore: Array<number>, siphy?: number | undefined, snpeffSnpEffect: Array<string>, snpeffSnpImpact: Array<string> } | undefined };
+
+type VariantMolecularProfileCardFields_Variant_Fragment = { __typename: 'Variant', id: number, name: string, link: string, variantAliases: Array<string>, feature: { __typename: 'Feature', id: number, name: string, link: string }, molecularProfiles: { __typename: 'MolecularProfileConnection', totalCount: number, nodes: Array<{ __typename: 'MolecularProfile', id: number, link: string, name: string, deprecated: boolean }> }, variantTypes: Array<{ __typename: 'VariantType', id: number, link: string, soid: string, name: string }> };
+
+export type VariantMolecularProfileCardFieldsFragment = VariantMolecularProfileCardFields_FactorVariant_Fragment | VariantMolecularProfileCardFields_GeneVariant_Fragment | VariantMolecularProfileCardFields_Variant_Fragment;
 
 export type OrganizationDetailQueryVariables = Exact<{
   organizationId: Scalars['Int'];
@@ -8046,22 +8359,22 @@ export type UserNotificationsQueryVariables = Exact<{
 }>;
 
 
-export type UserNotificationsQuery = { __typename: 'Query', notifications: { __typename: 'NotificationConnection', eventTypes: Array<EventAction>, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, notificationSubjects: Array<{ __typename: 'EventSubjectWithCount', occuranceCount: number, subject?: { __typename: 'Assertion', id: number, name: string } | { __typename: 'EvidenceItem', id: number, name: string } | { __typename: 'Factor', id: number, name: string } | { __typename: 'Feature', id: number, name: string } | { __typename: 'Flag', id: number, name: string } | { __typename: 'Gene', id: number, name: string } | { __typename: 'MolecularProfile', id: number, name: string } | { __typename: 'Revision', id: number, name: string } | { __typename: 'RevisionSet', id: number, name: string } | { __typename: 'Source', id: number, name: string } | { __typename: 'SourcePopover', id: number, name: string } | { __typename: 'SourceSuggestion', id: number, name: string } | { __typename: 'Variant', id: number, name: string } | { __typename: 'VariantGroup', id: number, name: string } | undefined }>, originatingUsers: Array<{ __typename: 'User', id: number, displayName: string }>, organizations: Array<{ __typename: 'Organization', id: number, name: string }>, edges: Array<{ __typename: 'NotificationEdge', node?: { __typename: 'Notification', id: number, type: NotificationReason, seen: boolean, event: { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', deprecated: boolean, id: number, link: string, name: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Factor', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined }, subscription?: { __typename: 'Subscription', id: number, subscribable: { __typename: 'Assertion', id: number, name: string } | { __typename: 'EvidenceItem', id: number, name: string } | { __typename: 'Factor', id: number, name: string } | { __typename: 'Feature', id: number, name: string } | { __typename: 'Flag', id: number, name: string } | { __typename: 'Gene', id: number, name: string } | { __typename: 'MolecularProfile', id: number, name: string } | { __typename: 'Revision', id: number, name: string } | { __typename: 'RevisionSet', id: number, name: string } | { __typename: 'Source', id: number, name: string } | { __typename: 'SourcePopover', id: number, name: string } | { __typename: 'SourceSuggestion', id: number, name: string } | { __typename: 'Variant', id: number, name: string } | { __typename: 'VariantGroup', id: number, name: string } } | undefined } | undefined }> } };
+export type UserNotificationsQuery = { __typename: 'Query', notifications: { __typename: 'NotificationConnection', eventTypes: Array<EventAction>, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, notificationSubjects: Array<{ __typename: 'EventSubjectWithCount', occuranceCount: number, subject?: { __typename: 'Assertion', id: number, name: string } | { __typename: 'EvidenceItem', id: number, name: string } | { __typename: 'Factor', id: number, name: string } | { __typename: 'FactorVariant', id: number, name: string } | { __typename: 'Feature', id: number, name: string } | { __typename: 'Flag', id: number, name: string } | { __typename: 'Gene', id: number, name: string } | { __typename: 'GeneVariant', id: number, name: string } | { __typename: 'MolecularProfile', id: number, name: string } | { __typename: 'Revision', id: number, name: string } | { __typename: 'RevisionSet', id: number, name: string } | { __typename: 'Source', id: number, name: string } | { __typename: 'SourcePopover', id: number, name: string } | { __typename: 'SourceSuggestion', id: number, name: string } | { __typename: 'Variant', id: number, name: string } | { __typename: 'VariantGroup', id: number, name: string } | undefined }>, originatingUsers: Array<{ __typename: 'User', id: number, displayName: string }>, organizations: Array<{ __typename: 'Organization', id: number, name: string }>, edges: Array<{ __typename: 'NotificationEdge', node?: { __typename: 'Notification', id: number, type: NotificationReason, seen: boolean, event: { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', deprecated: boolean, id: number, link: string, name: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Factor', id: number, name: string, link: string } | { __typename: 'FactorVariant', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'GeneVariant', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined }, subscription?: { __typename: 'Subscription', id: number, subscribable: { __typename: 'Assertion', id: number, name: string } | { __typename: 'EvidenceItem', id: number, name: string } | { __typename: 'Factor', id: number, name: string } | { __typename: 'FactorVariant', id: number, name: string } | { __typename: 'Feature', id: number, name: string } | { __typename: 'Flag', id: number, name: string } | { __typename: 'Gene', id: number, name: string } | { __typename: 'GeneVariant', id: number, name: string } | { __typename: 'MolecularProfile', id: number, name: string } | { __typename: 'Revision', id: number, name: string } | { __typename: 'RevisionSet', id: number, name: string } | { __typename: 'Source', id: number, name: string } | { __typename: 'SourcePopover', id: number, name: string } | { __typename: 'SourceSuggestion', id: number, name: string } | { __typename: 'Variant', id: number, name: string } | { __typename: 'VariantGroup', id: number, name: string } } | undefined } | undefined }> } };
 
 export type NotificationOrganizationFragment = { __typename: 'Organization', id: number, name: string };
 
 export type NotificationOriginatingUsersFragment = { __typename: 'User', id: number, displayName: string };
 
-export type NotificationFeedSubjectsFragment = { __typename: 'EventSubjectWithCount', occuranceCount: number, subject?: { __typename: 'Assertion', id: number, name: string } | { __typename: 'EvidenceItem', id: number, name: string } | { __typename: 'Factor', id: number, name: string } | { __typename: 'Feature', id: number, name: string } | { __typename: 'Flag', id: number, name: string } | { __typename: 'Gene', id: number, name: string } | { __typename: 'MolecularProfile', id: number, name: string } | { __typename: 'Revision', id: number, name: string } | { __typename: 'RevisionSet', id: number, name: string } | { __typename: 'Source', id: number, name: string } | { __typename: 'SourcePopover', id: number, name: string } | { __typename: 'SourceSuggestion', id: number, name: string } | { __typename: 'Variant', id: number, name: string } | { __typename: 'VariantGroup', id: number, name: string } | undefined };
+export type NotificationFeedSubjectsFragment = { __typename: 'EventSubjectWithCount', occuranceCount: number, subject?: { __typename: 'Assertion', id: number, name: string } | { __typename: 'EvidenceItem', id: number, name: string } | { __typename: 'Factor', id: number, name: string } | { __typename: 'FactorVariant', id: number, name: string } | { __typename: 'Feature', id: number, name: string } | { __typename: 'Flag', id: number, name: string } | { __typename: 'Gene', id: number, name: string } | { __typename: 'GeneVariant', id: number, name: string } | { __typename: 'MolecularProfile', id: number, name: string } | { __typename: 'Revision', id: number, name: string } | { __typename: 'RevisionSet', id: number, name: string } | { __typename: 'Source', id: number, name: string } | { __typename: 'SourcePopover', id: number, name: string } | { __typename: 'SourceSuggestion', id: number, name: string } | { __typename: 'Variant', id: number, name: string } | { __typename: 'VariantGroup', id: number, name: string } | undefined };
 
-export type NotificationNodeFragment = { __typename: 'Notification', id: number, type: NotificationReason, seen: boolean, event: { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', deprecated: boolean, id: number, link: string, name: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Factor', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined }, subscription?: { __typename: 'Subscription', id: number, subscribable: { __typename: 'Assertion', id: number, name: string } | { __typename: 'EvidenceItem', id: number, name: string } | { __typename: 'Factor', id: number, name: string } | { __typename: 'Feature', id: number, name: string } | { __typename: 'Flag', id: number, name: string } | { __typename: 'Gene', id: number, name: string } | { __typename: 'MolecularProfile', id: number, name: string } | { __typename: 'Revision', id: number, name: string } | { __typename: 'RevisionSet', id: number, name: string } | { __typename: 'Source', id: number, name: string } | { __typename: 'SourcePopover', id: number, name: string } | { __typename: 'SourceSuggestion', id: number, name: string } | { __typename: 'Variant', id: number, name: string } | { __typename: 'VariantGroup', id: number, name: string } } | undefined };
+export type NotificationNodeFragment = { __typename: 'Notification', id: number, type: NotificationReason, seen: boolean, event: { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', deprecated: boolean, id: number, link: string, name: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Factor', id: number, name: string, link: string } | { __typename: 'FactorVariant', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'GeneVariant', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined }, subscription?: { __typename: 'Subscription', id: number, subscribable: { __typename: 'Assertion', id: number, name: string } | { __typename: 'EvidenceItem', id: number, name: string } | { __typename: 'Factor', id: number, name: string } | { __typename: 'FactorVariant', id: number, name: string } | { __typename: 'Feature', id: number, name: string } | { __typename: 'Flag', id: number, name: string } | { __typename: 'Gene', id: number, name: string } | { __typename: 'GeneVariant', id: number, name: string } | { __typename: 'MolecularProfile', id: number, name: string } | { __typename: 'Revision', id: number, name: string } | { __typename: 'RevisionSet', id: number, name: string } | { __typename: 'Source', id: number, name: string } | { __typename: 'SourcePopover', id: number, name: string } | { __typename: 'SourceSuggestion', id: number, name: string } | { __typename: 'Variant', id: number, name: string } | { __typename: 'VariantGroup', id: number, name: string } } | undefined };
 
 export type UpdateNotificationStatusMutationVariables = Exact<{
   input: UpdateNotificationStatusInput;
 }>;
 
 
-export type UpdateNotificationStatusMutation = { __typename: 'Mutation', updateNotificationStatus?: { __typename: 'UpdateNotificationStatusPayload', notifications: Array<{ __typename: 'Notification', id: number, type: NotificationReason, seen: boolean, event: { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'Feature', deprecated: boolean, id: number, link: string, name: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Factor', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined }, subscription?: { __typename: 'Subscription', id: number, subscribable: { __typename: 'Assertion', id: number, name: string } | { __typename: 'EvidenceItem', id: number, name: string } | { __typename: 'Factor', id: number, name: string } | { __typename: 'Feature', id: number, name: string } | { __typename: 'Flag', id: number, name: string } | { __typename: 'Gene', id: number, name: string } | { __typename: 'MolecularProfile', id: number, name: string } | { __typename: 'Revision', id: number, name: string } | { __typename: 'RevisionSet', id: number, name: string } | { __typename: 'Source', id: number, name: string } | { __typename: 'SourcePopover', id: number, name: string } | { __typename: 'SourceSuggestion', id: number, name: string } | { __typename: 'Variant', id: number, name: string } | { __typename: 'VariantGroup', id: number, name: string } } | undefined }> } | undefined };
+export type UpdateNotificationStatusMutation = { __typename: 'Mutation', updateNotificationStatus?: { __typename: 'UpdateNotificationStatusPayload', notifications: Array<{ __typename: 'Notification', id: number, type: NotificationReason, seen: boolean, event: { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', deprecated: boolean, id: number, link: string, name: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Factor', id: number, name: string, link: string } | { __typename: 'FactorVariant', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'GeneVariant', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined }, subscription?: { __typename: 'Subscription', id: number, subscribable: { __typename: 'Assertion', id: number, name: string } | { __typename: 'EvidenceItem', id: number, name: string } | { __typename: 'Factor', id: number, name: string } | { __typename: 'FactorVariant', id: number, name: string } | { __typename: 'Feature', id: number, name: string } | { __typename: 'Flag', id: number, name: string } | { __typename: 'Gene', id: number, name: string } | { __typename: 'GeneVariant', id: number, name: string } | { __typename: 'MolecularProfile', id: number, name: string } | { __typename: 'Revision', id: number, name: string } | { __typename: 'RevisionSet', id: number, name: string } | { __typename: 'Source', id: number, name: string } | { __typename: 'SourcePopover', id: number, name: string } | { __typename: 'SourceSuggestion', id: number, name: string } | { __typename: 'Variant', id: number, name: string } | { __typename: 'VariantGroup', id: number, name: string } } | undefined }> } | undefined };
 
 export type UnsubscribeMutationVariables = Exact<{
   input: UnsubscribeInput;
@@ -8084,9 +8397,9 @@ export type VariantGroupDetailQueryVariables = Exact<{
 }>;
 
 
-export type VariantGroupDetailQuery = { __typename: 'Query', variantGroup?: { __typename: 'VariantGroup', id: number, name: string, variants: { __typename: 'VariantConnection', totalCount: number }, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number } } | undefined };
+export type VariantGroupDetailQuery = { __typename: 'Query', variantGroup?: { __typename: 'VariantGroup', id: number, name: string, variants: { __typename: 'VariantInterfaceConnection', totalCount: number }, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number } } | undefined };
 
-export type VariantGroupDetailFieldsFragment = { __typename: 'VariantGroup', id: number, name: string, variants: { __typename: 'VariantConnection', totalCount: number }, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number } };
+export type VariantGroupDetailFieldsFragment = { __typename: 'VariantGroup', id: number, name: string, variants: { __typename: 'VariantInterfaceConnection', totalCount: number }, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number } };
 
 export type VariantGroupsSummaryQueryVariables = Exact<{
   variantGroupId: Scalars['Int'];
@@ -8109,18 +8422,34 @@ export type VariantDetailQueryVariables = Exact<{
 }>;
 
 
-export type VariantDetailQuery = { __typename: 'Query', variant?: { __typename: 'Variant', id: number, name: string, deprecated: boolean, deprecationReason?: VariantDeprecationReason | undefined, variantAliases: Array<string>, deprecationActivity?: { __typename: 'DeprecateVariantActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, feature: { __typename: 'Feature', id: number, name: string, link: string }, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number } } | undefined };
+export type VariantDetailQuery = { __typename: 'Query', variant?: { __typename: 'FactorVariant', id: number, name: string, deprecated: boolean, deprecationReason?: VariantDeprecationReason | undefined, variantAliases: Array<string>, deprecationActivity?: { __typename: 'DeprecateVariantActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, feature: { __typename: 'Feature', id: number, name: string, link: string }, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number } } | { __typename: 'GeneVariant', id: number, name: string, deprecated: boolean, deprecationReason?: VariantDeprecationReason | undefined, variantAliases: Array<string>, deprecationActivity?: { __typename: 'DeprecateVariantActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, feature: { __typename: 'Feature', id: number, name: string, link: string }, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number } } | { __typename: 'Variant', id: number, name: string, deprecated: boolean, deprecationReason?: VariantDeprecationReason | undefined, variantAliases: Array<string>, deprecationActivity?: { __typename: 'DeprecateVariantActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, feature: { __typename: 'Feature', id: number, name: string, link: string }, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number } } | undefined };
+
+type VariantDetailFields_FactorVariant_Fragment = { __typename: 'FactorVariant', id: number, name: string, deprecated: boolean, deprecationReason?: VariantDeprecationReason | undefined, variantAliases: Array<string>, deprecationActivity?: { __typename: 'DeprecateVariantActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, feature: { __typename: 'Feature', id: number, name: string, link: string }, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number } };
+
+type VariantDetailFields_GeneVariant_Fragment = { __typename: 'GeneVariant', id: number, name: string, deprecated: boolean, deprecationReason?: VariantDeprecationReason | undefined, variantAliases: Array<string>, deprecationActivity?: { __typename: 'DeprecateVariantActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, feature: { __typename: 'Feature', id: number, name: string, link: string }, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number } };
+
+type VariantDetailFields_Variant_Fragment = { __typename: 'Variant', id: number, name: string, deprecated: boolean, deprecationReason?: VariantDeprecationReason | undefined, variantAliases: Array<string>, deprecationActivity?: { __typename: 'DeprecateVariantActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, feature: { __typename: 'Feature', id: number, name: string, link: string }, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number } };
 
-export type VariantDetailFieldsFragment = { __typename: 'Variant', id: number, name: string, deprecated: boolean, deprecationReason?: VariantDeprecationReason | undefined, variantAliases: Array<string>, deprecationActivity?: { __typename: 'DeprecateVariantActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, feature: { __typename: 'Feature', id: number, name: string, link: string }, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number } };
+export type VariantDetailFieldsFragment = VariantDetailFields_FactorVariant_Fragment | VariantDetailFields_GeneVariant_Fragment | VariantDetailFields_Variant_Fragment;
 
 export type VariantSummaryQueryVariables = Exact<{
   variantId: Scalars['Int'];
 }>;
 
 
-export type VariantSummaryQuery = { __typename: 'Query', variant?: { __typename: 'Variant', id: number, name: string, variantAliases: Array<string>, alleleRegistryId?: string | undefined, openCravatUrl?: string | undefined, maneSelectTranscript?: string | undefined, hgvsDescriptions: Array<string>, clinvarIds: Array<string>, referenceBuild?: ReferenceBuild | undefined, ensemblVersion?: number | undefined, referenceBases?: string | undefined, variantBases?: string | undefined, feature: { __typename: 'Feature', id: number, name: string, link: string }, variantTypes: Array<{ __typename: 'VariantType', id: number, link: string, soid: string, name: string }>, primaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, secondaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, myVariantInfo?: { __typename: 'MyVariantInfo', myVariantInfoId: string, caddConsequence: Array<string>, caddDetail: Array<string>, caddScore?: number | undefined, caddPhred?: number | undefined, clinvarClinicalSignificance: Array<string>, clinvarHgvsCoding: Array<string>, clinvarHgvsGenomic: Array<string>, clinvarHgvsNonCoding: Array<string>, clinvarHgvsProtein: Array<string>, clinvarId?: number | undefined, clinvarOmim?: string | undefined, cosmicId?: string | undefined, dbnsfpInterproDomain: Array<string>, dbsnpRsid?: string | undefined, eglClass?: string | undefined, eglHgvs: Array<string>, eglProtein?: string | undefined, eglTranscript?: string | undefined, exacAlleleCount?: number | undefined, exacAlleleFrequency?: number | undefined, exacAlleleNumber?: number | undefined, fathmmMklPrediction?: string | undefined, fathmmMklScore?: number | undefined, fathmmPrediction: Array<string>, fathmmScore: Array<number>, fitconsScore?: number | undefined, gerp?: number | undefined, gnomadExomeAlleleCount?: number | undefined, gnomadExomeAlleleFrequency?: number | undefined, gnomadExomeAlleleNumber?: number | undefined, gnomadExomeFilter?: string | undefined, gnomadGenomeAlleleCount?: number | undefined, gnomadGenomeAlleleFrequency?: number | undefined, gnomadGenomeAlleleNumber?: number | undefined, gnomadGenomeFilter?: string | undefined, lrtPrediction?: string | undefined, lrtScore?: number | undefined, metalrPrediction?: string | undefined, metalrScore?: number | undefined, metasvmPrediction?: string | undefined, metasvmScore?: number | undefined, mutationassessorPrediction: Array<string>, mutationassessorScore: Array<number>, mutationtasterPrediction: Array<string>, mutationtasterScore: Array<number>, phastcons100way?: number | undefined, phastcons30way?: number | undefined, phyloP100way?: number | undefined, phyloP30way?: number | undefined, polyphen2HdivPrediction: Array<string>, polyphen2HdivScore: Array<number>, polyphen2HvarPrediction: Array<string>, polyphen2HvarScore: Array<number>, proveanPrediction: Array<string>, proveanScore: Array<number>, revelScore?: Array<number> | undefined, siftPrediction: Array<string>, siftScore: Array<number>, siphy?: number | undefined, snpeffSnpEffect: Array<string>, snpeffSnpImpact: Array<string> } | undefined, lastSubmittedRevisionEvent?: { __typename: 'Event', originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, lastAcceptedRevisionEvent?: { __typename: 'Event', originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, creationActivity?: { __typename: 'CreateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, deprecationActivity?: { __typename: 'DeprecateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined } | undefined };
+export type VariantSummaryQuery = { __typename: 'Query', variant?: { __typename: 'FactorVariant', id: number, name: string, variantAliases: Array<string>, ncitId?: string | undefined, feature: { __typename: 'Feature', id: number, name: string, link: string }, variantTypes: Array<{ __typename: 'VariantType', id: number, link: string, soid: string, name: string }>, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, lastSubmittedRevisionEvent?: { __typename: 'Event', originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, lastAcceptedRevisionEvent?: { __typename: 'Event', originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, creationActivity?: { __typename: 'CreateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, deprecationActivity?: { __typename: 'DeprecateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined } | { __typename: 'GeneVariant', id: number, name: string, variantAliases: Array<string>, alleleRegistryId?: string | undefined, openCravatUrl?: string | undefined, maneSelectTranscript?: string | undefined, hgvsDescriptions: Array<string>, clinvarIds: Array<string>, referenceBuild?: ReferenceBuild | undefined, ensemblVersion?: number | undefined, referenceBases?: string | undefined, variantBases?: string | undefined, feature: { __typename: 'Feature', id: number, name: string, link: string }, variantTypes: Array<{ __typename: 'VariantType', id: number, link: string, soid: string, name: string }>, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, lastSubmittedRevisionEvent?: { __typename: 'Event', originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, lastAcceptedRevisionEvent?: { __typename: 'Event', originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, creationActivity?: { __typename: 'CreateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, deprecationActivity?: { __typename: 'DeprecateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, primaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, secondaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, myVariantInfo?: { __typename: 'MyVariantInfo', myVariantInfoId: string, caddConsequence: Array<string>, caddDetail: Array<string>, caddScore?: number | undefined, caddPhred?: number | undefined, clinvarClinicalSignificance: Array<string>, clinvarHgvsCoding: Array<string>, clinvarHgvsGenomic: Array<string>, clinvarHgvsNonCoding: Array<string>, clinvarHgvsProtein: Array<string>, clinvarId?: number | undefined, clinvarOmim?: string | undefined, cosmicId?: string | undefined, dbnsfpInterproDomain: Array<string>, dbsnpRsid?: string | undefined, eglClass?: string | undefined, eglHgvs: Array<string>, eglProtein?: string | undefined, eglTranscript?: string | undefined, exacAlleleCount?: number | undefined, exacAlleleFrequency?: number | undefined, exacAlleleNumber?: number | undefined, fathmmMklPrediction?: string | undefined, fathmmMklScore?: number | undefined, fathmmPrediction: Array<string>, fathmmScore: Array<number>, fitconsScore?: number | undefined, gerp?: number | undefined, gnomadExomeAlleleCount?: number | undefined, gnomadExomeAlleleFrequency?: number | undefined, gnomadExomeAlleleNumber?: number | undefined, gnomadExomeFilter?: string | undefined, gnomadGenomeAlleleCount?: number | undefined, gnomadGenomeAlleleFrequency?: number | undefined, gnomadGenomeAlleleNumber?: number | undefined, gnomadGenomeFilter?: string | undefined, lrtPrediction?: string | undefined, lrtScore?: number | undefined, metalrPrediction?: string | undefined, metalrScore?: number | undefined, metasvmPrediction?: string | undefined, metasvmScore?: number | undefined, mutationassessorPrediction: Array<string>, mutationassessorScore: Array<number>, mutationtasterPrediction: Array<string>, mutationtasterScore: Array<number>, phastcons100way?: number | undefined, phastcons30way?: number | undefined, phyloP100way?: number | undefined, phyloP30way?: number | undefined, polyphen2HdivPrediction: Array<string>, polyphen2HdivScore: Array<number>, polyphen2HvarPrediction: Array<string>, polyphen2HvarScore: Array<number>, proveanPrediction: Array<string>, proveanScore: Array<number>, revelScore?: Array<number> | undefined, siftPrediction: Array<string>, siftScore: Array<number>, siphy?: number | undefined, snpeffSnpEffect: Array<string>, snpeffSnpImpact: Array<string> } | undefined } | { __typename: 'Variant', id: number, name: string, variantAliases: Array<string>, feature: { __typename: 'Feature', id: number, name: string, link: string }, variantTypes: Array<{ __typename: 'VariantType', id: number, link: string, soid: string, name: string }>, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, lastSubmittedRevisionEvent?: { __typename: 'Event', originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, lastAcceptedRevisionEvent?: { __typename: 'Event', originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, creationActivity?: { __typename: 'CreateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, deprecationActivity?: { __typename: 'DeprecateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined } | undefined };
+
+type VariantSummaryFields_FactorVariant_Fragment = { __typename: 'FactorVariant', id: number, name: string, variantAliases: Array<string>, ncitId?: string | undefined, feature: { __typename: 'Feature', id: number, name: string, link: string }, variantTypes: Array<{ __typename: 'VariantType', id: number, link: string, soid: string, name: string }>, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, lastSubmittedRevisionEvent?: { __typename: 'Event', originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, lastAcceptedRevisionEvent?: { __typename: 'Event', originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, creationActivity?: { __typename: 'CreateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, deprecationActivity?: { __typename: 'DeprecateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined };
+
+type VariantSummaryFields_GeneVariant_Fragment = { __typename: 'GeneVariant', id: number, name: string, variantAliases: Array<string>, alleleRegistryId?: string | undefined, openCravatUrl?: string | undefined, maneSelectTranscript?: string | undefined, hgvsDescriptions: Array<string>, clinvarIds: Array<string>, referenceBuild?: ReferenceBuild | undefined, ensemblVersion?: number | undefined, referenceBases?: string | undefined, variantBases?: string | undefined, feature: { __typename: 'Feature', id: number, name: string, link: string }, variantTypes: Array<{ __typename: 'VariantType', id: number, link: string, soid: string, name: string }>, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, lastSubmittedRevisionEvent?: { __typename: 'Event', originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, lastAcceptedRevisionEvent?: { __typename: 'Event', originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, creationActivity?: { __typename: 'CreateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, deprecationActivity?: { __typename: 'DeprecateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, primaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, secondaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, myVariantInfo?: { __typename: 'MyVariantInfo', myVariantInfoId: string, caddConsequence: Array<string>, caddDetail: Array<string>, caddScore?: number | undefined, caddPhred?: number | undefined, clinvarClinicalSignificance: Array<string>, clinvarHgvsCoding: Array<string>, clinvarHgvsGenomic: Array<string>, clinvarHgvsNonCoding: Array<string>, clinvarHgvsProtein: Array<string>, clinvarId?: number | undefined, clinvarOmim?: string | undefined, cosmicId?: string | undefined, dbnsfpInterproDomain: Array<string>, dbsnpRsid?: string | undefined, eglClass?: string | undefined, eglHgvs: Array<string>, eglProtein?: string | undefined, eglTranscript?: string | undefined, exacAlleleCount?: number | undefined, exacAlleleFrequency?: number | undefined, exacAlleleNumber?: number | undefined, fathmmMklPrediction?: string | undefined, fathmmMklScore?: number | undefined, fathmmPrediction: Array<string>, fathmmScore: Array<number>, fitconsScore?: number | undefined, gerp?: number | undefined, gnomadExomeAlleleCount?: number | undefined, gnomadExomeAlleleFrequency?: number | undefined, gnomadExomeAlleleNumber?: number | undefined, gnomadExomeFilter?: string | undefined, gnomadGenomeAlleleCount?: number | undefined, gnomadGenomeAlleleFrequency?: number | undefined, gnomadGenomeAlleleNumber?: number | undefined, gnomadGenomeFilter?: string | undefined, lrtPrediction?: string | undefined, lrtScore?: number | undefined, metalrPrediction?: string | undefined, metalrScore?: number | undefined, metasvmPrediction?: string | undefined, metasvmScore?: number | undefined, mutationassessorPrediction: Array<string>, mutationassessorScore: Array<number>, mutationtasterPrediction: Array<string>, mutationtasterScore: Array<number>, phastcons100way?: number | undefined, phastcons30way?: number | undefined, phyloP100way?: number | undefined, phyloP30way?: number | undefined, polyphen2HdivPrediction: Array<string>, polyphen2HdivScore: Array<number>, polyphen2HvarPrediction: Array<string>, polyphen2HvarScore: Array<number>, proveanPrediction: Array<string>, proveanScore: Array<number>, revelScore?: Array<number> | undefined, siftPrediction: Array<string>, siftScore: Array<number>, siphy?: number | undefined, snpeffSnpEffect: Array<string>, snpeffSnpImpact: Array<string> } | undefined };
+
+type VariantSummaryFields_Variant_Fragment = { __typename: 'Variant', id: number, name: string, variantAliases: Array<string>, feature: { __typename: 'Feature', id: number, name: string, link: string }, variantTypes: Array<{ __typename: 'VariantType', id: number, link: string, soid: string, name: string }>, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, lastSubmittedRevisionEvent?: { __typename: 'Event', originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, lastAcceptedRevisionEvent?: { __typename: 'Event', originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, creationActivity?: { __typename: 'CreateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, deprecationActivity?: { __typename: 'DeprecateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined };
+
+export type VariantSummaryFieldsFragment = VariantSummaryFields_FactorVariant_Fragment | VariantSummaryFields_GeneVariant_Fragment | VariantSummaryFields_Variant_Fragment;
 
-export type VariantSummaryFieldsFragment = { __typename: 'Variant', id: number, name: string, variantAliases: Array<string>, alleleRegistryId?: string | undefined, openCravatUrl?: string | undefined, maneSelectTranscript?: string | undefined, hgvsDescriptions: Array<string>, clinvarIds: Array<string>, referenceBuild?: ReferenceBuild | undefined, ensemblVersion?: number | undefined, referenceBases?: string | undefined, variantBases?: string | undefined, feature: { __typename: 'Feature', id: number, name: string, link: string }, variantTypes: Array<{ __typename: 'VariantType', id: number, link: string, soid: string, name: string }>, primaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, secondaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, myVariantInfo?: { __typename: 'MyVariantInfo', myVariantInfoId: string, caddConsequence: Array<string>, caddDetail: Array<string>, caddScore?: number | undefined, caddPhred?: number | undefined, clinvarClinicalSignificance: Array<string>, clinvarHgvsCoding: Array<string>, clinvarHgvsGenomic: Array<string>, clinvarHgvsNonCoding: Array<string>, clinvarHgvsProtein: Array<string>, clinvarId?: number | undefined, clinvarOmim?: string | undefined, cosmicId?: string | undefined, dbnsfpInterproDomain: Array<string>, dbsnpRsid?: string | undefined, eglClass?: string | undefined, eglHgvs: Array<string>, eglProtein?: string | undefined, eglTranscript?: string | undefined, exacAlleleCount?: number | undefined, exacAlleleFrequency?: number | undefined, exacAlleleNumber?: number | undefined, fathmmMklPrediction?: string | undefined, fathmmMklScore?: number | undefined, fathmmPrediction: Array<string>, fathmmScore: Array<number>, fitconsScore?: number | undefined, gerp?: number | undefined, gnomadExomeAlleleCount?: number | undefined, gnomadExomeAlleleFrequency?: number | undefined, gnomadExomeAlleleNumber?: number | undefined, gnomadExomeFilter?: string | undefined, gnomadGenomeAlleleCount?: number | undefined, gnomadGenomeAlleleFrequency?: number | undefined, gnomadGenomeAlleleNumber?: number | undefined, gnomadGenomeFilter?: string | undefined, lrtPrediction?: string | undefined, lrtScore?: number | undefined, metalrPrediction?: string | undefined, metalrScore?: number | undefined, metasvmPrediction?: string | undefined, metasvmScore?: number | undefined, mutationassessorPrediction: Array<string>, mutationassessorScore: Array<number>, mutationtasterPrediction: Array<string>, mutationtasterScore: Array<number>, phastcons100way?: number | undefined, phastcons30way?: number | undefined, phyloP100way?: number | undefined, phyloP30way?: number | undefined, polyphen2HdivPrediction: Array<string>, polyphen2HdivScore: Array<number>, polyphen2HvarPrediction: Array<string>, polyphen2HvarScore: Array<number>, proveanPrediction: Array<string>, proveanScore: Array<number>, revelScore?: Array<number> | undefined, siftPrediction: Array<string>, siftScore: Array<number>, siphy?: number | undefined, snpeffSnpEffect: Array<string>, snpeffSnpImpact: Array<string> } | undefined, lastSubmittedRevisionEvent?: { __typename: 'Event', originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, lastAcceptedRevisionEvent?: { __typename: 'Event', originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, creationActivity?: { __typename: 'CreateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, deprecationActivity?: { __typename: 'DeprecateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined };
+export type FactorVariantSummaryFieldsFragment = { __typename: 'FactorVariant', ncitId?: string | undefined };
+
+export type GeneVariantSummaryFieldsFragment = { __typename: 'GeneVariant', alleleRegistryId?: string | undefined, openCravatUrl?: string | undefined, maneSelectTranscript?: string | undefined, hgvsDescriptions: Array<string>, clinvarIds: Array<string>, referenceBuild?: ReferenceBuild | undefined, ensemblVersion?: number | undefined, referenceBases?: string | undefined, variantBases?: string | undefined, primaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, secondaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, myVariantInfo?: { __typename: 'MyVariantInfo', myVariantInfoId: string, caddConsequence: Array<string>, caddDetail: Array<string>, caddScore?: number | undefined, caddPhred?: number | undefined, clinvarClinicalSignificance: Array<string>, clinvarHgvsCoding: Array<string>, clinvarHgvsGenomic: Array<string>, clinvarHgvsNonCoding: Array<string>, clinvarHgvsProtein: Array<string>, clinvarId?: number | undefined, clinvarOmim?: string | undefined, cosmicId?: string | undefined, dbnsfpInterproDomain: Array<string>, dbsnpRsid?: string | undefined, eglClass?: string | undefined, eglHgvs: Array<string>, eglProtein?: string | undefined, eglTranscript?: string | undefined, exacAlleleCount?: number | undefined, exacAlleleFrequency?: number | undefined, exacAlleleNumber?: number | undefined, fathmmMklPrediction?: string | undefined, fathmmMklScore?: number | undefined, fathmmPrediction: Array<string>, fathmmScore: Array<number>, fitconsScore?: number | undefined, gerp?: number | undefined, gnomadExomeAlleleCount?: number | undefined, gnomadExomeAlleleFrequency?: number | undefined, gnomadExomeAlleleNumber?: number | undefined, gnomadExomeFilter?: string | undefined, gnomadGenomeAlleleCount?: number | undefined, gnomadGenomeAlleleFrequency?: number | undefined, gnomadGenomeAlleleNumber?: number | undefined, gnomadGenomeFilter?: string | undefined, lrtPrediction?: string | undefined, lrtScore?: number | undefined, metalrPrediction?: string | undefined, metalrScore?: number | undefined, metasvmPrediction?: string | undefined, metasvmScore?: number | undefined, mutationassessorPrediction: Array<string>, mutationassessorScore: Array<number>, mutationtasterPrediction: Array<string>, mutationtasterScore: Array<number>, phastcons100way?: number | undefined, phastcons30way?: number | undefined, phyloP100way?: number | undefined, phyloP30way?: number | undefined, polyphen2HdivPrediction: Array<string>, polyphen2HdivScore: Array<number>, polyphen2HvarPrediction: Array<string>, polyphen2HvarScore: Array<number>, proveanPrediction: Array<string>, proveanScore: Array<number>, revelScore?: Array<number> | undefined, siftPrediction: Array<string>, siftScore: Array<number>, siphy?: number | undefined, snpeffSnpEffect: Array<string>, snpeffSnpImpact: Array<string> } | undefined };
 
 export type MyVariantInfoFieldsFragment = { __typename: 'MyVariantInfo', myVariantInfoId: string, caddConsequence: Array<string>, caddDetail: Array<string>, caddScore?: number | undefined, caddPhred?: number | undefined, clinvarClinicalSignificance: Array<string>, clinvarHgvsCoding: Array<string>, clinvarHgvsGenomic: Array<string>, clinvarHgvsNonCoding: Array<string>, clinvarHgvsProtein: Array<string>, clinvarId?: number | undefined, clinvarOmim?: string | undefined, cosmicId?: string | undefined, dbnsfpInterproDomain: Array<string>, dbsnpRsid?: string | undefined, eglClass?: string | undefined, eglHgvs: Array<string>, eglProtein?: string | undefined, eglTranscript?: string | undefined, exacAlleleCount?: number | undefined, exacAlleleFrequency?: number | undefined, exacAlleleNumber?: number | undefined, fathmmMklPrediction?: string | undefined, fathmmMklScore?: number | undefined, fathmmPrediction: Array<string>, fathmmScore: Array<number>, fitconsScore?: number | undefined, gerp?: number | undefined, gnomadExomeAlleleCount?: number | undefined, gnomadExomeAlleleFrequency?: number | undefined, gnomadExomeAlleleNumber?: number | undefined, gnomadExomeFilter?: string | undefined, gnomadGenomeAlleleCount?: number | undefined, gnomadGenomeAlleleFrequency?: number | undefined, gnomadGenomeAlleleNumber?: number | undefined, gnomadGenomeFilter?: string | undefined, lrtPrediction?: string | undefined, lrtScore?: number | undefined, metalrPrediction?: string | undefined, metalrScore?: number | undefined, metasvmPrediction?: string | undefined, metasvmScore?: number | undefined, mutationassessorPrediction: Array<string>, mutationassessorScore: Array<number>, mutationtasterPrediction: Array<string>, mutationtasterScore: Array<number>, phastcons100way?: number | undefined, phastcons30way?: number | undefined, phyloP100way?: number | undefined, phyloP30way?: number | undefined, polyphen2HdivPrediction: Array<string>, polyphen2HdivScore: Array<number>, polyphen2HvarPrediction: Array<string>, polyphen2HvarScore: Array<number>, proveanPrediction: Array<string>, proveanScore: Array<number>, revelScore?: Array<number> | undefined, siftPrediction: Array<string>, siftScore: Array<number>, siphy?: number | undefined, snpeffSnpEffect: Array<string>, snpeffSnpImpact: Array<string> };
 
@@ -9266,33 +9595,37 @@ export const VariantTypeBrowseTableRowFieldsFragmentDoc = gql`
 }
     `;
 export const CoordinatesCardFieldsFragmentDoc = gql`
-    fragment CoordinatesCardFields on Variant {
+    fragment CoordinatesCardFields on VariantInterface {
   id
   name
-  referenceBuild
-  ensemblVersion
-  primaryCoordinates {
-    representativeTranscript
-    chromosome
-    start
-    stop
-  }
-  secondaryCoordinates {
-    representativeTranscript
-    chromosome
-    start
-    stop
+  ... on GeneVariant {
+    referenceBuild
+    ensemblVersion
+    primaryCoordinates {
+      representativeTranscript
+      chromosome
+      start
+      stop
+    }
+    secondaryCoordinates {
+      representativeTranscript
+      chromosome
+      start
+      stop
+    }
+    referenceBases
+    variantBases
   }
-  referenceBases
-  variantBases
 }
     `;
 export const VariantPopoverFieldsFragmentDoc = gql`
-    fragment variantPopoverFields on Variant {
+    fragment variantPopoverFields on VariantInterface {
   id
   name
   variantAliases
-  alleleRegistryId
+  ... on GeneVariant {
+    alleleRegistryId
+  }
   feature {
     id
     name
@@ -9320,7 +9653,7 @@ export const MenuVariantTypeFragmentDoc = gql`
 }
     `;
 export const MenuVariantFragmentDoc = gql`
-    fragment menuVariant on Variant {
+    fragment menuVariant on VariantInterface {
   id
   name
   link
@@ -9558,20 +9891,6 @@ export const RevisableGeneFieldsFragmentDoc = gql`
   }
 }
     `;
-export const RevisableMolecularProfileFieldsFragmentDoc = gql`
-    fragment RevisableMolecularProfileFields on MolecularProfile {
-  id
-  description
-  sources {
-    id
-    sourceType
-    citation
-    citationId
-  }
-  molecularProfileAliases
-  isComplex
-}
-    `;
 export const CoordinateFieldsFragmentDoc = gql`
     fragment CoordinateFields on Coordinate {
   chromosome
@@ -9580,9 +9899,8 @@ export const CoordinateFieldsFragmentDoc = gql`
   stop
 }
     `;
-export const RevisableVariantFieldsFragmentDoc = gql`
-    fragment RevisableVariantFields on Variant {
-  id
+export const RevisableGeneVariantFieldsFragmentDoc = gql`
+    fragment RevisableGeneVariantFields on GeneVariant {
   name
   feature {
     id
@@ -9609,6 +9927,20 @@ export const RevisableVariantFieldsFragmentDoc = gql`
   variantBases
 }
     ${CoordinateFieldsFragmentDoc}`;
+export const RevisableMolecularProfileFieldsFragmentDoc = gql`
+    fragment RevisableMolecularProfileFields on MolecularProfile {
+  id
+  description
+  sources {
+    id
+    sourceType
+    citation
+    citationId
+  }
+  molecularProfileAliases
+  isComplex
+}
+    `;
 export const VariantGroupRevisableFieldsFragmentDoc = gql`
     fragment VariantGroupRevisableFields on VariantGroup {
   id
@@ -9907,7 +10239,7 @@ export const VariantManagerFieldsFragmentDoc = gql`
 }
     `;
 export const VariantSelectTypeaheadFieldsFragmentDoc = gql`
-    fragment VariantSelectTypeaheadFields on Variant {
+    fragment VariantSelectTypeaheadFields on VariantInterface {
   id
   name
   link
@@ -10321,8 +10653,107 @@ export const MolecularProfileDetailFieldsFragmentDoc = gql`
   }
 }
     ${ParsedCommentFragmentFragmentDoc}`;
+export const MyVariantInfoFieldsFragmentDoc = gql`
+    fragment MyVariantInfoFields on MyVariantInfo {
+  myVariantInfoId
+  caddConsequence
+  caddDetail
+  caddScore
+  caddPhred
+  clinvarClinicalSignificance
+  clinvarHgvsCoding
+  clinvarHgvsGenomic
+  clinvarHgvsNonCoding
+  clinvarHgvsProtein
+  clinvarId
+  clinvarOmim
+  cosmicId
+  dbnsfpInterproDomain
+  dbsnpRsid
+  eglClass
+  eglHgvs
+  eglProtein
+  eglTranscript
+  exacAlleleCount
+  exacAlleleFrequency
+  exacAlleleNumber
+  fathmmMklPrediction
+  fathmmMklScore
+  fathmmPrediction
+  fathmmScore
+  fitconsScore
+  gerp
+  gnomadExomeAlleleCount
+  gnomadExomeAlleleFrequency
+  gnomadExomeAlleleNumber
+  gnomadExomeFilter
+  gnomadGenomeAlleleCount
+  gnomadGenomeAlleleFrequency
+  gnomadGenomeAlleleNumber
+  gnomadGenomeFilter
+  lrtPrediction
+  lrtScore
+  metalrPrediction
+  metalrScore
+  metasvmPrediction
+  metasvmScore
+  mutationassessorPrediction
+  mutationassessorScore
+  mutationtasterPrediction
+  mutationtasterScore
+  phastcons100way
+  phastcons30way
+  phyloP100way
+  phyloP30way
+  polyphen2HdivPrediction
+  polyphen2HdivScore
+  polyphen2HvarPrediction
+  polyphen2HvarScore
+  proveanPrediction
+  proveanScore
+  revelScore
+  siftPrediction
+  siftScore
+  siphy
+  snpeffSnpEffect
+  snpeffSnpImpact
+}
+    `;
+export const GeneVariantSummaryFieldsFragmentDoc = gql`
+    fragment GeneVariantSummaryFields on GeneVariant {
+  alleleRegistryId
+  openCravatUrl
+  maneSelectTranscript
+  hgvsDescriptions
+  clinvarIds
+  referenceBuild
+  ensemblVersion
+  primaryCoordinates {
+    representativeTranscript
+    chromosome
+    start
+    stop
+  }
+  secondaryCoordinates {
+    representativeTranscript
+    chromosome
+    start
+    stop
+  }
+  referenceBases
+  variantBases
+  myVariantInfo {
+    ...MyVariantInfoFields
+  }
+}
+    ${MyVariantInfoFieldsFragmentDoc}`;
+export const FactorVariantSummaryFieldsFragmentDoc = gql`
+    fragment FactorVariantSummaryFields on FactorVariant {
+  ncitId
+}
+    `;
 export const VariantMolecularProfileCardFieldsFragmentDoc = gql`
-    fragment VariantMolecularProfileCardFields on Variant {
+    fragment VariantMolecularProfileCardFields on VariantInterface {
   id
   name
   link
@@ -10340,35 +10771,22 @@ export const VariantMolecularProfileCardFieldsFragmentDoc = gql`
       deprecated
     }
   }
+  ... on GeneVariant {
+    ...GeneVariantSummaryFields
+  }
+  ... on FactorVariant {
+    ...FactorVariantSummaryFields
+  }
   variantAliases
-  clinvarIds
-  alleleRegistryId
-  openCravatUrl
   variantTypes {
     id
     link
     soid
     name
   }
-  referenceBuild
-  ensemblVersion
-  primaryCoordinates {
-    representativeTranscript
-    chromosome
-    start
-    stop
-  }
-  secondaryCoordinates {
-    representativeTranscript
-    chromosome
-    start
-    stop
-  }
-  referenceBases
-  variantBases
-  hgvsDescriptions
 }
-    `;
+    ${GeneVariantSummaryFieldsFragmentDoc}
+${FactorVariantSummaryFieldsFragmentDoc}`;
 export const MolecularProfileSummaryFieldsFragmentDoc = gql`
     fragment MolecularProfileSummaryFields on MolecularProfile {
   id
@@ -10774,7 +11192,7 @@ export const VariantGroupSummaryFieldsFragmentDoc = gql`
 }
     `;
 export const VariantDetailFieldsFragmentDoc = gql`
-    fragment VariantDetailFields on Variant {
+    fragment VariantDetailFields on VariantInterface {
   id
   name
   deprecated
@@ -10801,74 +11219,8 @@ export const VariantDetailFieldsFragmentDoc = gql`
   }
 }
     ${ParsedCommentFragmentFragmentDoc}`;
-export const MyVariantInfoFieldsFragmentDoc = gql`
-    fragment MyVariantInfoFields on MyVariantInfo {
-  myVariantInfoId
-  caddConsequence
-  caddDetail
-  caddScore
-  caddPhred
-  clinvarClinicalSignificance
-  clinvarHgvsCoding
-  clinvarHgvsGenomic
-  clinvarHgvsNonCoding
-  clinvarHgvsProtein
-  clinvarId
-  clinvarOmim
-  cosmicId
-  dbnsfpInterproDomain
-  dbsnpRsid
-  eglClass
-  eglHgvs
-  eglProtein
-  eglTranscript
-  exacAlleleCount
-  exacAlleleFrequency
-  exacAlleleNumber
-  fathmmMklPrediction
-  fathmmMklScore
-  fathmmPrediction
-  fathmmScore
-  fitconsScore
-  gerp
-  gnomadExomeAlleleCount
-  gnomadExomeAlleleFrequency
-  gnomadExomeAlleleNumber
-  gnomadExomeFilter
-  gnomadGenomeAlleleCount
-  gnomadGenomeAlleleFrequency
-  gnomadGenomeAlleleNumber
-  gnomadGenomeFilter
-  lrtPrediction
-  lrtScore
-  metalrPrediction
-  metalrScore
-  metasvmPrediction
-  metasvmScore
-  mutationassessorPrediction
-  mutationassessorScore
-  mutationtasterPrediction
-  mutationtasterScore
-  phastcons100way
-  phastcons30way
-  phyloP100way
-  phyloP30way
-  polyphen2HdivPrediction
-  polyphen2HdivScore
-  polyphen2HvarPrediction
-  polyphen2HvarScore
-  proveanPrediction
-  proveanScore
-  revelScore
-  siftPrediction
-  siftScore
-  siphy
-  snpeffSnpEffect
-  snpeffSnpImpact
-}
-    `;
 export const VariantSummaryFieldsFragmentDoc = gql`
-    fragment VariantSummaryFields on Variant {
+    fragment VariantSummaryFields on VariantInterface {
   id
   name
   feature {
@@ -10878,33 +11230,12 @@ export const VariantSummaryFieldsFragmentDoc = gql`
     link
   }
   variantAliases
-  alleleRegistryId
-  openCravatUrl
-  maneSelectTranscript
   variantTypes {
     id
     link
     soid
     name
   }
-  hgvsDescriptions
-  clinvarIds
-  referenceBuild
-  ensemblVersion
-  primaryCoordinates {
-    representativeTranscript
-    chromosome
-    start
-    stop
-  }
-  secondaryCoordinates {
-    representativeTranscript
-    chromosome
-    start
-    stop
-  }
-  referenceBases
-  variantBases
   flags(state: OPEN) {
     totalCount
   }
@@ -10914,9 +11245,6 @@ export const VariantSummaryFieldsFragmentDoc = gql`
   comments {
     totalCount
   }
-  myVariantInfo {
-    ...MyVariantInfoFields
-  }
   lastSubmittedRevisionEvent {
     originatingUser {
       id
@@ -10951,8 +11279,15 @@ export const VariantSummaryFieldsFragmentDoc = gql`
     }
     createdAt
   }
+  ... on GeneVariant {
+    ...GeneVariantSummaryFields
+  }
+  ... on FactorVariant {
+    ...FactorVariantSummaryFields
+  }
 }
-    ${MyVariantInfoFieldsFragmentDoc}`;
+    ${GeneVariantSummaryFieldsFragmentDoc}
+${FactorVariantSummaryFieldsFragmentDoc}`;
 export const ActivityCardDocument = gql`
     query ActivityCard($activityId: Int!) {
   activity(id: $activityId) {
@@ -10972,7 +11307,7 @@ export const ActivityCardDocument = gql`
     }
   }
 export const ActivityFeedDocument = gql`
-    query ActivityFeed($first: Int, $last: Int, $before: String, $after: String, $userId: Int) {
+    query ActivityFeed($first: Int, $last: Int, $before: String, $after: String, $userId: [Int!]) {
   activities(
     first: $first
     last: $last
@@ -12779,11 +13114,8 @@ export const VariantsMenuDocument = gql`
       hasPreviousPage
       hasNextPage
     }
-    edges {
-      cursor
-      node {
-        ...menuVariant
-      }
+    nodes {
+      ...menuVariant
     }
   }
 }
@@ -13593,6 +13925,53 @@ export const SuggestGeneRevisionDocument = gql`
   export class SuggestGeneRevisionGQL extends Apollo.Mutation<SuggestGeneRevisionMutation, SuggestGeneRevisionMutationVariables> {
     document = SuggestGeneRevisionDocument;
     
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
+export const GeneVariantRevisableFieldsDocument = gql`
+    query GeneVariantRevisableFields($variantId: Int!) {
+  variant(id: $variantId) {
+    id
+    ... on GeneVariant {
+      ...RevisableGeneVariantFields
+    }
+  }
+}
+    ${RevisableGeneVariantFieldsFragmentDoc}`;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class GeneVariantRevisableFieldsGQL extends Apollo.Query<GeneVariantRevisableFieldsQuery, GeneVariantRevisableFieldsQueryVariables> {
+    document = GeneVariantRevisableFieldsDocument;
+    
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
+export const SuggestGeneVariantRevisionDocument = gql`
+    mutation SuggestGeneVariantRevision($input: SuggestGeneVariantRevisionInput!) {
+  suggestGeneVariantRevision(input: $input) {
+    clientMutationId
+    variant {
+      id
+    }
+    results {
+      id
+      fieldName
+      newlyCreated
+    }
+  }
+}
+    `;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class SuggestGeneVariantRevisionGQL extends Apollo.Mutation<SuggestGeneVariantRevisionMutation, SuggestGeneVariantRevisionMutationVariables> {
+    document = SuggestGeneVariantRevisionDocument;
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -13679,50 +14058,6 @@ export const SourceSuggestionChecksDocument = gql`
   export class SourceSuggestionChecksGQL extends Apollo.Query<SourceSuggestionChecksQuery, SourceSuggestionChecksQueryVariables> {
     document = SourceSuggestionChecksDocument;
     
-    constructor(apollo: Apollo.Apollo) {
-      super(apollo);
-    }
-  }
-export const VariantRevisableFieldsDocument = gql`
-    query VariantRevisableFields($variantId: Int!) {
-  variant(id: $variantId) {
-    ...RevisableVariantFields
-  }
-}
-    ${RevisableVariantFieldsFragmentDoc}`;
-
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class VariantRevisableFieldsGQL extends Apollo.Query<VariantRevisableFieldsQuery, VariantRevisableFieldsQueryVariables> {
-    document = VariantRevisableFieldsDocument;
-    
-    constructor(apollo: Apollo.Apollo) {
-      super(apollo);
-    }
-  }
-export const SuggestVariantRevisionDocument = gql`
-    mutation SuggestVariantRevision($input: SuggestVariantRevisionInput!) {
-  suggestVariantRevision(input: $input) {
-    clientMutationId
-    variant {
-      id
-    }
-    results {
-      id
-      fieldName
-      newlyCreated
-    }
-  }
-}
-    `;
-
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class SuggestVariantRevisionGQL extends Apollo.Mutation<SuggestVariantRevisionMutation, SuggestVariantRevisionMutationVariables> {
-    document = SuggestVariantRevisionDocument;
-    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
diff --git a/client/src/app/generated/civic.possible-types.ts b/client/src/app/generated/civic.possible-types.ts
index 25cd0d9d1..700cc5897 100644
--- a/client/src/app/generated/civic.possible-types.ts
+++ b/client/src/app/generated/civic.possible-types.ts
@@ -35,9 +35,11 @@
       "Assertion",
       "EvidenceItem",
       "Factor",
+      "FactorVariant",
       "Feature",
       "Flag",
       "Gene",
+      "GeneVariant",
       "MolecularProfile",
       "Revision",
       "Source",
@@ -50,9 +52,11 @@
       "Comment",
       "EvidenceItem",
       "Factor",
+      "FactorVariant",
       "Feature",
       "Flag",
       "Gene",
+      "GeneVariant",
       "MolecularProfile",
       "Revision",
       "SourceSuggestion",
@@ -62,9 +66,11 @@
       "Assertion",
       "EvidenceItem",
       "Factor",
+      "FactorVariant",
       "Feature",
       "Flag",
       "Gene",
+      "GeneVariant",
       "MolecularProfile",
       "Revision",
       "RevisionSet",
@@ -83,8 +89,10 @@
       "BrowseFeature",
       "EvidenceItem",
       "Factor",
+      "FactorVariant",
       "Feature",
       "Gene",
+      "GeneVariant",
       "MolecularProfile",
       "Variant",
       "VariantGroup"
@@ -99,8 +107,10 @@
     ],
     "MolecularProfileComponent": [
       "Factor",
+      "FactorVariant",
       "Feature",
       "Gene",
+      "GeneVariant",
       "Variant"
     ],
     "MolecularProfileSegment": [
@@ -108,12 +118,19 @@
       "MolecularProfileTextSegment",
       "Variant"
     ],
+    "VariantInterface": [
+      "FactorVariant",
+      "GeneVariant",
+      "Variant"
+    ],
     "WithRevisions": [
       "Assertion",
       "EvidenceItem",
       "Factor",
+      "FactorVariant",
       "Feature",
       "Gene",
+      "GeneVariant",
       "MolecularProfile",
       "Variant",
       "VariantGroup"
diff --git a/client/src/app/generated/server.model.graphql b/client/src/app/generated/server.model.graphql
index 25798a20d..b1a0f2445 100644
--- a/client/src/app/generated/server.model.graphql
+++ b/client/src/app/generated/server.model.graphql
@@ -2018,7 +2018,7 @@ type CreateVariantPayload {
   """
   The newly created Variant.
   """
-  variant: Variant!
+  variant: VariantInterface!
 }
 
 """
@@ -2127,7 +2127,7 @@ type DeprecateFeatureActivity implements ActivityInterface {
   parsedNote: [CommentBodySegment!]!
   subject: EventSubject!
   user: User!
-  variants: [Variant!]!
+  variants: [VariantInterface!]!
   verbiage: String!
 }
 
@@ -2187,7 +2187,7 @@ type DeprecateFeaturePayload {
   """
   The variants linked to this feature that are newly deprecated.
   """
-  newlyDeprecatedVariants: [Variant!]
+  newlyDeprecatedVariants: [VariantInterface!]
 }
 
 type DeprecateVariantActivity implements ActivityInterface {
@@ -2254,7 +2254,7 @@ type DeprecateVariantPayload {
   """
   The deprecated Variant.
   """
-  variant: Variant
+  variant: VariantInterface
 }
 
 type Disease {
@@ -3219,7 +3219,7 @@ type Factor implements Commentable & EventOriginObject & EventSubject & Flaggabl
     Left anchored filtering for variant name and aliases.
     """
     name: String
-  ): VariantConnection!
+  ): VariantInterfaceConnection!
 }
 
 """
@@ -3257,6 +3257,224 @@ input FactorFields {
   sourceIds: [Int!]!
 }
 
+type FactorVariant implements Commentable & EventOriginObject & EventSubject & Flaggable & MolecularProfileComponent & VariantInterface & WithRevisions {
+  """
+  List and filter comments.
+  """
+  comments(
+    """
+    Returns the elements in the list that come after the specified cursor.
+    """
+    after: String
+
+    """
+    Returns the elements in the list that come before the specified cursor.
+    """
+    before: String
+
+    """
+    Returns the first _n_ elements from the list.
+    """
+    first: Int
+
+    """
+    Returns the last _n_ elements from the list.
+    """
+    last: Int
+
+    """
+    Limit to comments that mention a certain entity
+    """
+    mentionedEntity: TaggableEntityInput
+
+    """
+    Limit to comments that mention a certain user role
+    """
+    mentionedRole: UserRole
+
+    """
+    Limit to comments that mention a certain user
+    """
+    mentionedUserId: Int
+
+    """
+    Limit to comments by a certain user
+    """
+    originatingUserId: Int
+
+    """
+    Sort order for the comments. Defaults to most recent.
+    """
+    sortBy: DateSort
+  ): CommentConnection!
+  creationActivity: CreateVariantActivity
+  deprecated: Boolean!
+  deprecationActivity: DeprecateVariantActivity
+  deprecationReason: VariantDeprecationReason
+
+  """
+  List and filter events for an object
+  """
+  events(
+    """
+    Returns the elements in the list that come after the specified cursor.
+    """
+    after: String
+
+    """
+    Returns the elements in the list that come before the specified cursor.
+    """
+    before: String
+    eventType: EventAction
+
+    """
+    Returns the first _n_ elements from the list.
+    """
+    first: Int
+
+    """
+    Returns the last _n_ elements from the list.
+    """
+    last: Int
+    organizationId: Int
+    originatingUserId: Int
+
+    """
+    Sort order for the events. Defaults to most recent.
+    """
+    sortBy: DateSort
+  ): EventConnection!
+  feature: Feature!
+  flagged: Boolean!
+
+  """
+  List and filter flags.
+  """
+  flags(
+    """
+    Returns the elements in the list that come after the specified cursor.
+    """
+    after: String
+
+    """
+    Returns the elements in the list that come before the specified cursor.
+    """
+    before: String
+
+    """
+    Returns the first _n_ elements from the list.
+    """
+    first: Int
+
+    """
+    Limit to flags added by a certain user
+    """
+    flaggingUserId: Int
+
+    """
+    Returns the last _n_ elements from the list.
+    """
+    last: Int
+
+    """
+    Limit to flags resolved by a certain user
+    """
+    resolvingUserId: Int
+
+    """
+    Sort order for the flags. Defaults to most recent.
+    """
+    sortBy: DateSort
+
+    """
+    Limit to flags in a particular state
+    """
+    state: FlagState
+  ): FlagConnection!
+  id: Int!
+  lastAcceptedRevisionEvent: Event
+  lastCommentEvent: Event
+  lastSubmittedRevisionEvent: Event
+  link: String!
+  molecularProfiles(
+    """
+    Returns the elements in the list that come after the specified cursor.
+    """
+    after: String
+
+    """
+    Returns the elements in the list that come before the specified cursor.
+    """
+    before: String
+
+    """
+    Returns the first _n_ elements from the list.
+    """
+    first: Int
+
+    """
+    Returns the last _n_ elements from the list.
+    """
+    last: Int
+  ): MolecularProfileConnection!
+  name: String!
+  ncitId: String
+
+  """
+  List and filter revisions.
+  """
+  revisions(
+    """
+    Returns the elements in the list that come after the specified cursor.
+    """
+    after: String
+
+    """
+    Returns the elements in the list that come before the specified cursor.
+    """
+    before: String
+
+    """
+    Limit to revisions on a particular field.
+    """
+    fieldName: String
+
+    """
+    Returns the first _n_ elements from the list.
+    """
+    first: Int
+
+    """
+    Returns the last _n_ elements from the list.
+    """
+    last: Int
+
+    """
+    Limit to revisions by a certain user
+    """
+    originatingUserId: Int
+
+    """
+    Limit to revisions suggested as part of a single Revision Set.
+    """
+    revisionSetId: Int
+
+    """
+    Sort order for the comments. Defaults to most recent.
+    """
+    sortBy: DateSort
+
+    """
+    Limit to revisions with a certain status
+    """
+    status: RevisionStatus
+  ): RevisionConnection!
+  singleVariantMolecularProfile: MolecularProfile!
+  singleVariantMolecularProfileId: Int!
+  variantAliases: [String!]!
+  variantTypes: [VariantType!]!
+}
+
 type FdaCode {
   code: String!
   description: String!
@@ -3488,7 +3706,7 @@ type Feature implements Commentable & EventOriginObject & EventSubject & Flaggab
     Left anchored filtering for variant name and aliases.
     """
     name: String
-  ): VariantConnection!
+  ): VariantInterfaceConnection!
 }
 
 enum FeatureDeprecationReason {
@@ -4075,7 +4293,7 @@ type Gene implements Commentable & EventOriginObject & EventSubject & Flaggable
     Left anchored filtering for variant name and aliases.
     """
     name: String
-  ): VariantConnection!
+  ): VariantInterfaceConnection!
 }
 
 """
@@ -4150,38 +4368,14 @@ input GeneSearchFilter {
   subFilters: [GeneSearchFilter!]
 }
 
-"""
-An ISO 8601-encoded datetime
-"""
-scalar ISO8601DateTime @specifiedBy(url: "https://tools.ietf.org/html/rfc3339")
-
-input IntSearchInput {
-  comparisonOperator: IntSearchOperator!
-  value: Int!
-}
+type GeneVariant implements Commentable & EventOriginObject & EventSubject & Flaggable & MolecularProfileComponent & VariantInterface & WithRevisions {
+  alleleRegistryId: String
+  clinvarIds: [String!]!
 
-enum IntSearchOperator {
   """
-  Equal To
+  List and filter comments.
   """
-  EQ
-  GE
-  GT
-  LE
-  LT
-  NE
-}
-
-"""
-Represents untyped JSON
-"""
-scalar JSON
-
-type LeaderboardOrganization {
-  actionCount: Int!
-  description: String!
-  eventCount: Int!
-  events(
+  comments(
     """
     Returns the elements in the list that come after the specified cursor.
     """
@@ -4201,12 +4395,331 @@ type LeaderboardOrganization {
     Returns the last _n_ elements from the list.
     """
     last: Int
-  ): EventConnection!
-  id: Int!
-  memberCount: Int!
-  members(
+
     """
-    Returns the elements in the list that come after the specified cursor.
+    Limit to comments that mention a certain entity
+    """
+    mentionedEntity: TaggableEntityInput
+
+    """
+    Limit to comments that mention a certain user role
+    """
+    mentionedRole: UserRole
+
+    """
+    Limit to comments that mention a certain user
+    """
+    mentionedUserId: Int
+
+    """
+    Limit to comments by a certain user
+    """
+    originatingUserId: Int
+
+    """
+    Sort order for the comments. Defaults to most recent.
+    """
+    sortBy: DateSort
+  ): CommentConnection!
+  creationActivity: CreateVariantActivity
+  deprecated: Boolean!
+  deprecationActivity: DeprecateVariantActivity
+  deprecationReason: VariantDeprecationReason
+  ensemblVersion: Int
+
+  """
+  List and filter events for an object
+  """
+  events(
+    """
+    Returns the elements in the list that come after the specified cursor.
+    """
+    after: String
+
+    """
+    Returns the elements in the list that come before the specified cursor.
+    """
+    before: String
+    eventType: EventAction
+
+    """
+    Returns the first _n_ elements from the list.
+    """
+    first: Int
+
+    """
+    Returns the last _n_ elements from the list.
+    """
+    last: Int
+    organizationId: Int
+    originatingUserId: Int
+
+    """
+    Sort order for the events. Defaults to most recent.
+    """
+    sortBy: DateSort
+  ): EventConnection!
+  feature: Feature!
+  flagged: Boolean!
+
+  """
+  List and filter flags.
+  """
+  flags(
+    """
+    Returns the elements in the list that come after the specified cursor.
+    """
+    after: String
+
+    """
+    Returns the elements in the list that come before the specified cursor.
+    """
+    before: String
+
+    """
+    Returns the first _n_ elements from the list.
+    """
+    first: Int
+
+    """
+    Limit to flags added by a certain user
+    """
+    flaggingUserId: Int
+
+    """
+    Returns the last _n_ elements from the list.
+    """
+    last: Int
+
+    """
+    Limit to flags resolved by a certain user
+    """
+    resolvingUserId: Int
+
+    """
+    Sort order for the flags. Defaults to most recent.
+    """
+    sortBy: DateSort
+
+    """
+    Limit to flags in a particular state
+    """
+    state: FlagState
+  ): FlagConnection!
+  hgvsDescriptions: [String!]!
+  id: Int!
+  lastAcceptedRevisionEvent: Event
+  lastCommentEvent: Event
+  lastSubmittedRevisionEvent: Event
+  link: String!
+  maneSelectTranscript: String
+  molecularProfiles(
+    """
+    Returns the elements in the list that come after the specified cursor.
+    """
+    after: String
+
+    """
+    Returns the elements in the list that come before the specified cursor.
+    """
+    before: String
+
+    """
+    Returns the first _n_ elements from the list.
+    """
+    first: Int
+
+    """
+    Returns the last _n_ elements from the list.
+    """
+    last: Int
+  ): MolecularProfileConnection!
+  myVariantInfo: MyVariantInfo
+  name: String!
+  openCravatUrl: String
+  primaryCoordinates: Coordinate
+  referenceBases: String
+  referenceBuild: ReferenceBuild
+
+  """
+  List and filter revisions.
+  """
+  revisions(
+    """
+    Returns the elements in the list that come after the specified cursor.
+    """
+    after: String
+
+    """
+    Returns the elements in the list that come before the specified cursor.
+    """
+    before: String
+
+    """
+    Limit to revisions on a particular field.
+    """
+    fieldName: String
+
+    """
+    Returns the first _n_ elements from the list.
+    """
+    first: Int
+
+    """
+    Returns the last _n_ elements from the list.
+    """
+    last: Int
+
+    """
+    Limit to revisions by a certain user
+    """
+    originatingUserId: Int
+
+    """
+    Limit to revisions suggested as part of a single Revision Set.
+    """
+    revisionSetId: Int
+
+    """
+    Sort order for the comments. Defaults to most recent.
+    """
+    sortBy: DateSort
+
+    """
+    Limit to revisions with a certain status
+    """
+    status: RevisionStatus
+  ): RevisionConnection!
+  secondaryCoordinates: Coordinate
+  singleVariantMolecularProfile: MolecularProfile!
+  singleVariantMolecularProfileId: Int!
+  variantAliases: [String!]!
+  variantBases: String
+  variantTypes: [VariantType!]!
+}
+
+"""
+Fields on a GeneVariant that curators may propose revisions to.
+"""
+input GeneVariantFields {
+  """
+  List of aliases or alternate names for the Variant.
+  """
+  aliases: [String!]!
+
+  """
+  List of ClinVar IDs for the Variant.
+  """
+  clinvarIds: ClinvarInput!
+
+  """
+  The Ensembl database version.
+  """
+  ensemblVersion: NullableIntInput!
+
+  """
+  The ID of the Feature this Variant corresponds to.
+  """
+  featureId: Int!
+
+  """
+  List of HGVS descriptions for the Variant.
+  """
+  hgvsDescriptions: [String!]!
+
+  """
+  The Variant's name.
+  """
+  name: String!
+
+  """
+  The primary coordinates for this Variant. In the case of Fusions this will be the coordinates of the 5' partner.
+  """
+  primaryCoordinates: CoordinateInput!
+
+  """
+  Reference bases for this variant
+  """
+  referenceBases: NullableStringInput!
+
+  """
+  The reference build for the genomic coordinates of this Variant.
+  """
+  referenceBuild: NullableReferenceBuildTypeInput!
+
+  """
+  In the case of Fusions these will be the coordinates of the 3' partner, otherwise set the values to null.
+  """
+  secondaryCoordinates: CoordinateInput!
+
+  """
+  Variant bases for this variant
+  """
+  variantBases: NullableStringInput!
+
+  """
+  List of IDs for the variant types for this Variant
+  """
+  variantTypeIds: [Int!]!
+}
+
+"""
+An ISO 8601-encoded datetime
+"""
+scalar ISO8601DateTime @specifiedBy(url: "https://tools.ietf.org/html/rfc3339")
+
+input IntSearchInput {
+  comparisonOperator: IntSearchOperator!
+  value: Int!
+}
+
+enum IntSearchOperator {
+  """
+  Equal To
+  """
+  EQ
+  GE
+  GT
+  LE
+  LT
+  NE
+}
+
+"""
+Represents untyped JSON
+"""
+scalar JSON
+
+type LeaderboardOrganization {
+  actionCount: Int!
+  description: String!
+  eventCount: Int!
+  events(
+    """
+    Returns the elements in the list that come after the specified cursor.
+    """
+    after: String
+
+    """
+    Returns the elements in the list that come before the specified cursor.
+    """
+    before: String
+
+    """
+    Returns the first _n_ elements from the list.
+    """
+    first: Int
+
+    """
+    Returns the last _n_ elements from the list.
+    """
+    last: Int
+  ): EventConnection!
+  id: Int!
+  memberCount: Int!
+  members(
+    """
+    Returns the elements in the list that come after the specified cursor.
     """
     after: String
 
@@ -4700,7 +5213,7 @@ type MolecularProfile implements Commentable & EventOriginObject & EventSubject
   complexMolecularProfileCreationActivity: CreateComplexMolecularProfileActivity
   complexMolecularProfileDeprecationActivity: DeprecateComplexMolecularProfileActivity
   deprecated: Boolean!
-  deprecatedVariants: [Variant!]!
+  deprecatedVariants: [VariantInterface!]!
   deprecationReason: MolecularProfileDeprecationReason
   description: String
 
@@ -4890,7 +5403,7 @@ type MolecularProfile implements Commentable & EventOriginObject & EventSubject
   """
   The collection of variants included in this molecular profile. Please note the name for their relation to each other.
   """
-  variants: [Variant!]!
+  variants: [VariantInterface!]!
 }
 
 type MolecularProfileAlias {
@@ -5024,7 +5537,7 @@ input MolecularProfileFields {
 }
 
 type MolecularProfileNamePreview {
-  deprecatedVariants: [Variant!]!
+  deprecatedVariants: [VariantInterface!]!
 
   """
   The already existing MP matching this name, if it exists
@@ -5324,6 +5837,16 @@ type Mutation {
     input: SuggestGeneRevisionInput!
   ): SuggestGeneRevisionPayload
 
+  """
+  Suggest a Revision to a Variant entity.
+  """
+  suggestGeneVariantRevision(
+    """
+    Parameters for SuggestGeneVariantRevision
+    """
+    input: SuggestGeneVariantRevisionInput!
+  ): SuggestGeneVariantRevisionPayload
+
   """
   Suggest a Revision to a MolecularProfile entity.
   """
@@ -5354,16 +5877,6 @@ type Mutation {
     input: SuggestVariantGroupRevisionInput!
   ): SuggestVariantGroupRevisionPayload
 
-  """
-  Suggest a Revision to a Variant entity.
-  """
-  suggestVariantRevision(
-    """
-    Parameters for SuggestVariantRevision
-    """
-    input: SuggestVariantRevisionInput!
-  ): SuggestVariantRevisionPayload
-
   """
   Unsubscribe from a CIViC entity to stop receiving notifications about it.
   """
@@ -7334,7 +7847,7 @@ type Query {
   """
   Find a variant by CIViC ID
   """
-  variant(id: Int!): Variant
+  variant(id: Int!): VariantInterface
 
   """
   Find a variant group by CIViC ID
@@ -7485,7 +7998,7 @@ type Query {
     A list of CIViC identifiers for variant types
     """
     variantTypeIds: [Int!]
-  ): VariantConnection!
+  ): VariantInterfaceConnection!
   viewer: User
 }
 
@@ -8798,6 +9311,64 @@ type SuggestGeneRevisionPayload {
   results: [RevisionResult!]!
 }
 
+"""
+Autogenerated input type of SuggestGeneVariantRevision
+"""
+input SuggestGeneVariantRevisionInput {
+  """
+  A unique identifier for the client performing the mutation.
+  """
+  clientMutationId: String
+
+  """
+  Text describing the reason for the change. Will be attached to the Revision as a comment.
+  """
+  comment: String
+
+  """
+  The desired state of the Variant's editable fields if the change were applied.
+  If no change is desired for a particular field, pass in the current value of that field.
+  """
+  fields: GeneVariantFields!
+
+  """
+  The ID of the Variant to suggest a Revision to.
+  """
+  id: Int!
+
+  """
+  The ID of the organization to credit the user's contributions to.
+  If the user belongs to a single organization or no organizations, this field is not required.
+  This field is required if the user belongs to more than one organization.
+  The user must belong to the organization provided.
+  """
+  organizationId: Int
+}
+
+"""
+Autogenerated return type of SuggestGeneVariantRevision.
+"""
+type SuggestGeneVariantRevisionPayload {
+  """
+  A unique identifier for the client performing the mutation.
+  """
+  clientMutationId: String
+
+  """
+  A list of Revisions generated as a result of this suggestion.
+  If an existing Revision exactly matches the proposed one, it will be returned instead.
+  This is indicated via the 'newlyCreated' Boolean.
+  Revisions are stored on a per-field basis.
+  The changesetId can be used to group Revisions proposed at the same time.
+  """
+  results: [RevisionResult!]!
+
+  """
+  The Variant the user has proposed a Revision to.
+  """
+  variant: VariantInterface!
+}
+
 """
 Autogenerated input type of SuggestMolecularProfileRevision
 """
@@ -8905,61 +9476,7 @@ input SuggestSourceInput {
   """
   Internal CIViC ID for the applicable molecular profile, if any.
   """
-  molecularProfileId: Int
-
-  """
-  The ID of the organization to credit the user's contributions to.
-  If the user belongs to a single organization or no organizations, this field is not required.
-  This field is required if the user belongs to more than one organization.
-  The user must belong to the organization provided.
-  """
-  organizationId: Int
-
-  """
-  Internal CIViC ID for the source to suggest. Use the AddRemoteCitation mutation to populate this if needed.
-  """
-  sourceId: Int!
-}
-
-"""
-Autogenerated return type of SuggestSource.
-"""
-type SuggestSourcePayload {
-  """
-  A unique identifier for the client performing the mutation.
-  """
-  clientMutationId: String
-
-  """
-  The newly created Source Suggestion
-  """
-  sourceSuggestion: SourceSuggestion!
-}
-
-"""
-Autogenerated input type of SuggestVariantGroupRevision
-"""
-input SuggestVariantGroupRevisionInput {
-  """
-  A unique identifier for the client performing the mutation.
-  """
-  clientMutationId: String
-
-  """
-  Text describing the reason for the change. Will be attached to the Revision as a comment.
-  """
-  comment: String!
-
-  """
-  The desired state of the VariantGroup's editable fields if the change were applied.
-  If no change is desired for a particular field, pass in the current value of that field.
-  """
-  fields: VariantGroupFields!
-
-  """
-  The ID of the VariantGroup you are suggesting a Revision to
-  """
-  id: Int!
+  molecularProfileId: Int
 
   """
   The ID of the organization to credit the user's contributions to.
@@ -8968,36 +9485,32 @@ input SuggestVariantGroupRevisionInput {
   The user must belong to the organization provided.
   """
   organizationId: Int
+
+  """
+  Internal CIViC ID for the source to suggest. Use the AddRemoteCitation mutation to populate this if needed.
+  """
+  sourceId: Int!
 }
 
 """
-Autogenerated return type of SuggestVariantGroupRevision.
+Autogenerated return type of SuggestSource.
 """
-type SuggestVariantGroupRevisionPayload {
+type SuggestSourcePayload {
   """
   A unique identifier for the client performing the mutation.
   """
   clientMutationId: String
 
   """
-  A list of Revisions generated as a result of this suggestion.
-  If an existing Revision exactly matches the proposed one, it will be returned instead.
-  This is indicated via the 'newlyCreated' Boolean.
-  Revisions are stored on a per-field basis.
-  The changesetId can be used to group Revisions proposed at the same time.
-  """
-  results: [RevisionResult!]!
-
-  """
-  The VariantGroup the user has proposed a Revision to.
+  The newly created Source Suggestion
   """
-  variantGroup: VariantGroup!
+  sourceSuggestion: SourceSuggestion!
 }
 
 """
-Autogenerated input type of SuggestVariantRevision
+Autogenerated input type of SuggestVariantGroupRevision
 """
-input SuggestVariantRevisionInput {
+input SuggestVariantGroupRevisionInput {
   """
   A unique identifier for the client performing the mutation.
   """
@@ -9006,16 +9519,16 @@ input SuggestVariantRevisionInput {
   """
   Text describing the reason for the change. Will be attached to the Revision as a comment.
   """
-  comment: String
+  comment: String!
 
   """
-  The desired state of the Variant's editable fields if the change were applied.
+  The desired state of the VariantGroup's editable fields if the change were applied.
   If no change is desired for a particular field, pass in the current value of that field.
   """
-  fields: VariantFields!
+  fields: VariantGroupFields!
 
   """
-  The ID of the Variant to suggest a Revision to.
+  The ID of the VariantGroup you are suggesting a Revision to
   """
   id: Int!
 
@@ -9029,9 +9542,9 @@ input SuggestVariantRevisionInput {
 }
 
 """
-Autogenerated return type of SuggestVariantRevision.
+Autogenerated return type of SuggestVariantGroupRevision.
 """
-type SuggestVariantRevisionPayload {
+type SuggestVariantGroupRevisionPayload {
   """
   A unique identifier for the client performing the mutation.
   """
@@ -9047,9 +9560,9 @@ type SuggestVariantRevisionPayload {
   results: [RevisionResult!]!
 
   """
-  The Variant the user has proposed a Revision to.
+  The VariantGroup the user has proposed a Revision to.
   """
-  variant: Variant!
+  variantGroup: VariantGroup!
 }
 
 enum TaggableEntity {
@@ -9568,10 +10081,7 @@ type ValidationErrors {
   validationErrors: [FieldValidationError!]!
 }
 
-type Variant implements Commentable & EventOriginObject & EventSubject & Flaggable & MolecularProfileComponent & WithRevisions {
-  alleleRegistryId: String
-  clinvarIds: [String!]!
-
+type Variant implements Commentable & EventOriginObject & EventSubject & Flaggable & MolecularProfileComponent & VariantInterface & WithRevisions {
   """
   List and filter comments.
   """
@@ -9625,7 +10135,6 @@ type Variant implements Commentable & EventOriginObject & EventSubject & Flaggab
   deprecated: Boolean!
   deprecationActivity: DeprecateVariantActivity
   deprecationReason: VariantDeprecationReason
-  ensemblVersion: Int
 
   """
   List and filter events for an object
@@ -9706,13 +10215,11 @@ type Variant implements Commentable & EventOriginObject & EventSubject & Flaggab
     """
     state: FlagState
   ): FlagConnection!
-  hgvsDescriptions: [String!]!
   id: Int!
   lastAcceptedRevisionEvent: Event
   lastCommentEvent: Event
   lastSubmittedRevisionEvent: Event
   link: String!
-  maneSelectTranscript: String
   molecularProfiles(
     """
     Returns the elements in the list that come after the specified cursor.
@@ -9727,19 +10234,232 @@ type Variant implements Commentable & EventOriginObject & EventSubject & Flaggab
     """
     Returns the first _n_ elements from the list.
     """
-    first: Int
+    first: Int
+
+    """
+    Returns the last _n_ elements from the list.
+    """
+    last: Int
+  ): MolecularProfileConnection!
+  name: String!
+
+  """
+  List and filter revisions.
+  """
+  revisions(
+    """
+    Returns the elements in the list that come after the specified cursor.
+    """
+    after: String
+
+    """
+    Returns the elements in the list that come before the specified cursor.
+    """
+    before: String
+
+    """
+    Limit to revisions on a particular field.
+    """
+    fieldName: String
+
+    """
+    Returns the first _n_ elements from the list.
+    """
+    first: Int
+
+    """
+    Returns the last _n_ elements from the list.
+    """
+    last: Int
+
+    """
+    Limit to revisions by a certain user
+    """
+    originatingUserId: Int
+
+    """
+    Limit to revisions suggested as part of a single Revision Set.
+    """
+    revisionSetId: Int
+
+    """
+    Sort order for the comments. Defaults to most recent.
+    """
+    sortBy: DateSort
+
+    """
+    Limit to revisions with a certain status
+    """
+    status: RevisionStatus
+  ): RevisionConnection!
+  singleVariantMolecularProfile: MolecularProfile!
+  singleVariantMolecularProfileId: Int!
+  variantAliases: [String!]!
+  variantTypes: [VariantType!]!
+}
+
+type VariantAlias {
+  name: String!
+}
+
+"""
+Representation of a Variant's membership in a Molecular Profile.
+"""
+input VariantComponent {
+  """
+  When set to true, this means the NOT operator will be applied to the Variant in the Molecluar Profile.
+  """
+  not: Boolean! = false
+
+  """
+  The ID of the Variant involved in the Molecular Profile.
+  """
+  variantId: Int!
+}
+
+enum VariantDeprecationReason {
+  DUPLICATE
+  FEATURE_DEPRECATED
+  INVALID
+  OTHER
+}
+
+type VariantGroup implements Commentable & EventSubject & Flaggable & WithRevisions {
+  """
+  List and filter comments.
+  """
+  comments(
+    """
+    Returns the elements in the list that come after the specified cursor.
+    """
+    after: String
+
+    """
+    Returns the elements in the list that come before the specified cursor.
+    """
+    before: String
+
+    """
+    Returns the first _n_ elements from the list.
+    """
+    first: Int
+
+    """
+    Returns the last _n_ elements from the list.
+    """
+    last: Int
+
+    """
+    Limit to comments that mention a certain entity
+    """
+    mentionedEntity: TaggableEntityInput
+
+    """
+    Limit to comments that mention a certain user role
+    """
+    mentionedRole: UserRole
+
+    """
+    Limit to comments that mention a certain user
+    """
+    mentionedUserId: Int
+
+    """
+    Limit to comments by a certain user
+    """
+    originatingUserId: Int
+
+    """
+    Sort order for the comments. Defaults to most recent.
+    """
+    sortBy: DateSort
+  ): CommentConnection!
+  description: String!
+
+  """
+  List and filter events for an object
+  """
+  events(
+    """
+    Returns the elements in the list that come after the specified cursor.
+    """
+    after: String
+
+    """
+    Returns the elements in the list that come before the specified cursor.
+    """
+    before: String
+    eventType: EventAction
+
+    """
+    Returns the first _n_ elements from the list.
+    """
+    first: Int
+
+    """
+    Returns the last _n_ elements from the list.
+    """
+    last: Int
+    organizationId: Int
+    originatingUserId: Int
+
+    """
+    Sort order for the events. Defaults to most recent.
+    """
+    sortBy: DateSort
+  ): EventConnection!
+  flagged: Boolean!
+
+  """
+  List and filter flags.
+  """
+  flags(
+    """
+    Returns the elements in the list that come after the specified cursor.
+    """
+    after: String
+
+    """
+    Returns the elements in the list that come before the specified cursor.
+    """
+    before: String
+
+    """
+    Returns the first _n_ elements from the list.
+    """
+    first: Int
+
+    """
+    Limit to flags added by a certain user
+    """
+    flaggingUserId: Int
+
+    """
+    Returns the last _n_ elements from the list.
+    """
+    last: Int
+
+    """
+    Limit to flags resolved by a certain user
+    """
+    resolvingUserId: Int
+
+    """
+    Sort order for the flags. Defaults to most recent.
+    """
+    sortBy: DateSort
 
     """
-    Returns the last _n_ elements from the list.
+    Limit to flags in a particular state
     """
-    last: Int
-  ): MolecularProfileConnection!
-  myVariantInfo: MyVariantInfo
+    state: FlagState
+  ): FlagConnection!
+  id: Int!
+  lastAcceptedRevisionEvent: Event
+  lastCommentEvent: Event
+  lastSubmittedRevisionEvent: Event
+  link: String!
   name: String!
-  openCravatUrl: String
-  primaryCoordinates: Coordinate
-  referenceBases: String
-  referenceBuild: ReferenceBuild
 
   """
   List and filter revisions.
@@ -9790,46 +10510,52 @@ type Variant implements Commentable & EventOriginObject & EventSubject & Flaggab
     """
     status: RevisionStatus
   ): RevisionConnection!
-  secondaryCoordinates: Coordinate
-  singleVariantMolecularProfile: MolecularProfile!
-  singleVariantMolecularProfileId: Int!
-  variantAliases: [String!]!
-  variantBases: String
-  variantTypes: [VariantType!]!
-}
-
-type VariantAlias {
-  name: String!
-}
+  sources: [Source!]!
 
-"""
-Representation of a Variant's membership in a Molecular Profile.
-"""
-input VariantComponent {
   """
-  When set to true, this means the NOT operator will be applied to the Variant in the Molecluar Profile.
+  List and filter variants.
   """
-  not: Boolean! = false
+  variants(
+    """
+    Returns the elements in the list that come after the specified cursor.
+    """
+    after: String
 
-  """
-  The ID of the Variant involved in the Molecular Profile.
-  """
-  variantId: Int!
+    """
+    Returns the elements in the list that come before the specified cursor.
+    """
+    before: String
+
+    """
+    Returns the first _n_ elements from the list.
+    """
+    first: Int
+
+    """
+    Returns the last _n_ elements from the list.
+    """
+    last: Int
+
+    """
+    Left anchored filtering for variant name and aliases.
+    """
+    name: String
+  ): VariantInterfaceConnection!
 }
 
 """
-The connection type for Variant.
+The connection type for VariantGroup.
 """
-type VariantConnection {
+type VariantGroupConnection {
   """
   A list of edges.
   """
-  edges: [VariantEdge!]!
+  edges: [VariantGroupEdge!]!
 
   """
   A list of nodes.
   """
-  nodes: [Variant!]!
+  nodes: [VariantGroup!]!
 
   """
   Total number of pages, based on filtered count and pagesize.
@@ -9847,17 +10573,10 @@ type VariantConnection {
   totalCount: Int!
 }
 
-enum VariantDeprecationReason {
-  DUPLICATE
-  FEATURE_DEPRECATED
-  INVALID
-  OTHER
-}
-
 """
 An edge in a connection.
 """
-type VariantEdge {
+type VariantGroupEdge {
   """
   A cursor for use in pagination.
   """
@@ -9866,75 +10585,58 @@ type VariantEdge {
   """
   The item at the end of the edge.
   """
-  node: Variant
+  node: VariantGroup
 }
 
 """
-Fields on a Variant that curators may propose revisions to.
+Fields on a VariantGroup that curators may propose revisions to.
 """
-input VariantFields {
-  """
-  List of aliases or alternate names for the Variant.
-  """
-  aliases: [String!]!
-
-  """
-  List of ClinVar IDs for the Variant.
-  """
-  clinvarIds: ClinvarInput!
-
-  """
-  The Ensembl database version.
-  """
-  ensemblVersion: NullableIntInput!
-
-  """
-  The ID of the Feature this Variant corresponds to.
-  """
-  featureId: Int!
-
+input VariantGroupFields {
   """
-  List of HGVS descriptions for the Variant.
+  The VariantGroups's description/summary text.
   """
-  hgvsDescriptions: [String!]!
+  description: NullableStringInput!
 
   """
-  The Variant's name.
+  The VariantGroups's name.
   """
   name: String!
 
   """
-  The primary coordinates for this Variant. In the case of Fusions this will be the coordinates of the 5' partner.
-  """
-  primaryCoordinates: CoordinateInput!
-
-  """
-  Reference bases for this variant
+  Source IDs cited by the VariantGroup's summary.
   """
-  referenceBases: NullableStringInput!
+  sourceIds: [Int!]!
 
   """
-  The reference build for the genomic coordinates of this Variant.
+  Variants in this VariantGroup.
   """
-  referenceBuild: NullableReferenceBuildTypeInput!
+  variantIds: [Int!]!
+}
 
+input VariantGroupsSort {
   """
-  In the case of Fusions these will be the coordinates of the 3' partner, otherwise set the values to null.
+  Available columns for sorting
   """
-  secondaryCoordinates: CoordinateInput!
+  column: VariantGroupsSortColumns!
 
   """
-  Variant bases for this variant
+  Sort direction
   """
-  variantBases: NullableStringInput!
+  direction: SortDirection!
+}
 
-  """
-  List of IDs for the variant types for this Variant
-  """
-  variantTypeIds: [Int!]!
+enum VariantGroupsSortColumns {
+  EVIDENCE_ITEM_COUNT
+  GENE_NAMES
+  NAME
+  VARIANT_COUNT
+  VARIANT_NAMES
 }
 
-type VariantGroup implements Commentable & EventSubject & Flaggable & WithRevisions {
+"""
+A taggable/linkable component of a molecular profile
+"""
+interface VariantInterface implements Commentable & EventOriginObject & EventSubject & Flaggable & MolecularProfileComponent & WithRevisions {
   """
   List and filter comments.
   """
@@ -9984,7 +10686,10 @@ type VariantGroup implements Commentable & EventSubject & Flaggable & WithRevisi
     """
     sortBy: DateSort
   ): CommentConnection!
-  description: String!
+  creationActivity: CreateVariantActivity
+  deprecated: Boolean!
+  deprecationActivity: DeprecateVariantActivity
+  deprecationReason: VariantDeprecationReason
 
   """
   List and filter events for an object
@@ -10018,6 +10723,7 @@ type VariantGroup implements Commentable & EventSubject & Flaggable & WithRevisi
     """
     sortBy: DateSort
   ): EventConnection!
+  feature: Feature!
   flagged: Boolean!
 
   """
@@ -10069,6 +10775,27 @@ type VariantGroup implements Commentable & EventSubject & Flaggable & WithRevisi
   lastCommentEvent: Event
   lastSubmittedRevisionEvent: Event
   link: String!
+  molecularProfiles(
+    """
+    Returns the elements in the list that come after the specified cursor.
+    """
+    after: String
+
+    """
+    Returns the elements in the list that come before the specified cursor.
+    """
+    before: String
+
+    """
+    Returns the first _n_ elements from the list.
+    """
+    first: Int
+
+    """
+    Returns the last _n_ elements from the list.
+    """
+    last: Int
+  ): MolecularProfileConnection!
   name: String!
 
   """
@@ -10120,52 +10847,25 @@ type VariantGroup implements Commentable & EventSubject & Flaggable & WithRevisi
     """
     status: RevisionStatus
   ): RevisionConnection!
-  sources: [Source!]!
-
-  """
-  List and filter variants.
-  """
-  variants(
-    """
-    Returns the elements in the list that come after the specified cursor.
-    """
-    after: String
-
-    """
-    Returns the elements in the list that come before the specified cursor.
-    """
-    before: String
-
-    """
-    Returns the first _n_ elements from the list.
-    """
-    first: Int
-
-    """
-    Returns the last _n_ elements from the list.
-    """
-    last: Int
-
-    """
-    Left anchored filtering for variant name and aliases.
-    """
-    name: String
-  ): VariantConnection!
+  singleVariantMolecularProfile: MolecularProfile!
+  singleVariantMolecularProfileId: Int!
+  variantAliases: [String!]!
+  variantTypes: [VariantType!]!
 }
 
 """
-The connection type for VariantGroup.
+The connection type for VariantInterface.
 """
-type VariantGroupConnection {
+type VariantInterfaceConnection {
   """
   A list of edges.
   """
-  edges: [VariantGroupEdge!]!
+  edges: [VariantInterfaceEdge!]!
 
   """
   A list of nodes.
   """
-  nodes: [VariantGroup!]!
+  nodes: [VariantInterface!]!
 
   """
   Total number of pages, based on filtered count and pagesize.
@@ -10186,7 +10886,7 @@ type VariantGroupConnection {
 """
 An edge in a connection.
 """
-type VariantGroupEdge {
+type VariantInterfaceEdge {
   """
   A cursor for use in pagination.
   """
@@ -10195,52 +10895,7 @@ type VariantGroupEdge {
   """
   The item at the end of the edge.
   """
-  node: VariantGroup
-}
-
-"""
-Fields on a VariantGroup that curators may propose revisions to.
-"""
-input VariantGroupFields {
-  """
-  The VariantGroups's description/summary text.
-  """
-  description: NullableStringInput!
-
-  """
-  The VariantGroups's name.
-  """
-  name: String!
-
-  """
-  Source IDs cited by the VariantGroup's summary.
-  """
-  sourceIds: [Int!]!
-
-  """
-  Variants in this VariantGroup.
-  """
-  variantIds: [Int!]!
-}
-
-input VariantGroupsSort {
-  """
-  Available columns for sorting
-  """
-  column: VariantGroupsSortColumns!
-
-  """
-  Sort direction
-  """
-  direction: SortDirection!
-}
-
-enum VariantGroupsSortColumns {
-  EVIDENCE_ITEM_COUNT
-  GENE_NAMES
-  NAME
-  VARIANT_COUNT
-  VARIANT_NAMES
+  node: VariantInterface
 }
 
 input VariantMenuSort {
diff --git a/client/src/app/generated/server.schema.json b/client/src/app/generated/server.schema.json
index 413934bc0..04d624e08 100644
--- a/client/src/app/generated/server.schema.json
+++ b/client/src/app/generated/server.schema.json
@@ -8898,6 +8898,11 @@
               "name": "Factor",
               "ofType": null
             },
+            {
+              "kind": "OBJECT",
+              "name": "FactorVariant",
+              "ofType": null
+            },
             {
               "kind": "OBJECT",
               "name": "Feature",
@@ -8913,6 +8918,11 @@
               "name": "Gene",
               "ofType": null
             },
+            {
+              "kind": "OBJECT",
+              "name": "GeneVariant",
+              "ofType": null
+            },
             {
               "kind": "OBJECT",
               "name": "MolecularProfile",
@@ -10262,8 +10272,8 @@
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "OBJECT",
-                  "name": "Variant",
+                  "kind": "INTERFACE",
+                  "name": "VariantInterface",
                   "ofType": null
                 }
               },
@@ -10948,8 +10958,8 @@
                     "kind": "NON_NULL",
                     "name": null,
                     "ofType": {
-                      "kind": "OBJECT",
-                      "name": "Variant",
+                      "kind": "INTERFACE",
+                      "name": "VariantInterface",
                       "ofType": null
                     }
                   }
@@ -11129,8 +11139,8 @@
                   "kind": "NON_NULL",
                   "name": null,
                   "ofType": {
-                    "kind": "OBJECT",
-                    "name": "Variant",
+                    "kind": "INTERFACE",
+                    "name": "VariantInterface",
                     "ofType": null
                   }
                 }
@@ -11462,8 +11472,8 @@
               "description": "The deprecated Variant.",
               "args": [],
               "type": {
-                "kind": "OBJECT",
-                "name": "Variant",
+                "kind": "INTERFACE",
+                "name": "VariantInterface",
                 "ofType": null
               },
               "isDeprecated": false,
@@ -12783,6 +12793,11 @@
               "name": "Factor",
               "ofType": null
             },
+            {
+              "kind": "OBJECT",
+              "name": "FactorVariant",
+              "ofType": null
+            },
             {
               "kind": "OBJECT",
               "name": "Feature",
@@ -12798,6 +12813,11 @@
               "name": "Gene",
               "ofType": null
             },
+            {
+              "kind": "OBJECT",
+              "name": "GeneVariant",
+              "ofType": null
+            },
             {
               "kind": "OBJECT",
               "name": "MolecularProfile",
@@ -13006,6 +13026,11 @@
               "name": "Factor",
               "ofType": null
             },
+            {
+              "kind": "OBJECT",
+              "name": "FactorVariant",
+              "ofType": null
+            },
             {
               "kind": "OBJECT",
               "name": "Feature",
@@ -13021,6 +13046,11 @@
               "name": "Gene",
               "ofType": null
             },
+            {
+              "kind": "OBJECT",
+              "name": "GeneVariant",
+              "ofType": null
+            },
             {
               "kind": "OBJECT",
               "name": "MolecularProfile",
@@ -15883,7 +15913,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "OBJECT",
-                  "name": "VariantConnection",
+                  "name": "VariantInterfaceConnection",
                   "ofType": null
                 }
               },
@@ -16052,51 +16082,8 @@
         },
         {
           "kind": "OBJECT",
-          "name": "FdaCode",
+          "name": "FactorVariant",
           "description": null,
-          "fields": [
-            {
-              "name": "code",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "description",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            }
-          ],
-          "inputFields": null,
-          "interfaces": [],
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "OBJECT",
-          "name": "Feature",
-          "description": "The Feature that a Variant can belong to",
           "fields": [
             {
               "name": "comments",
@@ -16229,7 +16216,7 @@
               "args": [],
               "type": {
                 "kind": "OBJECT",
-                "name": "CreateFeatureActivity",
+                "name": "CreateVariantActivity",
                 "ofType": null
               },
               "isDeprecated": false,
@@ -16257,7 +16244,7 @@
               "args": [],
               "type": {
                 "kind": "OBJECT",
-                "name": "DeprecateFeatureActivity",
+                "name": "DeprecateVariantActivity",
                 "ofType": null
               },
               "isDeprecated": false,
@@ -16269,19 +16256,7 @@
               "args": [],
               "type": {
                 "kind": "ENUM",
-                "name": "FeatureDeprecationReason",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "description",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
+                "name": "VariantDeprecationReason",
                 "ofType": null
               },
               "isDeprecated": false,
@@ -16401,39 +16376,15 @@
               "deprecationReason": null
             },
             {
-              "name": "featureAliases",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "SCALAR",
-                      "name": "String",
-                      "ofType": null
-                    }
-                  }
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "featureInstance",
+              "name": "feature",
               "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "UNION",
-                  "name": "FeatureInstance",
+                  "kind": "OBJECT",
+                  "name": "Feature",
                   "ofType": null
                 }
               },
@@ -16569,18 +16520,6 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
-            {
-              "name": "fullName",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
             {
               "name": "id",
               "description": null,
@@ -16650,85 +16589,9 @@
               "deprecationReason": null
             },
             {
-              "name": "name",
+              "name": "molecularProfiles",
               "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "revisions",
-              "description": "List and filter revisions.",
               "args": [
-                {
-                  "name": "originatingUserId",
-                  "description": "Limit to revisions by a certain user",
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "Int",
-                    "ofType": null
-                  },
-                  "defaultValue": null,
-                  "isDeprecated": false,
-                  "deprecationReason": null
-                },
-                {
-                  "name": "status",
-                  "description": "Limit to revisions with a certain status",
-                  "type": {
-                    "kind": "ENUM",
-                    "name": "RevisionStatus",
-                    "ofType": null
-                  },
-                  "defaultValue": null,
-                  "isDeprecated": false,
-                  "deprecationReason": null
-                },
-                {
-                  "name": "sortBy",
-                  "description": "Sort order for the comments. Defaults to most recent.",
-                  "type": {
-                    "kind": "INPUT_OBJECT",
-                    "name": "DateSort",
-                    "ofType": null
-                  },
-                  "defaultValue": null,
-                  "isDeprecated": false,
-                  "deprecationReason": null
-                },
-                {
-                  "name": "fieldName",
-                  "description": "Limit to revisions on a particular field.",
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "String",
-                    "ofType": null
-                  },
-                  "defaultValue": null,
-                  "isDeprecated": false,
-                  "deprecationReason": null
-                },
-                {
-                  "name": "revisionSetId",
-                  "description": "Limit to revisions suggested as part of a single Revision Set.",
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "Int",
-                    "ofType": null
-                  },
-                  "defaultValue": null,
-                  "isDeprecated": false,
-                  "deprecationReason": null
-                },
                 {
                   "name": "after",
                   "description": "Returns the elements in the list that come after the specified cursor.",
@@ -16783,7 +16646,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "OBJECT",
-                  "name": "RevisionConnection",
+                  "name": "MolecularProfileConnection",
                   "ofType": null
                 }
               },
@@ -16791,36 +16654,76 @@
               "deprecationReason": null
             },
             {
-              "name": "sources",
+              "name": "name",
               "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "OBJECT",
-                      "name": "Source",
-                      "ofType": null
-                    }
-                  }
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "variants",
-              "description": "List and filter variants.",
+              "name": "ncitId",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "revisions",
+              "description": "List and filter revisions.",
               "args": [
                 {
-                  "name": "name",
-                  "description": "Left anchored filtering for variant name and aliases.",
+                  "name": "originatingUserId",
+                  "description": "Limit to revisions by a certain user",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "status",
+                  "description": "Limit to revisions with a certain status",
+                  "type": {
+                    "kind": "ENUM",
+                    "name": "RevisionStatus",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "sortBy",
+                  "description": "Sort order for the comments. Defaults to most recent.",
+                  "type": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "DateSort",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "fieldName",
+                  "description": "Limit to revisions on a particular field.",
                   "type": {
                     "kind": "SCALAR",
                     "name": "String",
@@ -16830,6 +16733,18 @@
                   "isDeprecated": false,
                   "deprecationReason": null
                 },
+                {
+                  "name": "revisionSetId",
+                  "description": "Limit to revisions suggested as part of a single Revision Set.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
                 {
                   "name": "after",
                   "description": "Returns the elements in the list that come after the specified cursor.",
@@ -16884,257 +16799,88 @@
                 "name": null,
                 "ofType": {
                   "kind": "OBJECT",
-                  "name": "VariantConnection",
+                  "name": "RevisionConnection",
                   "ofType": null
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
-            }
-          ],
-          "inputFields": null,
-          "interfaces": [
-            {
-              "kind": "INTERFACE",
-              "name": "Commentable",
-              "ofType": null
-            },
-            {
-              "kind": "INTERFACE",
-              "name": "EventOriginObject",
-              "ofType": null
-            },
-            {
-              "kind": "INTERFACE",
-              "name": "EventSubject",
-              "ofType": null
-            },
-            {
-              "kind": "INTERFACE",
-              "name": "Flaggable",
-              "ofType": null
-            },
-            {
-              "kind": "INTERFACE",
-              "name": "MolecularProfileComponent",
-              "ofType": null
-            },
-            {
-              "kind": "INTERFACE",
-              "name": "WithRevisions",
-              "ofType": null
-            }
-          ],
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "ENUM",
-          "name": "FeatureDeprecationReason",
-          "description": null,
-          "fields": null,
-          "inputFields": null,
-          "interfaces": null,
-          "enumValues": [
-            {
-              "name": "DUPLICATE",
-              "description": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "INVALID",
-              "description": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "OTHER",
-              "description": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            }
-          ],
-          "possibleTypes": null
-        },
-        {
-          "kind": "UNION",
-          "name": "FeatureInstance",
-          "description": "The specific type of a feature instance",
-          "fields": null,
-          "inputFields": null,
-          "interfaces": null,
-          "enumValues": null,
-          "possibleTypes": [
-            {
-              "kind": "OBJECT",
-              "name": "Factor",
-              "ofType": null
-            },
-            {
-              "kind": "OBJECT",
-              "name": "Gene",
-              "ofType": null
-            }
-          ]
-        },
-        {
-          "kind": "ENUM",
-          "name": "FeatureInstanceTypes",
-          "description": null,
-          "fields": null,
-          "inputFields": null,
-          "interfaces": null,
-          "enumValues": [
-            {
-              "name": "GENE",
-              "description": null,
-              "isDeprecated": false,
-              "deprecationReason": null
             },
             {
-              "name": "FACTOR",
+              "name": "singleVariantMolecularProfile",
               "description": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            }
-          ],
-          "possibleTypes": null
-        },
-        {
-          "kind": "INPUT_OBJECT",
-          "name": "FeaturesSort",
-          "description": null,
-          "fields": null,
-          "inputFields": [
-            {
-              "name": "column",
-              "description": "Available columns for sorting",
+              "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "ENUM",
-                  "name": "FeaturesSortColumns",
+                  "kind": "OBJECT",
+                  "name": "MolecularProfile",
                   "ofType": null
                 }
               },
-              "defaultValue": null,
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "direction",
-              "description": "Sort direction",
+              "name": "singleVariantMolecularProfileId",
+              "description": null,
+              "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "ENUM",
-                  "name": "SortDirection",
+                  "kind": "SCALAR",
+                  "name": "Int",
                   "ofType": null
                 }
               },
-              "defaultValue": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            }
-          ],
-          "interfaces": null,
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "ENUM",
-          "name": "FeaturesSortColumns",
-          "description": null,
-          "fields": null,
-          "inputFields": null,
-          "interfaces": null,
-          "enumValues": [
-            {
-              "name": "featureName",
-              "description": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "therapyName",
-              "description": null,
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "featureAlias",
-              "description": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "diseaseName",
-              "description": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "variantCount",
-              "description": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "evidenceItemCount",
-              "description": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "assertionCount",
-              "description": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "molecularProfileCount",
+              "name": "variantAliases",
               "description": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            }
-          ],
-          "possibleTypes": null
-        },
-        {
-          "kind": "OBJECT",
-          "name": "FieldName",
-          "description": null,
-          "fields": [
-            {
-              "name": "displayName",
-              "description": "The user facing representation of the field name.",
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "SCALAR",
+                      "name": "String",
+                      "ofType": null
+                    }
+                  }
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "name",
-              "description": "The internal server representation of the field name.",
+              "name": "variantTypes",
+              "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "VariantType",
+                      "ofType": null
+                    }
+                  }
                 }
               },
               "isDeprecated": false,
@@ -17142,17 +16888,53 @@
             }
           ],
           "inputFields": null,
-          "interfaces": [],
+          "interfaces": [
+            {
+              "kind": "INTERFACE",
+              "name": "Commentable",
+              "ofType": null
+            },
+            {
+              "kind": "INTERFACE",
+              "name": "EventOriginObject",
+              "ofType": null
+            },
+            {
+              "kind": "INTERFACE",
+              "name": "EventSubject",
+              "ofType": null
+            },
+            {
+              "kind": "INTERFACE",
+              "name": "Flaggable",
+              "ofType": null
+            },
+            {
+              "kind": "INTERFACE",
+              "name": "MolecularProfileComponent",
+              "ofType": null
+            },
+            {
+              "kind": "INTERFACE",
+              "name": "VariantInterface",
+              "ofType": null
+            },
+            {
+              "kind": "INTERFACE",
+              "name": "WithRevisions",
+              "ofType": null
+            }
+          ],
           "enumValues": null,
           "possibleTypes": null
         },
         {
           "kind": "OBJECT",
-          "name": "FieldValidationError",
+          "name": "FdaCode",
           "description": null,
           "fields": [
             {
-              "name": "error",
+              "name": "code",
               "description": null,
               "args": [],
               "type": {
@@ -17168,7 +16950,7 @@
               "deprecationReason": null
             },
             {
-              "name": "fieldName",
+              "name": "description",
               "description": null,
               "args": [],
               "type": {
@@ -17191,8 +16973,8 @@
         },
         {
           "kind": "OBJECT",
-          "name": "Flag",
-          "description": null,
+          "name": "Feature",
+          "description": "The Feature that a Variant can belong to",
           "fields": [
             {
               "name": "comments",
@@ -17320,7 +17102,19 @@
               "deprecationReason": null
             },
             {
-              "name": "createdAt",
+              "name": "creationActivity",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "CreateFeatureActivity",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "deprecated",
               "description": null,
               "args": [],
               "type": {
@@ -17328,13 +17122,49 @@
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "ISO8601DateTime",
+                  "name": "Boolean",
                   "ofType": null
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "deprecationActivity",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "DeprecateFeatureActivity",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "deprecationReason",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "ENUM",
+                "name": "FeatureDeprecationReason",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "description",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "events",
               "description": "List and filter events for an object",
@@ -17449,31 +17279,39 @@
               "deprecationReason": null
             },
             {
-              "name": "flaggable",
+              "name": "featureAliases",
               "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "INTERFACE",
-                  "name": "Flaggable",
-                  "ofType": null
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "SCALAR",
+                      "name": "String",
+                      "ofType": null
+                    }
+                  }
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "flaggingUser",
+              "name": "featureInstance",
               "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "OBJECT",
-                  "name": "User",
+                  "kind": "UNION",
+                  "name": "FeatureInstance",
                   "ofType": null
                 }
               },
@@ -17481,7 +17319,7 @@
               "deprecationReason": null
             },
             {
-              "name": "id",
+              "name": "flagged",
               "description": null,
               "args": [],
               "type": {
@@ -17489,7 +17327,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "Int",
+                  "name": "Boolean",
                   "ofType": null
                 }
               },
@@ -17497,35 +17335,132 @@
               "deprecationReason": null
             },
             {
-              "name": "lastCommentEvent",
-              "description": null,
-              "args": [],
+              "name": "flags",
+              "description": "List and filter flags.",
+              "args": [
+                {
+                  "name": "flaggingUserId",
+                  "description": "Limit to flags added by a certain user",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "resolvingUserId",
+                  "description": "Limit to flags resolved by a certain user",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "state",
+                  "description": "Limit to flags in a particular state",
+                  "type": {
+                    "kind": "ENUM",
+                    "name": "FlagState",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "sortBy",
+                  "description": "Sort order for the flags. Defaults to most recent.",
+                  "type": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "DateSort",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "after",
+                  "description": "Returns the elements in the list that come after the specified cursor.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "before",
+                  "description": "Returns the elements in the list that come before the specified cursor.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "first",
+                  "description": "Returns the first _n_ elements from the list.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "last",
+                  "description": "Returns the last _n_ elements from the list.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                }
+              ],
               "type": {
-                "kind": "OBJECT",
-                "name": "Event",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "FlagConnection",
+                  "ofType": null
+                }
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "link",
+              "name": "fullName",
               "description": null,
               "args": [],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "name",
+              "name": "id",
               "description": null,
               "args": [],
               "type": {
@@ -17533,7 +17468,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "String",
+                  "name": "Int",
                   "ofType": null
                 }
               },
@@ -17541,40 +17476,983 @@
               "deprecationReason": null
             },
             {
-              "name": "openActivity",
+              "name": "lastAcceptedRevisionEvent",
               "description": null,
               "args": [],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "OBJECT",
-                  "name": "FlagEntityActivity",
-                  "ofType": null
-                }
+                "kind": "OBJECT",
+                "name": "Event",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "resolutionActivity",
+              "name": "lastCommentEvent",
               "description": null,
               "args": [],
               "type": {
                 "kind": "OBJECT",
-                "name": "ResolveFlagActivity",
+                "name": "Event",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "resolvingUser",
+              "name": "lastSubmittedRevisionEvent",
               "description": null,
               "args": [],
               "type": {
                 "kind": "OBJECT",
-                "name": "User",
+                "name": "Event",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "link",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "name",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "revisions",
+              "description": "List and filter revisions.",
+              "args": [
+                {
+                  "name": "originatingUserId",
+                  "description": "Limit to revisions by a certain user",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "status",
+                  "description": "Limit to revisions with a certain status",
+                  "type": {
+                    "kind": "ENUM",
+                    "name": "RevisionStatus",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "sortBy",
+                  "description": "Sort order for the comments. Defaults to most recent.",
+                  "type": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "DateSort",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "fieldName",
+                  "description": "Limit to revisions on a particular field.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "revisionSetId",
+                  "description": "Limit to revisions suggested as part of a single Revision Set.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "after",
+                  "description": "Returns the elements in the list that come after the specified cursor.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "before",
+                  "description": "Returns the elements in the list that come before the specified cursor.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "first",
+                  "description": "Returns the first _n_ elements from the list.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "last",
+                  "description": "Returns the last _n_ elements from the list.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                }
+              ],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "RevisionConnection",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "sources",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "Source",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "variants",
+              "description": "List and filter variants.",
+              "args": [
+                {
+                  "name": "name",
+                  "description": "Left anchored filtering for variant name and aliases.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "after",
+                  "description": "Returns the elements in the list that come after the specified cursor.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "before",
+                  "description": "Returns the elements in the list that come before the specified cursor.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "first",
+                  "description": "Returns the first _n_ elements from the list.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "last",
+                  "description": "Returns the last _n_ elements from the list.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                }
+              ],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "VariantInterfaceConnection",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [
+            {
+              "kind": "INTERFACE",
+              "name": "Commentable",
+              "ofType": null
+            },
+            {
+              "kind": "INTERFACE",
+              "name": "EventOriginObject",
+              "ofType": null
+            },
+            {
+              "kind": "INTERFACE",
+              "name": "EventSubject",
+              "ofType": null
+            },
+            {
+              "kind": "INTERFACE",
+              "name": "Flaggable",
+              "ofType": null
+            },
+            {
+              "kind": "INTERFACE",
+              "name": "MolecularProfileComponent",
+              "ofType": null
+            },
+            {
+              "kind": "INTERFACE",
+              "name": "WithRevisions",
+              "ofType": null
+            }
+          ],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "ENUM",
+          "name": "FeatureDeprecationReason",
+          "description": null,
+          "fields": null,
+          "inputFields": null,
+          "interfaces": null,
+          "enumValues": [
+            {
+              "name": "DUPLICATE",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "INVALID",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "OTHER",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "possibleTypes": null
+        },
+        {
+          "kind": "UNION",
+          "name": "FeatureInstance",
+          "description": "The specific type of a feature instance",
+          "fields": null,
+          "inputFields": null,
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": [
+            {
+              "kind": "OBJECT",
+              "name": "Factor",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "Gene",
+              "ofType": null
+            }
+          ]
+        },
+        {
+          "kind": "ENUM",
+          "name": "FeatureInstanceTypes",
+          "description": null,
+          "fields": null,
+          "inputFields": null,
+          "interfaces": null,
+          "enumValues": [
+            {
+              "name": "GENE",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "FACTOR",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "FeaturesSort",
+          "description": null,
+          "fields": null,
+          "inputFields": [
+            {
+              "name": "column",
+              "description": "Available columns for sorting",
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "ENUM",
+                  "name": "FeaturesSortColumns",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "direction",
+              "description": "Sort direction",
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "ENUM",
+                  "name": "SortDirection",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "ENUM",
+          "name": "FeaturesSortColumns",
+          "description": null,
+          "fields": null,
+          "inputFields": null,
+          "interfaces": null,
+          "enumValues": [
+            {
+              "name": "featureName",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "therapyName",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "featureAlias",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "diseaseName",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "variantCount",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "evidenceItemCount",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "assertionCount",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "molecularProfileCount",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "FieldName",
+          "description": null,
+          "fields": [
+            {
+              "name": "displayName",
+              "description": "The user facing representation of the field name.",
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "name",
+              "description": "The internal server representation of the field name.",
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "FieldValidationError",
+          "description": null,
+          "fields": [
+            {
+              "name": "error",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "fieldName",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "Flag",
+          "description": null,
+          "fields": [
+            {
+              "name": "comments",
+              "description": "List and filter comments.",
+              "args": [
+                {
+                  "name": "originatingUserId",
+                  "description": "Limit to comments by a certain user",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "sortBy",
+                  "description": "Sort order for the comments. Defaults to most recent.",
+                  "type": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "DateSort",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "mentionedUserId",
+                  "description": "Limit to comments that mention a certain user",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "mentionedRole",
+                  "description": "Limit to comments that mention a certain user role",
+                  "type": {
+                    "kind": "ENUM",
+                    "name": "UserRole",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "mentionedEntity",
+                  "description": "Limit to comments that mention a certain entity",
+                  "type": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "TaggableEntityInput",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "after",
+                  "description": "Returns the elements in the list that come after the specified cursor.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "before",
+                  "description": "Returns the elements in the list that come before the specified cursor.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "first",
+                  "description": "Returns the first _n_ elements from the list.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "last",
+                  "description": "Returns the last _n_ elements from the list.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                }
+              ],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "CommentConnection",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "createdAt",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "ISO8601DateTime",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "events",
+              "description": "List and filter events for an object",
+              "args": [
+                {
+                  "name": "eventType",
+                  "description": null,
+                  "type": {
+                    "kind": "ENUM",
+                    "name": "EventAction",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "originatingUserId",
+                  "description": null,
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "organizationId",
+                  "description": null,
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "sortBy",
+                  "description": "Sort order for the events. Defaults to most recent.",
+                  "type": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "DateSort",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "after",
+                  "description": "Returns the elements in the list that come after the specified cursor.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "before",
+                  "description": "Returns the elements in the list that come before the specified cursor.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "first",
+                  "description": "Returns the first _n_ elements from the list.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "last",
+                  "description": "Returns the last _n_ elements from the list.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                }
+              ],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "EventConnection",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "flaggable",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "INTERFACE",
+                  "name": "Flaggable",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "flaggingUser",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "User",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "id",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "lastCommentEvent",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Event",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "link",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "name",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "openActivity",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "FlagEntityActivity",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "resolutionActivity",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "ResolveFlagActivity",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "resolvingUser",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "User",
                 "ofType": null
               },
               "isDeprecated": false,
@@ -17588,92 +18466,685 @@
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "ENUM",
-                  "name": "FlagState",
+                  "kind": "ENUM",
+                  "name": "FlagState",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [
+            {
+              "kind": "INTERFACE",
+              "name": "Commentable",
+              "ofType": null
+            },
+            {
+              "kind": "INTERFACE",
+              "name": "EventOriginObject",
+              "ofType": null
+            },
+            {
+              "kind": "INTERFACE",
+              "name": "EventSubject",
+              "ofType": null
+            }
+          ],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "FlagConnection",
+          "description": "The connection type for Flag.",
+          "fields": [
+            {
+              "name": "edges",
+              "description": "A list of edges.",
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "FlagEdge",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "nodes",
+              "description": "A list of nodes.",
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "Flag",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "pageCount",
+              "description": "Total number of pages, based on filtered count and pagesize.",
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "pageInfo",
+              "description": "Information to aid in pagination.",
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "PageInfo",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "totalCount",
+              "description": "The total number of records in this filtered collection.",
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "unfilteredCountForSubject",
+              "description": "When filtered on a subject, the total number of flags for that subject, irregardless of other filters. Returns null when there is no subject.",
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "Int",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "uniqueFlaggingUsers",
+              "description": "List of all users that have flagged this entity.",
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "User",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "uniqueResolvingUsers",
+              "description": "List of all users that have resolved a flag on this entity.",
+              "args": [],
+              "type": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "OBJECT",
+                    "name": "User",
+                    "ofType": null
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "FlagEdge",
+          "description": "An edge in a connection.",
+          "fields": [
+            {
+              "name": "cursor",
+              "description": "A cursor for use in pagination.",
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "node",
+              "description": "The item at the end of the edge.",
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Flag",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "FlagEntityActivity",
+          "description": null,
+          "fields": [
+            {
+              "name": "createdAt",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "ISO8601DateTime",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "events",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "Event",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "flag",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "Flag",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "id",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "note",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "organization",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Organization",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "parsedNote",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "UNION",
+                      "name": "CommentBodySegment",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "subject",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "INTERFACE",
+                  "name": "EventSubject",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "user",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "User",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "verbiage",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [
+            {
+              "kind": "INTERFACE",
+              "name": "ActivityInterface",
+              "ofType": null
+            }
+          ],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "FlagEntityInput",
+          "description": "Autogenerated input type of FlagEntity",
+          "fields": null,
+          "inputFields": [
+            {
+              "name": "clientMutationId",
+              "description": "A unique identifier for the client performing the mutation.",
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "organizationId",
+              "description": "The ID of the organization to credit the user's contributions to.\nIf the user belongs to a single organization or no organizations, this field is not required.\nThis field is required if the user belongs to more than one organization.\nThe user must belong to the organization provided.",
+              "type": {
+                "kind": "SCALAR",
+                "name": "Int",
+                "ofType": null
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "subject",
+              "description": "The entity to flag, specified by its ID and type.",
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "INPUT_OBJECT",
+                  "name": "FlaggableInput",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "comment",
+              "description": "Text describing the problem you observed with this entity.",
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
                   "ofType": null
                 }
               },
+              "defaultValue": null,
               "isDeprecated": false,
               "deprecationReason": null
             }
           ],
-          "inputFields": null,
-          "interfaces": [
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "FlagEntityPayload",
+          "description": "Autogenerated return type of FlagEntity.",
+          "fields": [
             {
-              "kind": "INTERFACE",
-              "name": "Commentable",
-              "ofType": null
+              "name": "clientMutationId",
+              "description": "A unique identifier for the client performing the mutation.",
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
             },
             {
-              "kind": "INTERFACE",
-              "name": "EventOriginObject",
-              "ofType": null
+              "name": "flag",
+              "description": "The newly created Flag.",
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Flag",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "ENUM",
+          "name": "FlagState",
+          "description": null,
+          "fields": null,
+          "inputFields": null,
+          "interfaces": null,
+          "enumValues": [
+            {
+              "name": "OPEN",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
             },
             {
-              "kind": "INTERFACE",
-              "name": "EventSubject",
-              "ofType": null
+              "name": "RESOLVED",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
             }
           ],
-          "enumValues": null,
           "possibleTypes": null
         },
         {
-          "kind": "OBJECT",
-          "name": "FlagConnection",
-          "description": "The connection type for Flag.",
+          "kind": "INTERFACE",
+          "name": "Flaggable",
+          "description": "A CIViC entity that can be flagged for editor attention.",
           "fields": [
             {
-              "name": "edges",
-              "description": "A list of edges.",
+              "name": "flagged",
+              "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "OBJECT",
-                      "name": "FlagEdge",
-                      "ofType": null
-                    }
-                  }
+                  "kind": "SCALAR",
+                  "name": "Boolean",
+                  "ofType": null
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "nodes",
-              "description": "A list of nodes.",
-              "args": [],
+              "name": "flags",
+              "description": "List and filter flags.",
+              "args": [
+                {
+                  "name": "flaggingUserId",
+                  "description": "Limit to flags added by a certain user",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "resolvingUserId",
+                  "description": "Limit to flags resolved by a certain user",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "state",
+                  "description": "Limit to flags in a particular state",
+                  "type": {
+                    "kind": "ENUM",
+                    "name": "FlagState",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "sortBy",
+                  "description": "Sort order for the flags. Defaults to most recent.",
+                  "type": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "DateSort",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "after",
+                  "description": "Returns the elements in the list that come after the specified cursor.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "before",
+                  "description": "Returns the elements in the list that come before the specified cursor.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "first",
+                  "description": "Returns the first _n_ elements from the list.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "last",
+                  "description": "Returns the last _n_ elements from the list.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                }
+              ],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "OBJECT",
-                      "name": "Flag",
-                      "ofType": null
-                    }
-                  }
+                  "kind": "OBJECT",
+                  "name": "FlagConnection",
+                  "ofType": null
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "pageCount",
-              "description": "Total number of pages, based on filtered count and pagesize.",
+              "name": "id",
+              "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
@@ -17688,15 +19159,15 @@
               "deprecationReason": null
             },
             {
-              "name": "pageInfo",
-              "description": "Information to aid in pagination.",
+              "name": "link",
+              "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "OBJECT",
-                  "name": "PageInfo",
+                  "kind": "SCALAR",
+                  "name": "String",
                   "ofType": null
                 }
               },
@@ -17704,98 +19175,307 @@
               "deprecationReason": null
             },
             {
-              "name": "totalCount",
-              "description": "The total number of records in this filtered collection.",
+              "name": "name",
+              "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "Int",
+                  "name": "String",
                   "ofType": null
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": [
+            {
+              "kind": "OBJECT",
+              "name": "Assertion",
+              "ofType": null
             },
             {
-              "name": "unfilteredCountForSubject",
-              "description": "When filtered on a subject, the total number of flags for that subject, irregardless of other filters. Returns null when there is no subject.",
-              "args": [],
-              "type": {
-                "kind": "SCALAR",
-                "name": "Int",
-                "ofType": null
-              },
+              "kind": "OBJECT",
+              "name": "BrowseFeature",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "EvidenceItem",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "Factor",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "FactorVariant",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "Feature",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "Gene",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "GeneVariant",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "MolecularProfile",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "Variant",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "VariantGroup",
+              "ofType": null
+            }
+          ]
+        },
+        {
+          "kind": "ENUM",
+          "name": "FlaggableEntities",
+          "description": "Enumeration of all entities in CIViC that can be flagged.",
+          "fields": null,
+          "inputFields": null,
+          "interfaces": null,
+          "enumValues": [
+            {
+              "name": "FEATURE",
+              "description": null,
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "uniqueFlaggingUsers",
-              "description": "List of all users that have flagged this entity.",
-              "args": [],
+              "name": "VARIANT",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "EVIDENCE_ITEM",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "ASSERTION",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "VARIANT_GROUP",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "MOLECULAR_PROFILE",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "FlaggableInput",
+          "description": "Entity to flag",
+          "fields": null,
+          "inputFields": [
+            {
+              "name": "id",
+              "description": "The ID of the entity.",
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "OBJECT",
-                      "name": "User",
-                      "ofType": null
-                    }
-                  }
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
                 }
               },
+              "defaultValue": null,
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "uniqueResolvingUsers",
-              "description": "List of all users that have resolved a flag on this entity.",
-              "args": [],
+              "name": "entityType",
+              "description": "The type of the entity to flag.",
               "type": {
-                "kind": "LIST",
+                "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "OBJECT",
-                    "name": "User",
+                  "kind": "ENUM",
+                  "name": "FlaggableEntities",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "SCALAR",
+          "name": "Float",
+          "description": "Represents signed double-precision fractional values as specified by [IEEE 754](https://en.wikipedia.org/wiki/IEEE_floating_point).",
+          "fields": null,
+          "inputFields": null,
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "Gene",
+          "description": "The Feature that a Variant can belong to",
+          "fields": [
+            {
+              "name": "comments",
+              "description": "List and filter comments.",
+              "args": [
+                {
+                  "name": "originatingUserId",
+                  "description": "Limit to comments by a certain user",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "sortBy",
+                  "description": "Sort order for the comments. Defaults to most recent.",
+                  "type": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "DateSort",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "mentionedUserId",
+                  "description": "Limit to comments that mention a certain user",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "mentionedRole",
+                  "description": "Limit to comments that mention a certain user role",
+                  "type": {
+                    "kind": "ENUM",
+                    "name": "UserRole",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "mentionedEntity",
+                  "description": "Limit to comments that mention a certain entity",
+                  "type": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "TaggableEntityInput",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "after",
+                  "description": "Returns the elements in the list that come after the specified cursor.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "before",
+                  "description": "Returns the elements in the list that come before the specified cursor.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "first",
+                  "description": "Returns the first _n_ elements from the list.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "last",
+                  "description": "Returns the last _n_ elements from the list.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
                     "ofType": null
-                  }
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
                 }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            }
-          ],
-          "inputFields": null,
-          "interfaces": [],
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "OBJECT",
-          "name": "FlagEdge",
-          "description": "An edge in a connection.",
-          "fields": [
-            {
-              "name": "cursor",
-              "description": "A cursor for use in pagination.",
-              "args": [],
+              ],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
+                  "kind": "OBJECT",
+                  "name": "CommentConnection",
                   "ofType": null
                 }
               },
@@ -17803,30 +19483,19 @@
               "deprecationReason": null
             },
             {
-              "name": "node",
-              "description": "The item at the end of the edge.",
+              "name": "creationActivity",
+              "description": null,
               "args": [],
               "type": {
                 "kind": "OBJECT",
-                "name": "Flag",
+                "name": "CreateFeatureActivity",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
-            }
-          ],
-          "inputFields": null,
-          "interfaces": [],
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "OBJECT",
-          "name": "FlagEntityActivity",
-          "description": null,
-          "fields": [
+            },
             {
-              "name": "createdAt",
+              "name": "deprecated",
               "description": null,
               "args": [],
               "type": {
@@ -17834,7 +19503,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "ISO8601DateTime",
+                  "name": "Boolean",
                   "ofType": null
                 }
               },
@@ -17842,87 +19511,172 @@
               "deprecationReason": null
             },
             {
-              "name": "events",
+              "name": "deprecationActivity",
               "description": null,
               "args": [],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "OBJECT",
-                      "name": "Event",
-                      "ofType": null
-                    }
-                  }
-                }
+                "kind": "OBJECT",
+                "name": "DeprecateFeatureActivity",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "flag",
+              "name": "deprecationReason",
               "description": null,
               "args": [],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "OBJECT",
-                  "name": "Flag",
-                  "ofType": null
-                }
+                "kind": "ENUM",
+                "name": "FeatureDeprecationReason",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "id",
+              "name": "description",
               "description": null,
               "args": [],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Int",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "note",
+              "name": "entrezId",
               "description": null,
               "args": [],
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                }
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "organization",
-              "description": null,
-              "args": [],
+              "name": "events",
+              "description": "List and filter events for an object",
+              "args": [
+                {
+                  "name": "eventType",
+                  "description": null,
+                  "type": {
+                    "kind": "ENUM",
+                    "name": "EventAction",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "originatingUserId",
+                  "description": null,
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "organizationId",
+                  "description": null,
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "sortBy",
+                  "description": "Sort order for the events. Defaults to most recent.",
+                  "type": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "DateSort",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "after",
+                  "description": "Returns the elements in the list that come after the specified cursor.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "before",
+                  "description": "Returns the elements in the list that come before the specified cursor.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "first",
+                  "description": "Returns the first _n_ elements from the list.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "last",
+                  "description": "Returns the last _n_ elements from the list.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                }
+              ],
               "type": {
-                "kind": "OBJECT",
-                "name": "Organization",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "EventConnection",
+                  "ofType": null
+                }
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "parsedNote",
+              "name": "featureAliases",
               "description": null,
               "args": [],
               "type": {
@@ -17935,8 +19689,8 @@
                     "kind": "NON_NULL",
                     "name": null,
                     "ofType": {
-                      "kind": "UNION",
-                      "name": "CommentBodySegment",
+                      "kind": "SCALAR",
+                      "name": "String",
                       "ofType": null
                     }
                   }
@@ -17946,15 +19700,15 @@
               "deprecationReason": null
             },
             {
-              "name": "subject",
+              "name": "featureInstance",
               "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "INTERFACE",
-                  "name": "EventSubject",
+                  "kind": "UNION",
+                  "name": "FeatureInstance",
                   "ofType": null
                 }
               },
@@ -17962,15 +19716,15 @@
               "deprecationReason": null
             },
             {
-              "name": "user",
+              "name": "flagged",
               "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "OBJECT",
-                  "name": "User",
+                  "kind": "SCALAR",
+                  "name": "Boolean",
                   "ofType": null
                 }
               },
@@ -17978,165 +19732,212 @@
               "deprecationReason": null
             },
             {
-              "name": "verbiage",
-              "description": null,
-              "args": [],
+              "name": "flags",
+              "description": "List and filter flags.",
+              "args": [
+                {
+                  "name": "flaggingUserId",
+                  "description": "Limit to flags added by a certain user",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "resolvingUserId",
+                  "description": "Limit to flags resolved by a certain user",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "state",
+                  "description": "Limit to flags in a particular state",
+                  "type": {
+                    "kind": "ENUM",
+                    "name": "FlagState",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "sortBy",
+                  "description": "Sort order for the flags. Defaults to most recent.",
+                  "type": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "DateSort",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "after",
+                  "description": "Returns the elements in the list that come after the specified cursor.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "before",
+                  "description": "Returns the elements in the list that come before the specified cursor.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "first",
+                  "description": "Returns the first _n_ elements from the list.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "last",
+                  "description": "Returns the last _n_ elements from the list.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                }
+              ],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
+                  "kind": "OBJECT",
+                  "name": "FlagConnection",
                   "ofType": null
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
-            }
-          ],
-          "inputFields": null,
-          "interfaces": [
-            {
-              "kind": "INTERFACE",
-              "name": "ActivityInterface",
-              "ofType": null
-            }
-          ],
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "INPUT_OBJECT",
-          "name": "FlagEntityInput",
-          "description": "Autogenerated input type of FlagEntity",
-          "fields": null,
-          "inputFields": [
-            {
-              "name": "clientMutationId",
-              "description": "A unique identifier for the client performing the mutation.",
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "defaultValue": null,
-              "isDeprecated": false,
-              "deprecationReason": null
             },
             {
-              "name": "organizationId",
-              "description": "The ID of the organization to credit the user's contributions to.\nIf the user belongs to a single organization or no organizations, this field is not required.\nThis field is required if the user belongs to more than one organization.\nThe user must belong to the organization provided.",
+              "name": "fullName",
+              "description": null,
+              "args": [],
               "type": {
                 "kind": "SCALAR",
-                "name": "Int",
+                "name": "String",
                 "ofType": null
               },
-              "defaultValue": null,
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "subject",
-              "description": "The entity to flag, specified by its ID and type.",
+              "name": "id",
+              "description": null,
+              "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "INPUT_OBJECT",
-                  "name": "FlaggableInput",
+                  "kind": "SCALAR",
+                  "name": "Int",
                   "ofType": null
                 }
               },
-              "defaultValue": null,
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "comment",
-              "description": "Text describing the problem you observed with this entity.",
+              "name": "lastAcceptedRevisionEvent",
+              "description": null,
+              "args": [],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
+                "kind": "OBJECT",
+                "name": "Event",
+                "ofType": null
               },
-              "defaultValue": null,
               "isDeprecated": false,
               "deprecationReason": null
-            }
-          ],
-          "interfaces": null,
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "OBJECT",
-          "name": "FlagEntityPayload",
-          "description": "Autogenerated return type of FlagEntity.",
-          "fields": [
+            },
             {
-              "name": "clientMutationId",
-              "description": "A unique identifier for the client performing the mutation.",
+              "name": "lastCommentEvent",
+              "description": null,
               "args": [],
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
+                "kind": "OBJECT",
+                "name": "Event",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "flag",
-              "description": "The newly created Flag.",
+              "name": "lastSubmittedRevisionEvent",
+              "description": null,
               "args": [],
               "type": {
                 "kind": "OBJECT",
-                "name": "Flag",
+                "name": "Event",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
-            }
-          ],
-          "inputFields": null,
-          "interfaces": [],
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "ENUM",
-          "name": "FlagState",
-          "description": null,
-          "fields": null,
-          "inputFields": null,
-          "interfaces": null,
-          "enumValues": [
+            },
             {
-              "name": "OPEN",
+              "name": "link",
               "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "RESOLVED",
+              "name": "myGeneInfoDetails",
               "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "JSON",
+                "ofType": null
+              },
               "isDeprecated": false,
               "deprecationReason": null
-            }
-          ],
-          "possibleTypes": null
-        },
-        {
-          "kind": "INTERFACE",
-          "name": "Flaggable",
-          "description": "A CIViC entity that can be flagged for editor attention.",
-          "fields": [
+            },
             {
-              "name": "flagged",
+              "name": "name",
               "description": null,
               "args": [],
               "type": {
@@ -18144,7 +19945,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "Boolean",
+                  "name": "String",
                   "ofType": null
                 }
               },
@@ -18152,15 +19953,27 @@
               "deprecationReason": null
             },
             {
-              "name": "flags",
-              "description": "List and filter flags.",
+              "name": "revisions",
+              "description": "List and filter revisions.",
               "args": [
                 {
-                  "name": "flaggingUserId",
-                  "description": "Limit to flags added by a certain user",
+                  "name": "originatingUserId",
+                  "description": "Limit to revisions by a certain user",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "status",
+                  "description": "Limit to revisions with a certain status",
                   "type": {
-                    "kind": "SCALAR",
-                    "name": "Int",
+                    "kind": "ENUM",
+                    "name": "RevisionStatus",
                     "ofType": null
                   },
                   "defaultValue": null,
@@ -18168,11 +19981,11 @@
                   "deprecationReason": null
                 },
                 {
-                  "name": "resolvingUserId",
-                  "description": "Limit to flags resolved by a certain user",
+                  "name": "sortBy",
+                  "description": "Sort order for the comments. Defaults to most recent.",
                   "type": {
-                    "kind": "SCALAR",
-                    "name": "Int",
+                    "kind": "INPUT_OBJECT",
+                    "name": "DateSort",
                     "ofType": null
                   },
                   "defaultValue": null,
@@ -18180,11 +19993,11 @@
                   "deprecationReason": null
                 },
                 {
-                  "name": "state",
-                  "description": "Limit to flags in a particular state",
+                  "name": "fieldName",
+                  "description": "Limit to revisions on a particular field.",
                   "type": {
-                    "kind": "ENUM",
-                    "name": "FlagState",
+                    "kind": "SCALAR",
+                    "name": "String",
                     "ofType": null
                   },
                   "defaultValue": null,
@@ -18192,11 +20005,11 @@
                   "deprecationReason": null
                 },
                 {
-                  "name": "sortBy",
-                  "description": "Sort order for the flags. Defaults to most recent.",
+                  "name": "revisionSetId",
+                  "description": "Limit to revisions suggested as part of a single Revision Set.",
                   "type": {
-                    "kind": "INPUT_OBJECT",
-                    "name": "DateSort",
+                    "kind": "SCALAR",
+                    "name": "Int",
                     "ofType": null
                   },
                   "defaultValue": null,
@@ -18257,7 +20070,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "OBJECT",
-                  "name": "FlagConnection",
+                  "name": "RevisionConnection",
                   "ofType": null
                 }
               },
@@ -18265,47 +20078,100 @@
               "deprecationReason": null
             },
             {
-              "name": "id",
+              "name": "sources",
               "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Int",
-                  "ofType": null
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "Source",
+                      "ofType": null
+                    }
+                  }
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "link",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
+              "name": "variants",
+              "description": "List and filter variants.",
+              "args": [
+                {
+                  "name": "name",
+                  "description": "Left anchored filtering for variant name and aliases.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "after",
+                  "description": "Returns the elements in the list that come after the specified cursor.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "before",
+                  "description": "Returns the elements in the list that come before the specified cursor.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "first",
+                  "description": "Returns the first _n_ elements from the list.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "last",
+                  "description": "Returns the last _n_ elements from the list.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
                 }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "name",
-              "description": null,
-              "args": [],
+              ],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
+                  "kind": "OBJECT",
+                  "name": "VariantInterfaceConnection",
                   "ofType": null
                 }
               },
@@ -18314,118 +20180,202 @@
             }
           ],
           "inputFields": null,
-          "interfaces": [],
-          "enumValues": null,
-          "possibleTypes": [
-            {
-              "kind": "OBJECT",
-              "name": "Assertion",
-              "ofType": null
-            },
-            {
-              "kind": "OBJECT",
-              "name": "BrowseFeature",
-              "ofType": null
-            },
-            {
-              "kind": "OBJECT",
-              "name": "EvidenceItem",
-              "ofType": null
-            },
+          "interfaces": [
             {
-              "kind": "OBJECT",
-              "name": "Factor",
+              "kind": "INTERFACE",
+              "name": "Commentable",
               "ofType": null
             },
             {
-              "kind": "OBJECT",
-              "name": "Feature",
+              "kind": "INTERFACE",
+              "name": "EventOriginObject",
               "ofType": null
             },
             {
-              "kind": "OBJECT",
-              "name": "Gene",
+              "kind": "INTERFACE",
+              "name": "EventSubject",
               "ofType": null
             },
             {
-              "kind": "OBJECT",
-              "name": "MolecularProfile",
+              "kind": "INTERFACE",
+              "name": "Flaggable",
               "ofType": null
             },
             {
-              "kind": "OBJECT",
-              "name": "Variant",
+              "kind": "INTERFACE",
+              "name": "MolecularProfileComponent",
               "ofType": null
             },
             {
-              "kind": "OBJECT",
-              "name": "VariantGroup",
+              "kind": "INTERFACE",
+              "name": "WithRevisions",
               "ofType": null
             }
-          ]
+          ],
+          "enumValues": null,
+          "possibleTypes": null
         },
         {
-          "kind": "ENUM",
-          "name": "FlaggableEntities",
-          "description": "Enumeration of all entities in CIViC that can be flagged.",
-          "fields": null,
-          "inputFields": null,
-          "interfaces": null,
-          "enumValues": [
+          "kind": "OBJECT",
+          "name": "GeneConnection",
+          "description": "The connection type for Gene.",
+          "fields": [
             {
-              "name": "FEATURE",
-              "description": null,
+              "name": "edges",
+              "description": "A list of edges.",
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "GeneEdge",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "VARIANT",
-              "description": null,
+              "name": "nodes",
+              "description": "A list of nodes.",
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "Gene",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "EVIDENCE_ITEM",
-              "description": null,
+              "name": "pageCount",
+              "description": "Total number of pages, based on filtered count and pagesize.",
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                }
+              },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "ASSERTION",
-              "description": null,
+              "name": "pageInfo",
+              "description": "Information to aid in pagination.",
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "PageInfo",
+                  "ofType": null
+                }
+              },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "VARIANT_GROUP",
-              "description": null,
+              "name": "totalCount",
+              "description": "The total number of records in this filtered collection.",
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "GeneEdge",
+          "description": "An edge in a connection.",
+          "fields": [
+            {
+              "name": "cursor",
+              "description": "A cursor for use in pagination.",
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "MOLECULAR_PROFILE",
-              "description": null,
+              "name": "node",
+              "description": "The item at the end of the edge.",
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Gene",
+                "ofType": null
+              },
               "isDeprecated": false,
               "deprecationReason": null
             }
           ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
           "possibleTypes": null
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "FlaggableInput",
-          "description": "Entity to flag",
+          "name": "GeneFields",
+          "description": "Fields on a Gene that curators may propose revisions to.",
           "fields": null,
           "inputFields": [
             {
-              "name": "id",
-              "description": "The ID of the entity.",
+              "name": "description",
+              "description": "The Gene's description/summary text.",
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Int",
+                  "kind": "INPUT_OBJECT",
+                  "name": "NullableStringInput",
                   "ofType": null
                 }
               },
@@ -18434,15 +20384,23 @@
               "deprecationReason": null
             },
             {
-              "name": "entityType",
-              "description": "The type of the entity to flag.",
+              "name": "sourceIds",
+              "description": "Source IDs cited by the Gene's summary.",
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "ENUM",
-                  "name": "FlaggableEntities",
-                  "ofType": null
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "SCALAR",
+                      "name": "Int",
+                      "ofType": null
+                    }
+                  }
                 }
               },
               "defaultValue": null,
@@ -18455,20 +20413,173 @@
           "possibleTypes": null
         },
         {
-          "kind": "SCALAR",
-          "name": "Float",
-          "description": "Represents signed double-precision fractional values as specified by [IEEE 754](https://en.wikipedia.org/wiki/IEEE_floating_point).",
+          "kind": "INPUT_OBJECT",
+          "name": "GeneSearchFilter",
+          "description": null,
           "fields": null,
-          "inputFields": null,
+          "inputFields": [
+            {
+              "name": "id",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "IntSearchInput",
+                "ofType": null
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "entrezId",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "IntSearchInput",
+                "ofType": null
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "entrezSymbol",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "StringSearchInput",
+                "ofType": null
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "description",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "StringSearchInput",
+                "ofType": null
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "alias",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "StringSearchInput",
+                "ofType": null
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "openRevisionCount",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "IntSearchInput",
+                "ofType": null
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "hasAssertion",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "BooleanSearchInput",
+                "ofType": null
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "subFilters",
+              "description": null,
+              "type": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "GeneSearchFilter",
+                    "ofType": null
+                  }
+                }
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "booleanOperator",
+              "description": null,
+              "type": {
+                "kind": "ENUM",
+                "name": "BooleanOperator",
+                "ofType": null
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
           "interfaces": null,
           "enumValues": null,
           "possibleTypes": null
         },
         {
           "kind": "OBJECT",
-          "name": "Gene",
-          "description": "The Feature that a Variant can belong to",
+          "name": "GeneVariant",
+          "description": null,
           "fields": [
+            {
+              "name": "alleleRegistryId",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "clinvarIds",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "SCALAR",
+                      "name": "String",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "comments",
               "description": "List and filter comments.",
@@ -18600,7 +20711,7 @@
               "args": [],
               "type": {
                 "kind": "OBJECT",
-                "name": "CreateFeatureActivity",
+                "name": "CreateVariantActivity",
                 "ofType": null
               },
               "isDeprecated": false,
@@ -18628,7 +20739,7 @@
               "args": [],
               "type": {
                 "kind": "OBJECT",
-                "name": "DeprecateFeatureActivity",
+                "name": "DeprecateVariantActivity",
                 "ofType": null
               },
               "isDeprecated": false,
@@ -18640,40 +20751,24 @@
               "args": [],
               "type": {
                 "kind": "ENUM",
-                "name": "FeatureDeprecationReason",
+                "name": "VariantDeprecationReason",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "description",
+              "name": "ensemblVersion",
               "description": null,
               "args": [],
               "type": {
                 "kind": "SCALAR",
-                "name": "String",
+                "name": "Int",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
-            {
-              "name": "entrezId",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Int",
-                  "ofType": null
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
             {
               "name": "events",
               "description": "List and filter events for an object",
@@ -18788,39 +20883,15 @@
               "deprecationReason": null
             },
             {
-              "name": "featureAliases",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "SCALAR",
-                      "name": "String",
-                      "ofType": null
-                    }
-                  }
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "featureInstance",
+              "name": "feature",
               "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "UNION",
-                  "name": "FeatureInstance",
+                  "kind": "OBJECT",
+                  "name": "Feature",
                   "ofType": null
                 }
               },
@@ -18957,13 +21028,25 @@
               "deprecationReason": null
             },
             {
-              "name": "fullName",
+              "name": "hgvsDescriptions",
               "description": null,
               "args": [],
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "SCALAR",
+                      "name": "String",
+                      "ofType": null
+                    }
+                  }
+                }
               },
               "isDeprecated": false,
               "deprecationReason": null
@@ -19037,12 +21120,89 @@
               "deprecationReason": null
             },
             {
-              "name": "myGeneInfoDetails",
+              "name": "maneSelectTranscript",
               "description": null,
               "args": [],
               "type": {
                 "kind": "SCALAR",
-                "name": "JSON",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "molecularProfiles",
+              "description": null,
+              "args": [
+                {
+                  "name": "after",
+                  "description": "Returns the elements in the list that come after the specified cursor.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "before",
+                  "description": "Returns the elements in the list that come before the specified cursor.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "first",
+                  "description": "Returns the first _n_ elements from the list.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "last",
+                  "description": "Returns the last _n_ elements from the list.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                }
+              ],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "MolecularProfileConnection",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "myVariantInfo",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "MyVariantInfo",
                 "ofType": null
               },
               "isDeprecated": false,
@@ -19064,6 +21224,54 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "openCravatUrl",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "primaryCoordinates",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Coordinate",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "referenceBases",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "referenceBuild",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "ENUM",
+                "name": "ReferenceBuild",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "revisions",
               "description": "List and filter revisions.",
@@ -19190,7 +21398,51 @@
               "deprecationReason": null
             },
             {
-              "name": "sources",
+              "name": "secondaryCoordinates",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Coordinate",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "singleVariantMolecularProfile",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "MolecularProfile",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "singleVariantMolecularProfileId",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "variantAliases",
               "description": null,
               "args": [],
               "type": {
@@ -19203,8 +21455,8 @@
                     "kind": "NON_NULL",
                     "name": null,
                     "ofType": {
-                      "kind": "OBJECT",
-                      "name": "Source",
+                      "kind": "SCALAR",
+                      "name": "String",
                       "ofType": null
                     }
                   }
@@ -19214,77 +21466,36 @@
               "deprecationReason": null
             },
             {
-              "name": "variants",
-              "description": "List and filter variants.",
-              "args": [
-                {
-                  "name": "name",
-                  "description": "Left anchored filtering for variant name and aliases.",
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "String",
-                    "ofType": null
-                  },
-                  "defaultValue": null,
-                  "isDeprecated": false,
-                  "deprecationReason": null
-                },
-                {
-                  "name": "after",
-                  "description": "Returns the elements in the list that come after the specified cursor.",
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "String",
-                    "ofType": null
-                  },
-                  "defaultValue": null,
-                  "isDeprecated": false,
-                  "deprecationReason": null
-                },
-                {
-                  "name": "before",
-                  "description": "Returns the elements in the list that come before the specified cursor.",
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "String",
-                    "ofType": null
-                  },
-                  "defaultValue": null,
-                  "isDeprecated": false,
-                  "deprecationReason": null
-                },
-                {
-                  "name": "first",
-                  "description": "Returns the first _n_ elements from the list.",
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "Int",
-                    "ofType": null
-                  },
-                  "defaultValue": null,
-                  "isDeprecated": false,
-                  "deprecationReason": null
-                },
-                {
-                  "name": "last",
-                  "description": "Returns the last _n_ elements from the list.",
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "Int",
-                    "ofType": null
-                  },
-                  "defaultValue": null,
-                  "isDeprecated": false,
-                  "deprecationReason": null
-                }
-              ],
+              "name": "variantBases",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "variantTypes",
+              "description": null,
+              "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "OBJECT",
-                  "name": "VariantConnection",
-                  "ofType": null
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "VariantType",
+                      "ofType": null
+                    }
+                  }
                 }
               },
               "isDeprecated": false,
@@ -19318,6 +21529,11 @@
               "name": "MolecularProfileComponent",
               "ofType": null
             },
+            {
+              "kind": "INTERFACE",
+              "name": "VariantInterface",
+              "ofType": null
+            },
             {
               "kind": "INTERFACE",
               "name": "WithRevisions",
@@ -19328,14 +21544,30 @@
           "possibleTypes": null
         },
         {
-          "kind": "OBJECT",
-          "name": "GeneConnection",
-          "description": "The connection type for Gene.",
-          "fields": [
+          "kind": "INPUT_OBJECT",
+          "name": "GeneVariantFields",
+          "description": "Fields on a GeneVariant that curators may propose revisions to.",
+          "fields": null,
+          "inputFields": [
             {
-              "name": "edges",
-              "description": "A list of edges.",
-              "args": [],
+              "name": "name",
+              "description": "The Variant's name.",
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "aliases",
+              "description": "List of aliases or alternate names for the Variant.",
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
@@ -19346,20 +21578,20 @@
                     "kind": "NON_NULL",
                     "name": null,
                     "ofType": {
-                      "kind": "OBJECT",
-                      "name": "GeneEdge",
+                      "kind": "SCALAR",
+                      "name": "String",
                       "ofType": null
                     }
                   }
                 }
               },
+              "defaultValue": null,
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "nodes",
-              "description": "A list of nodes.",
-              "args": [],
+              "name": "hgvsDescriptions",
+              "description": "List of HGVS descriptions for the Variant.",
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
@@ -19370,124 +21602,98 @@
                     "kind": "NON_NULL",
                     "name": null,
                     "ofType": {
-                      "kind": "OBJECT",
-                      "name": "Gene",
+                      "kind": "SCALAR",
+                      "name": "String",
                       "ofType": null
                     }
                   }
                 }
               },
+              "defaultValue": null,
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "pageCount",
-              "description": "Total number of pages, based on filtered count and pagesize.",
-              "args": [],
+              "name": "clinvarIds",
+              "description": "List of ClinVar IDs for the Variant.",
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Int",
+                  "kind": "INPUT_OBJECT",
+                  "name": "ClinvarInput",
                   "ofType": null
                 }
               },
+              "defaultValue": null,
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "pageInfo",
-              "description": "Information to aid in pagination.",
-              "args": [],
+              "name": "variantTypeIds",
+              "description": "List of IDs for the variant types for this Variant",
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "OBJECT",
-                  "name": "PageInfo",
-                  "ofType": null
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "SCALAR",
+                      "name": "Int",
+                      "ofType": null
+                    }
+                  }
                 }
               },
+              "defaultValue": null,
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "totalCount",
-              "description": "The total number of records in this filtered collection.",
-              "args": [],
+              "name": "referenceBuild",
+              "description": "The reference build for the genomic coordinates of this Variant.",
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Int",
+                  "kind": "INPUT_OBJECT",
+                  "name": "NullableReferenceBuildTypeInput",
                   "ofType": null
                 }
               },
+              "defaultValue": null,
               "isDeprecated": false,
               "deprecationReason": null
-            }
-          ],
-          "inputFields": null,
-          "interfaces": [],
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "OBJECT",
-          "name": "GeneEdge",
-          "description": "An edge in a connection.",
-          "fields": [
+            },
             {
-              "name": "cursor",
-              "description": "A cursor for use in pagination.",
-              "args": [],
+              "name": "ensemblVersion",
+              "description": "The Ensembl database version.",
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
+                  "kind": "INPUT_OBJECT",
+                  "name": "NullableIntInput",
                   "ofType": null
                 }
               },
+              "defaultValue": null,
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "node",
-              "description": "The item at the end of the edge.",
-              "args": [],
-              "type": {
-                "kind": "OBJECT",
-                "name": "Gene",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            }
-          ],
-          "inputFields": null,
-          "interfaces": [],
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "INPUT_OBJECT",
-          "name": "GeneFields",
-          "description": "Fields on a Gene that curators may propose revisions to.",
-          "fields": null,
-          "inputFields": [
-            {
-              "name": "description",
-              "description": "The Gene's description/summary text.",
+              "name": "secondaryCoordinates",
+              "description": "In the case of Fusions these will be the coordinates of the 3' partner, otherwise set the values to null.",
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
                   "kind": "INPUT_OBJECT",
-                  "name": "NullableStringInput",
+                  "name": "CoordinateInput",
                   "ofType": null
                 }
               },
@@ -19496,138 +21702,47 @@
               "deprecationReason": null
             },
             {
-              "name": "sourceIds",
-              "description": "Source IDs cited by the Gene's summary.",
+              "name": "primaryCoordinates",
+              "description": "The primary coordinates for this Variant. In the case of Fusions this will be the coordinates of the 5' partner.",
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "SCALAR",
-                      "name": "Int",
-                      "ofType": null
-                    }
-                  }
+                  "kind": "INPUT_OBJECT",
+                  "name": "CoordinateInput",
+                  "ofType": null
                 }
               },
               "defaultValue": null,
               "isDeprecated": false,
               "deprecationReason": null
-            }
-          ],
-          "interfaces": null,
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "INPUT_OBJECT",
-          "name": "GeneSearchFilter",
-          "description": null,
-          "fields": null,
-          "inputFields": [
-            {
-              "name": "id",
-              "description": null,
-              "type": {
-                "kind": "INPUT_OBJECT",
-                "name": "IntSearchInput",
-                "ofType": null
-              },
-              "defaultValue": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "entrezId",
-              "description": null,
-              "type": {
-                "kind": "INPUT_OBJECT",
-                "name": "IntSearchInput",
-                "ofType": null
-              },
-              "defaultValue": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "entrezSymbol",
-              "description": null,
-              "type": {
-                "kind": "INPUT_OBJECT",
-                "name": "StringSearchInput",
-                "ofType": null
-              },
-              "defaultValue": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "description",
-              "description": null,
-              "type": {
-                "kind": "INPUT_OBJECT",
-                "name": "StringSearchInput",
-                "ofType": null
-              },
-              "defaultValue": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "alias",
-              "description": null,
-              "type": {
-                "kind": "INPUT_OBJECT",
-                "name": "StringSearchInput",
-                "ofType": null
-              },
-              "defaultValue": null,
-              "isDeprecated": false,
-              "deprecationReason": null
             },
             {
-              "name": "openRevisionCount",
-              "description": null,
-              "type": {
-                "kind": "INPUT_OBJECT",
-                "name": "IntSearchInput",
-                "ofType": null
-              },
-              "defaultValue": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "hasAssertion",
-              "description": null,
+              "name": "featureId",
+              "description": "The ID of the Feature this Variant corresponds to.",
               "type": {
-                "kind": "INPUT_OBJECT",
-                "name": "BooleanSearchInput",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                }
               },
               "defaultValue": null,
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "subFilters",
-              "description": null,
+              "name": "referenceBases",
+              "description": "Reference bases for this variant",
               "type": {
-                "kind": "LIST",
+                "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "INPUT_OBJECT",
-                    "name": "GeneSearchFilter",
-                    "ofType": null
-                  }
+                  "kind": "INPUT_OBJECT",
+                  "name": "NullableStringInput",
+                  "ofType": null
                 }
               },
               "defaultValue": null,
@@ -19635,12 +21750,16 @@
               "deprecationReason": null
             },
             {
-              "name": "booleanOperator",
-              "description": null,
+              "name": "variantBases",
+              "description": "Variant bases for this variant",
               "type": {
-                "kind": "ENUM",
-                "name": "BooleanOperator",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "INPUT_OBJECT",
+                  "name": "NullableStringInput",
+                  "ofType": null
+                }
               },
               "defaultValue": null,
               "isDeprecated": false,
@@ -22480,8 +24599,8 @@
                     "kind": "NON_NULL",
                     "name": null,
                     "ofType": {
-                      "kind": "OBJECT",
-                      "name": "Variant",
+                      "kind": "INTERFACE",
+                      "name": "VariantInterface",
                       "ofType": null
                     }
                   }
@@ -23236,8 +25355,8 @@
                     "kind": "NON_NULL",
                     "name": null,
                     "ofType": {
-                      "kind": "OBJECT",
-                      "name": "Variant",
+                      "kind": "INTERFACE",
+                      "name": "VariantInterface",
                       "ofType": null
                     }
                   }
@@ -23368,6 +25487,11 @@
               "name": "Factor",
               "ofType": null
             },
+            {
+              "kind": "OBJECT",
+              "name": "FactorVariant",
+              "ofType": null
+            },
             {
               "kind": "OBJECT",
               "name": "Feature",
@@ -23378,6 +25502,11 @@
               "name": "Gene",
               "ofType": null
             },
+            {
+              "kind": "OBJECT",
+              "name": "GeneVariant",
+              "ofType": null
+            },
             {
               "kind": "OBJECT",
               "name": "Variant",
@@ -23787,8 +25916,8 @@
                     "kind": "NON_NULL",
                     "name": null,
                     "ofType": {
-                      "kind": "OBJECT",
-                      "name": "Variant",
+                      "kind": "INTERFACE",
+                      "name": "VariantInterface",
                       "ofType": null
                     }
                   }
@@ -24701,18 +26830,18 @@
               "deprecationReason": null
             },
             {
-              "name": "suggestMolecularProfileRevision",
-              "description": "Suggest a Revision to a MolecularProfile entity.",
+              "name": "suggestGeneVariantRevision",
+              "description": "Suggest a Revision to a Variant entity.",
               "args": [
                 {
                   "name": "input",
-                  "description": "Parameters for SuggestMolecularProfileRevision",
+                  "description": "Parameters for SuggestGeneVariantRevision",
                   "type": {
                     "kind": "NON_NULL",
                     "name": null,
                     "ofType": {
                       "kind": "INPUT_OBJECT",
-                      "name": "SuggestMolecularProfileRevisionInput",
+                      "name": "SuggestGeneVariantRevisionInput",
                       "ofType": null
                     }
                   },
@@ -24723,25 +26852,25 @@
               ],
               "type": {
                 "kind": "OBJECT",
-                "name": "SuggestMolecularProfileRevisionPayload",
+                "name": "SuggestGeneVariantRevisionPayload",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "suggestSource",
-              "description": "Suggest a source for curation in CIViC.",
+              "name": "suggestMolecularProfileRevision",
+              "description": "Suggest a Revision to a MolecularProfile entity.",
               "args": [
                 {
                   "name": "input",
-                  "description": "Parameters for SuggestSource",
+                  "description": "Parameters for SuggestMolecularProfileRevision",
                   "type": {
                     "kind": "NON_NULL",
                     "name": null,
                     "ofType": {
                       "kind": "INPUT_OBJECT",
-                      "name": "SuggestSourceInput",
+                      "name": "SuggestMolecularProfileRevisionInput",
                       "ofType": null
                     }
                   },
@@ -24752,25 +26881,25 @@
               ],
               "type": {
                 "kind": "OBJECT",
-                "name": "SuggestSourcePayload",
+                "name": "SuggestMolecularProfileRevisionPayload",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "suggestVariantGroupRevision",
-              "description": "Suggested a Revision to a Variant Group entity",
+              "name": "suggestSource",
+              "description": "Suggest a source for curation in CIViC.",
               "args": [
                 {
                   "name": "input",
-                  "description": "Parameters for SuggestVariantGroupRevision",
+                  "description": "Parameters for SuggestSource",
                   "type": {
                     "kind": "NON_NULL",
                     "name": null,
                     "ofType": {
                       "kind": "INPUT_OBJECT",
-                      "name": "SuggestVariantGroupRevisionInput",
+                      "name": "SuggestSourceInput",
                       "ofType": null
                     }
                   },
@@ -24781,25 +26910,25 @@
               ],
               "type": {
                 "kind": "OBJECT",
-                "name": "SuggestVariantGroupRevisionPayload",
+                "name": "SuggestSourcePayload",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "suggestVariantRevision",
-              "description": "Suggest a Revision to a Variant entity.",
+              "name": "suggestVariantGroupRevision",
+              "description": "Suggested a Revision to a Variant Group entity",
               "args": [
                 {
                   "name": "input",
-                  "description": "Parameters for SuggestVariantRevision",
+                  "description": "Parameters for SuggestVariantGroupRevision",
                   "type": {
                     "kind": "NON_NULL",
                     "name": null,
                     "ofType": {
                       "kind": "INPUT_OBJECT",
-                      "name": "SuggestVariantRevisionInput",
+                      "name": "SuggestVariantGroupRevisionInput",
                       "ofType": null
                     }
                   },
@@ -24810,7 +26939,7 @@
               ],
               "type": {
                 "kind": "OBJECT",
-                "name": "SuggestVariantRevisionPayload",
+                "name": "SuggestVariantGroupRevisionPayload",
                 "ofType": null
               },
               "isDeprecated": false,
@@ -33956,8 +36085,8 @@
                 }
               ],
               "type": {
-                "kind": "OBJECT",
-                "name": "Variant",
+                "kind": "INTERFACE",
+                "name": "VariantInterface",
                 "ofType": null
               },
               "isDeprecated": false,
@@ -34431,7 +36560,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "OBJECT",
-                  "name": "VariantConnection",
+                  "name": "VariantInterfaceConnection",
                   "ofType": null
                 }
               },
@@ -39832,7 +41961,153 @@
             },
             {
               "name": "id",
-              "description": "The ID of the Assertion to suggest a Revision to.",
+              "description": "The ID of the Assertion to suggest a Revision to.",
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "fields",
+              "description": "The desired state of the Assertion's editable fields if the change were applied.\nIf no change is desired for a particular field, pass in the current value of that field.",
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "INPUT_OBJECT",
+                  "name": "AssertionFields",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "comment",
+              "description": "Text describing the reason for the change. Will be attached to the Revision as a comment.",
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "SuggestAssertionRevisionPayload",
+          "description": "Autogenerated return type of SuggestAssertionRevision.",
+          "fields": [
+            {
+              "name": "assertion",
+              "description": "The Assertion the user has proposed a Revision to.",
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "Assertion",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "clientMutationId",
+              "description": "A unique identifier for the client performing the mutation.",
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "results",
+              "description": "A list of Revisions generated as a result of this suggestion.\nIf an existing Revision exactly matches the proposed one, it will be returned instead.\nThis is indicated via the 'newlyCreated' Boolean.\nRevisions are stored on a per-field basis.\nThe changesetId can be used to group Revisions proposed at the same time.",
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "RevisionResult",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "SuggestEvidenceItemRevisionInput",
+          "description": "Autogenerated input type of SuggestEvidenceItemRevision",
+          "fields": null,
+          "inputFields": [
+            {
+              "name": "clientMutationId",
+              "description": "A unique identifier for the client performing the mutation.",
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "organizationId",
+              "description": "The ID of the organization to credit the user's contributions to.\nIf the user belongs to a single organization or no organizations, this field is not required.\nThis field is required if the user belongs to more than one organization.\nThe user must belong to the organization provided.",
+              "type": {
+                "kind": "SCALAR",
+                "name": "Int",
+                "ofType": null
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "id",
+              "description": "The ID of the EvidenceItem to suggest a Revision to.",
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
@@ -39848,13 +42123,13 @@
             },
             {
               "name": "fields",
-              "description": "The desired state of the Assertion's editable fields if the change were applied.\nIf no change is desired for a particular field, pass in the current value of that field.",
+              "description": "The desired state of the EvidenceItems's editable fields if the change were applied.\nIf no change is desired for a particular field, pass in the current value of that field.",
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
                   "kind": "INPUT_OBJECT",
-                  "name": "AssertionFields",
+                  "name": "EvidenceItemFields",
                   "ofType": null
                 }
               },
@@ -39885,33 +42160,33 @@
         },
         {
           "kind": "OBJECT",
-          "name": "SuggestAssertionRevisionPayload",
-          "description": "Autogenerated return type of SuggestAssertionRevision.",
+          "name": "SuggestEvidenceItemRevisionPayload",
+          "description": "Autogenerated return type of SuggestEvidenceItemRevision.",
           "fields": [
             {
-              "name": "assertion",
-              "description": "The Assertion the user has proposed a Revision to.",
+              "name": "clientMutationId",
+              "description": "A unique identifier for the client performing the mutation.",
               "args": [],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "OBJECT",
-                  "name": "Assertion",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "clientMutationId",
-              "description": "A unique identifier for the client performing the mutation.",
+              "name": "evidenceItem",
+              "description": "The EvidenceItem the user has proposed a Revision to.",
               "args": [],
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "EvidenceItem",
+                  "ofType": null
+                }
               },
               "isDeprecated": false,
               "deprecationReason": null
@@ -39948,8 +42223,8 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "SuggestEvidenceItemRevisionInput",
-          "description": "Autogenerated input type of SuggestEvidenceItemRevision",
+          "name": "SuggestFactorRevisionInput",
+          "description": "Autogenerated input type of SuggestFactorRevision",
           "fields": null,
           "inputFields": [
             {
@@ -39978,7 +42253,7 @@
             },
             {
               "name": "id",
-              "description": "The ID of the EvidenceItem to suggest a Revision to.",
+              "description": "The ID of the Feature of instance type \"Factor\" to suggest a Revision to.",
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
@@ -39994,13 +42269,13 @@
             },
             {
               "name": "fields",
-              "description": "The desired state of the EvidenceItems's editable fields if the change were applied.\nIf no change is desired for a particular field, pass in the current value of that field.",
+              "description": "The desired state of the Factors's editable fields if the change were applied.\nIf no change is desired for a particular field, pass in the current value of that field.",
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
                   "kind": "INPUT_OBJECT",
-                  "name": "EvidenceItemFields",
+                  "name": "FactorFields",
                   "ofType": null
                 }
               },
@@ -40031,8 +42306,8 @@
         },
         {
           "kind": "OBJECT",
-          "name": "SuggestEvidenceItemRevisionPayload",
-          "description": "Autogenerated return type of SuggestEvidenceItemRevision.",
+          "name": "SuggestFactorRevisionPayload",
+          "description": "Autogenerated return type of SuggestFactorRevision.",
           "fields": [
             {
               "name": "clientMutationId",
@@ -40047,15 +42322,15 @@
               "deprecationReason": null
             },
             {
-              "name": "evidenceItem",
-              "description": "The EvidenceItem the user has proposed a Revision to.",
+              "name": "factor",
+              "description": "The Gene the user has proposed a Revision to.",
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
                   "kind": "OBJECT",
-                  "name": "EvidenceItem",
+                  "name": "Factor",
                   "ofType": null
                 }
               },
@@ -40094,8 +42369,8 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "SuggestFactorRevisionInput",
-          "description": "Autogenerated input type of SuggestFactorRevision",
+          "name": "SuggestGeneRevisionInput",
+          "description": "Autogenerated input type of SuggestGeneRevision",
           "fields": null,
           "inputFields": [
             {
@@ -40124,7 +42399,7 @@
             },
             {
               "name": "id",
-              "description": "The ID of the Feature of instance type \"Factor\" to suggest a Revision to.",
+              "description": "The ID of the Feature of instance type \"Gene\" to suggest a Revision to.",
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
@@ -40140,13 +42415,13 @@
             },
             {
               "name": "fields",
-              "description": "The desired state of the Factors's editable fields if the change were applied.\nIf no change is desired for a particular field, pass in the current value of that field.",
+              "description": "The desired state of the Gene's editable fields if the change were applied.\nIf no change is desired for a particular field, pass in the current value of that field.",
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
                   "kind": "INPUT_OBJECT",
-                  "name": "FactorFields",
+                  "name": "GeneFields",
                   "ofType": null
                 }
               },
@@ -40177,8 +42452,8 @@
         },
         {
           "kind": "OBJECT",
-          "name": "SuggestFactorRevisionPayload",
-          "description": "Autogenerated return type of SuggestFactorRevision.",
+          "name": "SuggestGeneRevisionPayload",
+          "description": "Autogenerated return type of SuggestGeneRevision.",
           "fields": [
             {
               "name": "clientMutationId",
@@ -40193,7 +42468,7 @@
               "deprecationReason": null
             },
             {
-              "name": "factor",
+              "name": "gene",
               "description": "The Gene the user has proposed a Revision to.",
               "args": [],
               "type": {
@@ -40201,7 +42476,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "OBJECT",
-                  "name": "Factor",
+                  "name": "Gene",
                   "ofType": null
                 }
               },
@@ -40240,8 +42515,8 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "SuggestGeneRevisionInput",
-          "description": "Autogenerated input type of SuggestGeneRevision",
+          "name": "SuggestGeneVariantRevisionInput",
+          "description": "Autogenerated input type of SuggestGeneVariantRevision",
           "fields": null,
           "inputFields": [
             {
@@ -40270,7 +42545,7 @@
             },
             {
               "name": "id",
-              "description": "The ID of the Feature of instance type \"Gene\" to suggest a Revision to.",
+              "description": "The ID of the Variant to suggest a Revision to.",
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
@@ -40286,13 +42561,13 @@
             },
             {
               "name": "fields",
-              "description": "The desired state of the Gene's editable fields if the change were applied.\nIf no change is desired for a particular field, pass in the current value of that field.",
+              "description": "The desired state of the Variant's editable fields if the change were applied.\nIf no change is desired for a particular field, pass in the current value of that field.",
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
                   "kind": "INPUT_OBJECT",
-                  "name": "GeneFields",
+                  "name": "GeneVariantFields",
                   "ofType": null
                 }
               },
@@ -40304,13 +42579,9 @@
               "name": "comment",
               "description": "Text describing the reason for the change. Will be attached to the Revision as a comment.",
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
               },
               "defaultValue": null,
               "isDeprecated": false,
@@ -40323,8 +42594,8 @@
         },
         {
           "kind": "OBJECT",
-          "name": "SuggestGeneRevisionPayload",
-          "description": "Autogenerated return type of SuggestGeneRevision.",
+          "name": "SuggestGeneVariantRevisionPayload",
+          "description": "Autogenerated return type of SuggestGeneVariantRevision.",
           "fields": [
             {
               "name": "clientMutationId",
@@ -40338,22 +42609,6 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
-            {
-              "name": "gene",
-              "description": "The Gene the user has proposed a Revision to.",
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "OBJECT",
-                  "name": "Gene",
-                  "ofType": null
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
             {
               "name": "results",
               "description": "A list of Revisions generated as a result of this suggestion.\nIf an existing Revision exactly matches the proposed one, it will be returned instead.\nThis is indicated via the 'newlyCreated' Boolean.\nRevisions are stored on a per-field basis.\nThe changesetId can be used to group Revisions proposed at the same time.",
@@ -40377,6 +42632,22 @@
               },
               "isDeprecated": false,
               "deprecationReason": null
+            },
+            {
+              "name": "variant",
+              "description": "The Variant the user has proposed a Revision to.",
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "INTERFACE",
+                  "name": "VariantInterface",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
             }
           ],
           "inputFields": null,
@@ -41200,148 +43471,6 @@
           "enumValues": null,
           "possibleTypes": null
         },
-        {
-          "kind": "INPUT_OBJECT",
-          "name": "SuggestVariantRevisionInput",
-          "description": "Autogenerated input type of SuggestVariantRevision",
-          "fields": null,
-          "inputFields": [
-            {
-              "name": "clientMutationId",
-              "description": "A unique identifier for the client performing the mutation.",
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "defaultValue": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "organizationId",
-              "description": "The ID of the organization to credit the user's contributions to.\nIf the user belongs to a single organization or no organizations, this field is not required.\nThis field is required if the user belongs to more than one organization.\nThe user must belong to the organization provided.",
-              "type": {
-                "kind": "SCALAR",
-                "name": "Int",
-                "ofType": null
-              },
-              "defaultValue": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "id",
-              "description": "The ID of the Variant to suggest a Revision to.",
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Int",
-                  "ofType": null
-                }
-              },
-              "defaultValue": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "fields",
-              "description": "The desired state of the Variant's editable fields if the change were applied.\nIf no change is desired for a particular field, pass in the current value of that field.",
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "INPUT_OBJECT",
-                  "name": "VariantFields",
-                  "ofType": null
-                }
-              },
-              "defaultValue": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "comment",
-              "description": "Text describing the reason for the change. Will be attached to the Revision as a comment.",
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "defaultValue": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            }
-          ],
-          "interfaces": null,
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "OBJECT",
-          "name": "SuggestVariantRevisionPayload",
-          "description": "Autogenerated return type of SuggestVariantRevision.",
-          "fields": [
-            {
-              "name": "clientMutationId",
-              "description": "A unique identifier for the client performing the mutation.",
-              "args": [],
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "results",
-              "description": "A list of Revisions generated as a result of this suggestion.\nIf an existing Revision exactly matches the proposed one, it will be returned instead.\nThis is indicated via the 'newlyCreated' Boolean.\nRevisions are stored on a per-field basis.\nThe changesetId can be used to group Revisions proposed at the same time.",
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "OBJECT",
-                      "name": "RevisionResult",
-                      "ofType": null
-                    }
-                  }
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "variant",
-              "description": "The Variant the user has proposed a Revision to.",
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "OBJECT",
-                  "name": "Variant",
-                  "ofType": null
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            }
-          ],
-          "inputFields": null,
-          "interfaces": [],
-          "enumValues": null,
-          "possibleTypes": null
-        },
         {
           "kind": "ENUM",
           "name": "TaggableEntity",
@@ -42452,79 +44581,577 @@
                 "name": "String",
                 "ofType": null
               },
-              "defaultValue": null,
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "organizationId",
+              "description": "The ID of the organization to credit the user's contributions to.\nIf the user belongs to a single organization or no organizations, this field is not required.\nThis field is required if the user belongs to more than one organization.\nThe user must belong to the organization provided.",
+              "type": {
+                "kind": "SCALAR",
+                "name": "Int",
+                "ofType": null
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "id",
+              "description": "The ID of the SourceSuggestion to update.",
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "newStatus",
+              "description": "The desired status of the SourceSuggestion.",
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "ENUM",
+                  "name": "SourceSuggestionStatus",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "reason",
+              "description": "The justification for marking a source as curated/rejected",
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "UpdateSourceSuggestionStatusPayload",
+          "description": "Autogenerated return type of UpdateSourceSuggestionStatus.",
+          "fields": [
+            {
+              "name": "clientMutationId",
+              "description": "A unique identifier for the client performing the mutation.",
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "sourceSuggestion",
+              "description": "The updated SourceSuggestion.",
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "SourceSuggestion",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "User",
+          "description": null,
+          "fields": [
+            {
+              "name": "areaOfExpertise",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "ENUM",
+                "name": "AreaOfExpertise",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "bio",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "country",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Country",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "displayName",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "email",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "events",
+              "description": null,
+              "args": [
+                {
+                  "name": "after",
+                  "description": "Returns the elements in the list that come after the specified cursor.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "before",
+                  "description": "Returns the elements in the list that come before the specified cursor.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "first",
+                  "description": "Returns the first _n_ elements from the list.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "last",
+                  "description": "Returns the last _n_ elements from the list.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                }
+              ],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "EventConnection",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "facebookProfile",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "id",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "linkedinProfile",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "mostRecentActivityTimestamp",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "ISO8601DateTime",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "mostRecentConflictOfInterestStatement",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Coi",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "mostRecentEvent",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Event",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "mostRecentOrganizationId",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "Int",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "name",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "notifications",
+              "description": "Filterable list of notifications for the logged in user.",
+              "args": [
+                {
+                  "name": "after",
+                  "description": "Returns the elements in the list that come after the specified cursor.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "before",
+                  "description": "Returns the elements in the list that come before the specified cursor.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "first",
+                  "description": "Returns the first _n_ elements from the list.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "last",
+                  "description": "Returns the last _n_ elements from the list.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "notificationType",
+                  "description": "Filter the response to include only notifications of a certaint type (ex: mentions).",
+                  "type": {
+                    "kind": "ENUM",
+                    "name": "NotificationReason",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "eventType",
+                  "description": "Filter the response to include only notifications generated by certain actions (ex: commenting).",
+                  "type": {
+                    "kind": "ENUM",
+                    "name": "EventAction",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "subscriptionId",
+                  "description": "Filter the reponse to include only notifications generated by a particular subscription.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "includeSeen",
+                  "description": "Filter the reponse to include only notifications generated by a particular subscription.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Boolean",
+                    "ofType": null
+                  },
+                  "defaultValue": "false",
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                }
+              ],
+              "type": {
+                "kind": "OBJECT",
+                "name": "NotificationConnection",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "orcid",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "organizations",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "Organization",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "profileImagePath",
+              "description": null,
+              "args": [
+                {
+                  "name": "size",
+                  "description": null,
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": "56",
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                }
+              ],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "organizationId",
-              "description": "The ID of the organization to credit the user's contributions to.\nIf the user belongs to a single organization or no organizations, this field is not required.\nThis field is required if the user belongs to more than one organization.\nThe user must belong to the organization provided.",
+              "name": "ranks",
+              "description": null,
+              "args": [],
               "type": {
-                "kind": "SCALAR",
-                "name": "Int",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "Ranks",
+                  "ofType": null
+                }
               },
-              "defaultValue": null,
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "id",
-              "description": "The ID of the SourceSuggestion to update.",
+              "name": "role",
+              "description": null,
+              "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Int",
+                  "kind": "ENUM",
+                  "name": "UserRole",
                   "ofType": null
                 }
               },
-              "defaultValue": null,
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "newStatus",
-              "description": "The desired status of the SourceSuggestion.",
+              "name": "statsHash",
+              "description": null,
+              "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "ENUM",
-                  "name": "SourceSuggestionStatus",
+                  "kind": "OBJECT",
+                  "name": "Stats",
                   "ofType": null
                 }
               },
-              "defaultValue": null,
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "reason",
-              "description": "The justification for marking a source as curated/rejected",
+              "name": "twitterHandle",
+              "description": null,
+              "args": [],
               "type": {
                 "kind": "SCALAR",
                 "name": "String",
                 "ofType": null
               },
-              "defaultValue": null,
               "isDeprecated": false,
               "deprecationReason": null
-            }
-          ],
-          "interfaces": null,
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "OBJECT",
-          "name": "UpdateSourceSuggestionStatusPayload",
-          "description": "Autogenerated return type of UpdateSourceSuggestionStatus.",
-          "fields": [
+            },
             {
-              "name": "clientMutationId",
-              "description": "A unique identifier for the client performing the mutation.",
+              "name": "url",
+              "description": null,
               "args": [],
               "type": {
                 "kind": "SCALAR",
@@ -42535,15 +45162,15 @@
               "deprecationReason": null
             },
             {
-              "name": "sourceSuggestion",
-              "description": "The updated SourceSuggestion.",
+              "name": "username",
+              "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "OBJECT",
-                  "name": "SourceSuggestion",
+                  "kind": "SCALAR",
+                  "name": "String",
                   "ofType": null
                 }
               },
@@ -42558,48 +45185,119 @@
         },
         {
           "kind": "OBJECT",
-          "name": "User",
-          "description": null,
+          "name": "UserConnection",
+          "description": "The connection type for User.",
           "fields": [
             {
-              "name": "areaOfExpertise",
-              "description": null,
+              "name": "edges",
+              "description": "A list of edges.",
               "args": [],
               "type": {
-                "kind": "ENUM",
-                "name": "AreaOfExpertise",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "UserEdge",
+                      "ofType": null
+                    }
+                  }
+                }
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "bio",
-              "description": null,
+              "name": "nodes",
+              "description": "A list of nodes.",
               "args": [],
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "User",
+                      "ofType": null
+                    }
+                  }
+                }
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "country",
-              "description": null,
+              "name": "pageCount",
+              "description": "Total number of pages, based on filtered count and pagesize.",
               "args": [],
               "type": {
-                "kind": "OBJECT",
-                "name": "Country",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                }
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "displayName",
-              "description": null,
+              "name": "pageInfo",
+              "description": "Information to aid in pagination.",
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "PageInfo",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "totalCount",
+              "description": "The total number of records in this filtered collection.",
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "UserEdge",
+          "description": "An edge in a connection.",
+          "fields": [
+            {
+              "name": "cursor",
+              "description": "A cursor for use in pagination.",
               "args": [],
               "type": {
                 "kind": "NON_NULL",
@@ -42614,21 +45312,68 @@
               "deprecationReason": null
             },
             {
-              "name": "email",
-              "description": null,
+              "name": "node",
+              "description": "The item at the end of the edge.",
               "args": [],
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
+                "kind": "OBJECT",
+                "name": "User",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
-            },
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "UserLeaderboards",
+          "description": null,
+          "fields": [
             {
-              "name": "events",
+              "name": "commentsLeaderboard",
               "description": null,
               "args": [
+                {
+                  "name": "role",
+                  "description": null,
+                  "type": {
+                    "kind": "ENUM",
+                    "name": "UserRole",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "direction",
+                  "description": null,
+                  "type": {
+                    "kind": "ENUM",
+                    "name": "SortDirection",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "window",
+                  "description": null,
+                  "type": {
+                    "kind": "ENUM",
+                    "name": "TimeWindow",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
                 {
                   "name": "after",
                   "description": "Returns the elements in the list that come after the specified cursor.",
@@ -42683,7 +45428,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "OBJECT",
-                  "name": "EventConnection",
+                  "name": "LeaderboardUserConnection",
                   "ofType": null
                 }
               },
@@ -42691,27 +45436,100 @@
               "deprecationReason": null
             },
             {
-              "name": "facebookProfile",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "id",
+              "name": "moderationLeaderboard",
               "description": null,
-              "args": [],
+              "args": [
+                {
+                  "name": "role",
+                  "description": null,
+                  "type": {
+                    "kind": "ENUM",
+                    "name": "UserRole",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "direction",
+                  "description": null,
+                  "type": {
+                    "kind": "ENUM",
+                    "name": "SortDirection",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "window",
+                  "description": null,
+                  "type": {
+                    "kind": "ENUM",
+                    "name": "TimeWindow",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "after",
+                  "description": "Returns the elements in the list that come after the specified cursor.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "before",
+                  "description": "Returns the elements in the list that come before the specified cursor.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "first",
+                  "description": "Returns the first _n_ elements from the list.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "last",
+                  "description": "Returns the last _n_ elements from the list.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                }
+              ],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Int",
+                  "kind": "OBJECT",
+                  "name": "LeaderboardUserConnection",
                   "ofType": null
                 }
               },
@@ -42719,81 +45537,45 @@
               "deprecationReason": null
             },
             {
-              "name": "linkedinProfile",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "mostRecentActivityTimestamp",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "SCALAR",
-                "name": "ISO8601DateTime",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "mostRecentConflictOfInterestStatement",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "OBJECT",
-                "name": "Coi",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "mostRecentEvent",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "OBJECT",
-                "name": "Event",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "mostRecentOrganizationId",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "SCALAR",
-                "name": "Int",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "name",
+              "name": "revisionsLeaderboard",
               "description": null,
-              "args": [],
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "notifications",
-              "description": "Filterable list of notifications for the logged in user.",
               "args": [
+                {
+                  "name": "role",
+                  "description": null,
+                  "type": {
+                    "kind": "ENUM",
+                    "name": "UserRole",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "direction",
+                  "description": null,
+                  "type": {
+                    "kind": "ENUM",
+                    "name": "SortDirection",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "window",
+                  "description": null,
+                  "type": {
+                    "kind": "ENUM",
+                    "name": "TimeWindow",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
                 {
                   "name": "after",
                   "description": "Returns the elements in the list that come after the specified cursor.",
@@ -42807,11 +45589,64 @@
                   "deprecationReason": null
                 },
                 {
-                  "name": "before",
-                  "description": "Returns the elements in the list that come before the specified cursor.",
+                  "name": "before",
+                  "description": "Returns the elements in the list that come before the specified cursor.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "first",
+                  "description": "Returns the first _n_ elements from the list.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "last",
+                  "description": "Returns the last _n_ elements from the list.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                }
+              ],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "LeaderboardUserConnection",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "submissionsLeaderboard",
+              "description": null,
+              "args": [
+                {
+                  "name": "role",
+                  "description": null,
                   "type": {
-                    "kind": "SCALAR",
-                    "name": "String",
+                    "kind": "ENUM",
+                    "name": "UserRole",
                     "ofType": null
                   },
                   "defaultValue": null,
@@ -42819,11 +45654,11 @@
                   "deprecationReason": null
                 },
                 {
-                  "name": "first",
-                  "description": "Returns the first _n_ elements from the list.",
+                  "name": "direction",
+                  "description": null,
                   "type": {
-                    "kind": "SCALAR",
-                    "name": "Int",
+                    "kind": "ENUM",
+                    "name": "SortDirection",
                     "ofType": null
                   },
                   "defaultValue": null,
@@ -42831,11 +45666,11 @@
                   "deprecationReason": null
                 },
                 {
-                  "name": "last",
-                  "description": "Returns the last _n_ elements from the list.",
+                  "name": "window",
+                  "description": null,
                   "type": {
-                    "kind": "SCALAR",
-                    "name": "Int",
+                    "kind": "ENUM",
+                    "name": "TimeWindow",
                     "ofType": null
                   },
                   "defaultValue": null,
@@ -42843,11 +45678,11 @@
                   "deprecationReason": null
                 },
                 {
-                  "name": "notificationType",
-                  "description": "Filter the response to include only notifications of a certaint type (ex: mentions).",
+                  "name": "after",
+                  "description": "Returns the elements in the list that come after the specified cursor.",
                   "type": {
-                    "kind": "ENUM",
-                    "name": "NotificationReason",
+                    "kind": "SCALAR",
+                    "name": "String",
                     "ofType": null
                   },
                   "defaultValue": null,
@@ -42855,11 +45690,11 @@
                   "deprecationReason": null
                 },
                 {
-                  "name": "eventType",
-                  "description": "Filter the response to include only notifications generated by certain actions (ex: commenting).",
+                  "name": "before",
+                  "description": "Returns the elements in the list that come before the specified cursor.",
                   "type": {
-                    "kind": "ENUM",
-                    "name": "EventAction",
+                    "kind": "SCALAR",
+                    "name": "String",
                     "ofType": null
                   },
                   "defaultValue": null,
@@ -42867,8 +45702,8 @@
                   "deprecationReason": null
                 },
                 {
-                  "name": "subscriptionId",
-                  "description": "Filter the reponse to include only notifications generated by a particular subscription.",
+                  "name": "first",
+                  "description": "Returns the first _n_ elements from the list.",
                   "type": {
                     "kind": "SCALAR",
                     "name": "Int",
@@ -42879,189 +45714,151 @@
                   "deprecationReason": null
                 },
                 {
-                  "name": "includeSeen",
-                  "description": "Filter the reponse to include only notifications generated by a particular subscription.",
+                  "name": "last",
+                  "description": "Returns the last _n_ elements from the list.",
                   "type": {
                     "kind": "SCALAR",
-                    "name": "Boolean",
+                    "name": "Int",
                     "ofType": null
                   },
-                  "defaultValue": "false",
+                  "defaultValue": null,
                   "isDeprecated": false,
                   "deprecationReason": null
                 }
               ],
               "type": {
-                "kind": "OBJECT",
-                "name": "NotificationConnection",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "LeaderboardUserConnection",
+                  "ofType": null
+                }
               },
               "isDeprecated": false,
               "deprecationReason": null
-            },
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "ENUM",
+          "name": "UserRole",
+          "description": null,
+          "fields": null,
+          "inputFields": null,
+          "interfaces": null,
+          "enumValues": [
             {
-              "name": "orcid",
+              "name": "EDITOR",
               "description": null,
-              "args": [],
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "organizations",
+              "name": "ADMIN",
               "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "OBJECT",
-                      "name": "Organization",
-                      "ofType": null
-                    }
-                  }
-                }
-              },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "profileImagePath",
+              "name": "CURATOR",
               "description": null,
-              "args": [
-                {
-                  "name": "size",
-                  "description": null,
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "Int",
-                    "ofType": null
-                  },
-                  "defaultValue": "56",
-                  "isDeprecated": false,
-                  "deprecationReason": null
-                }
-              ],
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
               "isDeprecated": false,
               "deprecationReason": null
-            },
+            }
+          ],
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "UsersSort",
+          "description": null,
+          "fields": null,
+          "inputFields": [
             {
-              "name": "ranks",
-              "description": null,
-              "args": [],
+              "name": "column",
+              "description": "Available columns for sorting",
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "OBJECT",
-                  "name": "Ranks",
+                  "kind": "ENUM",
+                  "name": "UsersSortColumns",
                   "ofType": null
                 }
               },
+              "defaultValue": null,
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "role",
-              "description": null,
-              "args": [],
+              "name": "direction",
+              "description": "Sort direction",
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
                   "kind": "ENUM",
-                  "name": "UserRole",
+                  "name": "SortDirection",
                   "ofType": null
                 }
               },
+              "defaultValue": null,
               "isDeprecated": false,
               "deprecationReason": null
-            },
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "ENUM",
+          "name": "UsersSortColumns",
+          "description": null,
+          "fields": null,
+          "inputFields": null,
+          "interfaces": null,
+          "enumValues": [
             {
-              "name": "statsHash",
+              "name": "ID",
               "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "OBJECT",
-                  "name": "Stats",
-                  "ofType": null
-                }
-              },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "twitterHandle",
+              "name": "NAME",
               "description": null,
-              "args": [],
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "url",
+              "name": "ROLE",
               "description": null,
-              "args": [],
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "username",
+              "name": "LAST_ACTION",
               "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
-              },
               "isDeprecated": false,
               "deprecationReason": null
             }
           ],
-          "inputFields": null,
-          "interfaces": [],
-          "enumValues": null,
           "possibleTypes": null
         },
         {
           "kind": "OBJECT",
-          "name": "UserConnection",
-          "description": "The connection type for User.",
+          "name": "ValidationErrors",
+          "description": null,
           "fields": [
             {
-              "name": "edges",
-              "description": "A list of edges.",
+              "name": "genericErrors",
+              "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
@@ -43073,8 +45870,8 @@
                     "kind": "NON_NULL",
                     "name": null,
                     "ofType": {
-                      "kind": "OBJECT",
-                      "name": "UserEdge",
+                      "kind": "SCALAR",
+                      "name": "String",
                       "ofType": null
                     }
                   }
@@ -43084,8 +45881,8 @@
               "deprecationReason": null
             },
             {
-              "name": "nodes",
-              "description": "A list of nodes.",
+              "name": "validationErrors",
+              "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
@@ -43098,7 +45895,7 @@
                     "name": null,
                     "ofType": {
                       "kind": "OBJECT",
-                      "name": "User",
+                      "name": "FieldValidationError",
                       "ofType": null
                     }
                   }
@@ -43106,17 +45903,137 @@
               },
               "isDeprecated": false,
               "deprecationReason": null
-            },
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "Variant",
+          "description": null,
+          "fields": [
             {
-              "name": "pageCount",
-              "description": "Total number of pages, based on filtered count and pagesize.",
-              "args": [],
+              "name": "comments",
+              "description": "List and filter comments.",
+              "args": [
+                {
+                  "name": "originatingUserId",
+                  "description": "Limit to comments by a certain user",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "sortBy",
+                  "description": "Sort order for the comments. Defaults to most recent.",
+                  "type": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "DateSort",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "mentionedUserId",
+                  "description": "Limit to comments that mention a certain user",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "mentionedRole",
+                  "description": "Limit to comments that mention a certain user role",
+                  "type": {
+                    "kind": "ENUM",
+                    "name": "UserRole",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "mentionedEntity",
+                  "description": "Limit to comments that mention a certain entity",
+                  "type": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "TaggableEntityInput",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "after",
+                  "description": "Returns the elements in the list that come after the specified cursor.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "before",
+                  "description": "Returns the elements in the list that come before the specified cursor.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "first",
+                  "description": "Returns the first _n_ elements from the list.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "last",
+                  "description": "Returns the last _n_ elements from the list.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                }
+              ],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Int",
+                  "kind": "OBJECT",
+                  "name": "CommentConnection",
                   "ofType": null
                 }
               },
@@ -43124,97 +46041,67 @@
               "deprecationReason": null
             },
             {
-              "name": "pageInfo",
-              "description": "Information to aid in pagination.",
+              "name": "creationActivity",
+              "description": null,
               "args": [],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "OBJECT",
-                  "name": "PageInfo",
-                  "ofType": null
-                }
+                "kind": "OBJECT",
+                "name": "CreateVariantActivity",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "totalCount",
-              "description": "The total number of records in this filtered collection.",
+              "name": "deprecated",
+              "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "Int",
+                  "name": "Boolean",
                   "ofType": null
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
-            }
-          ],
-          "inputFields": null,
-          "interfaces": [],
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "OBJECT",
-          "name": "UserEdge",
-          "description": "An edge in a connection.",
-          "fields": [
+            },
             {
-              "name": "cursor",
-              "description": "A cursor for use in pagination.",
+              "name": "deprecationActivity",
+              "description": null,
               "args": [],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
+                "kind": "OBJECT",
+                "name": "DeprecateVariantActivity",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "node",
-              "description": "The item at the end of the edge.",
+              "name": "deprecationReason",
+              "description": null,
               "args": [],
               "type": {
-                "kind": "OBJECT",
-                "name": "User",
+                "kind": "ENUM",
+                "name": "VariantDeprecationReason",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
-            }
-          ],
-          "inputFields": null,
-          "interfaces": [],
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "OBJECT",
-          "name": "UserLeaderboards",
-          "description": null,
-          "fields": [
+            },
             {
-              "name": "commentsLeaderboard",
-              "description": null,
+              "name": "events",
+              "description": "List and filter events for an object",
               "args": [
                 {
-                  "name": "role",
+                  "name": "eventType",
                   "description": null,
                   "type": {
                     "kind": "ENUM",
-                    "name": "UserRole",
+                    "name": "EventAction",
                     "ofType": null
                   },
                   "defaultValue": null,
@@ -43222,11 +46109,11 @@
                   "deprecationReason": null
                 },
                 {
-                  "name": "direction",
+                  "name": "originatingUserId",
                   "description": null,
                   "type": {
-                    "kind": "ENUM",
-                    "name": "SortDirection",
+                    "kind": "SCALAR",
+                    "name": "Int",
                     "ofType": null
                   },
                   "defaultValue": null,
@@ -43234,11 +46121,23 @@
                   "deprecationReason": null
                 },
                 {
-                  "name": "window",
+                  "name": "organizationId",
                   "description": null,
                   "type": {
-                    "kind": "ENUM",
-                    "name": "TimeWindow",
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "sortBy",
+                  "description": "Sort order for the events. Defaults to most recent.",
+                  "type": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "DateSort",
                     "ofType": null
                   },
                   "defaultValue": null,
@@ -43299,7 +46198,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "OBJECT",
-                  "name": "LeaderboardUserConnection",
+                  "name": "EventConnection",
                   "ofType": null
                 }
               },
@@ -43307,15 +46206,59 @@
               "deprecationReason": null
             },
             {
-              "name": "moderationLeaderboard",
+              "name": "feature",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "Feature",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "flagged",
               "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Boolean",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "flags",
+              "description": "List and filter flags.",
               "args": [
                 {
-                  "name": "role",
-                  "description": null,
+                  "name": "flaggingUserId",
+                  "description": "Limit to flags added by a certain user",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "resolvingUserId",
+                  "description": "Limit to flags resolved by a certain user",
                   "type": {
-                    "kind": "ENUM",
-                    "name": "UserRole",
+                    "kind": "SCALAR",
+                    "name": "Int",
                     "ofType": null
                   },
                   "defaultValue": null,
@@ -43323,11 +46266,11 @@
                   "deprecationReason": null
                 },
                 {
-                  "name": "direction",
-                  "description": null,
+                  "name": "state",
+                  "description": "Limit to flags in a particular state",
                   "type": {
                     "kind": "ENUM",
-                    "name": "SortDirection",
+                    "name": "FlagState",
                     "ofType": null
                   },
                   "defaultValue": null,
@@ -43335,11 +46278,11 @@
                   "deprecationReason": null
                 },
                 {
-                  "name": "window",
-                  "description": null,
+                  "name": "sortBy",
+                  "description": "Sort order for the flags. Defaults to most recent.",
                   "type": {
-                    "kind": "ENUM",
-                    "name": "TimeWindow",
+                    "kind": "INPUT_OBJECT",
+                    "name": "DateSort",
                     "ofType": null
                   },
                   "defaultValue": null,
@@ -43400,7 +46343,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "OBJECT",
-                  "name": "LeaderboardUserConnection",
+                  "name": "FlagConnection",
                   "ofType": null
                 }
               },
@@ -43408,45 +46351,77 @@
               "deprecationReason": null
             },
             {
-              "name": "revisionsLeaderboard",
+              "name": "id",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "lastAcceptedRevisionEvent",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Event",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "lastCommentEvent",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Event",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "lastSubmittedRevisionEvent",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Event",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "link",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "molecularProfiles",
               "description": null,
               "args": [
-                {
-                  "name": "role",
-                  "description": null,
-                  "type": {
-                    "kind": "ENUM",
-                    "name": "UserRole",
-                    "ofType": null
-                  },
-                  "defaultValue": null,
-                  "isDeprecated": false,
-                  "deprecationReason": null
-                },
-                {
-                  "name": "direction",
-                  "description": null,
-                  "type": {
-                    "kind": "ENUM",
-                    "name": "SortDirection",
-                    "ofType": null
-                  },
-                  "defaultValue": null,
-                  "isDeprecated": false,
-                  "deprecationReason": null
-                },
-                {
-                  "name": "window",
-                  "description": null,
-                  "type": {
-                    "kind": "ENUM",
-                    "name": "TimeWindow",
-                    "ofType": null
-                  },
-                  "defaultValue": null,
-                  "isDeprecated": false,
-                  "deprecationReason": null
-                },
                 {
                   "name": "after",
                   "description": "Returns the elements in the list that come after the specified cursor.",
@@ -43501,7 +46476,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "OBJECT",
-                  "name": "LeaderboardUserConnection",
+                  "name": "MolecularProfileConnection",
                   "ofType": null
                 }
               },
@@ -43509,15 +46484,31 @@
               "deprecationReason": null
             },
             {
-              "name": "submissionsLeaderboard",
+              "name": "name",
               "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "revisions",
+              "description": "List and filter revisions.",
               "args": [
                 {
-                  "name": "role",
-                  "description": null,
+                  "name": "originatingUserId",
+                  "description": "Limit to revisions by a certain user",
                   "type": {
-                    "kind": "ENUM",
-                    "name": "UserRole",
+                    "kind": "SCALAR",
+                    "name": "Int",
                     "ofType": null
                   },
                   "defaultValue": null,
@@ -43525,11 +46516,11 @@
                   "deprecationReason": null
                 },
                 {
-                  "name": "direction",
-                  "description": null,
+                  "name": "status",
+                  "description": "Limit to revisions with a certain status",
                   "type": {
                     "kind": "ENUM",
-                    "name": "SortDirection",
+                    "name": "RevisionStatus",
                     "ofType": null
                   },
                   "defaultValue": null,
@@ -43537,11 +46528,35 @@
                   "deprecationReason": null
                 },
                 {
-                  "name": "window",
-                  "description": null,
+                  "name": "sortBy",
+                  "description": "Sort order for the comments. Defaults to most recent.",
                   "type": {
-                    "kind": "ENUM",
-                    "name": "TimeWindow",
+                    "kind": "INPUT_OBJECT",
+                    "name": "DateSort",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "fieldName",
+                  "description": "Limit to revisions on a particular field.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "revisionSetId",
+                  "description": "Limit to revisions suggested as part of a single Revision Set.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
                     "ofType": null
                   },
                   "defaultValue": null,
@@ -43602,133 +46617,47 @@
                 "name": null,
                 "ofType": {
                   "kind": "OBJECT",
-                  "name": "LeaderboardUserConnection",
+                  "name": "RevisionConnection",
                   "ofType": null
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
-            }
-          ],
-          "inputFields": null,
-          "interfaces": [],
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "ENUM",
-          "name": "UserRole",
-          "description": null,
-          "fields": null,
-          "inputFields": null,
-          "interfaces": null,
-          "enumValues": [
-            {
-              "name": "EDITOR",
-              "description": null,
-              "isDeprecated": false,
-              "deprecationReason": null
             },
             {
-              "name": "ADMIN",
-              "description": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "CURATOR",
+              "name": "singleVariantMolecularProfile",
               "description": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            }
-          ],
-          "possibleTypes": null
-        },
-        {
-          "kind": "INPUT_OBJECT",
-          "name": "UsersSort",
-          "description": null,
-          "fields": null,
-          "inputFields": [
-            {
-              "name": "column",
-              "description": "Available columns for sorting",
+              "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "ENUM",
-                  "name": "UsersSortColumns",
+                  "kind": "OBJECT",
+                  "name": "MolecularProfile",
                   "ofType": null
                 }
               },
-              "defaultValue": null,
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "direction",
-              "description": "Sort direction",
+              "name": "singleVariantMolecularProfileId",
+              "description": null,
+              "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "ENUM",
-                  "name": "SortDirection",
+                  "kind": "SCALAR",
+                  "name": "Int",
                   "ofType": null
                 }
               },
-              "defaultValue": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            }
-          ],
-          "interfaces": null,
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "ENUM",
-          "name": "UsersSortColumns",
-          "description": null,
-          "fields": null,
-          "inputFields": null,
-          "interfaces": null,
-          "enumValues": [
-            {
-              "name": "ID",
-              "description": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "NAME",
-              "description": null,
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "ROLE",
-              "description": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "LAST_ACTION",
-              "description": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            }
-          ],
-          "possibleTypes": null
-        },
-        {
-          "kind": "OBJECT",
-          "name": "ValidationErrors",
-          "description": null,
-          "fields": [
-            {
-              "name": "genericErrors",
+              "name": "variantAliases",
               "description": null,
               "args": [],
               "type": {
@@ -43752,7 +46681,7 @@
               "deprecationReason": null
             },
             {
-              "name": "validationErrors",
+              "name": "variantTypes",
               "description": null,
               "args": [],
               "type": {
@@ -43766,7 +46695,7 @@
                     "name": null,
                     "ofType": {
                       "kind": "OBJECT",
-                      "name": "FieldValidationError",
+                      "name": "VariantType",
                       "ofType": null
                     }
                   }
@@ -43777,51 +46706,156 @@
             }
           ],
           "inputFields": null,
-          "interfaces": [],
+          "interfaces": [
+            {
+              "kind": "INTERFACE",
+              "name": "Commentable",
+              "ofType": null
+            },
+            {
+              "kind": "INTERFACE",
+              "name": "EventOriginObject",
+              "ofType": null
+            },
+            {
+              "kind": "INTERFACE",
+              "name": "EventSubject",
+              "ofType": null
+            },
+            {
+              "kind": "INTERFACE",
+              "name": "Flaggable",
+              "ofType": null
+            },
+            {
+              "kind": "INTERFACE",
+              "name": "MolecularProfileComponent",
+              "ofType": null
+            },
+            {
+              "kind": "INTERFACE",
+              "name": "VariantInterface",
+              "ofType": null
+            },
+            {
+              "kind": "INTERFACE",
+              "name": "WithRevisions",
+              "ofType": null
+            }
+          ],
           "enumValues": null,
           "possibleTypes": null
         },
         {
           "kind": "OBJECT",
-          "name": "Variant",
+          "name": "VariantAlias",
           "description": null,
           "fields": [
             {
-              "name": "alleleRegistryId",
+              "name": "name",
               "description": null,
               "args": [],
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "VariantComponent",
+          "description": "Representation of a Variant's membership in a Molecular Profile.",
+          "fields": null,
+          "inputFields": [
+            {
+              "name": "variantId",
+              "description": "The ID of the Variant involved in the Molecular Profile.",
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                }
               },
+              "defaultValue": null,
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "clinvarIds",
-              "description": null,
-              "args": [],
+              "name": "not",
+              "description": "When set to true, this means the NOT operator will be applied to the Variant in the Molecluar Profile.",
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "SCALAR",
-                      "name": "String",
-                      "ofType": null
-                    }
-                  }
+                  "kind": "SCALAR",
+                  "name": "Boolean",
+                  "ofType": null
                 }
               },
+              "defaultValue": "false",
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "ENUM",
+          "name": "VariantDeprecationReason",
+          "description": null,
+          "fields": null,
+          "inputFields": null,
+          "interfaces": null,
+          "enumValues": [
+            {
+              "name": "DUPLICATE",
+              "description": null,
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "INVALID",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "OTHER",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "FEATURE_DEPRECATED",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "VariantGroup",
+          "description": null,
+          "fields": [
             {
               "name": "comments",
               "description": "List and filter comments.",
@@ -43948,19 +46982,7 @@
               "deprecationReason": null
             },
             {
-              "name": "creationActivity",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "OBJECT",
-                "name": "CreateVariantActivity",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "deprecated",
+              "name": "description",
               "description": null,
               "args": [],
               "type": {
@@ -43968,45 +46990,9 @@
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "Boolean",
-                  "ofType": null
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "deprecationActivity",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "OBJECT",
-                "name": "DeprecateVariantActivity",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "deprecationReason",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "ENUM",
-                "name": "VariantDeprecationReason",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "ensemblVersion",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "SCALAR",
-                "name": "Int",
-                "ofType": null
+                  "name": "String",
+                  "ofType": null
+                }
               },
               "isDeprecated": false,
               "deprecationReason": null
@@ -44124,22 +47110,6 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
-            {
-              "name": "feature",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "OBJECT",
-                  "name": "Feature",
-                  "ofType": null
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
             {
               "name": "flagged",
               "description": null,
@@ -44269,30 +47239,6 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
-            {
-              "name": "hgvsDescriptions",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "SCALAR",
-                      "name": "String",
-                      "ofType": null
-                    }
-                  }
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
             {
               "name": "id",
               "description": null,
@@ -44361,95 +47307,6 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
-            {
-              "name": "maneSelectTranscript",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "molecularProfiles",
-              "description": null,
-              "args": [
-                {
-                  "name": "after",
-                  "description": "Returns the elements in the list that come after the specified cursor.",
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "String",
-                    "ofType": null
-                  },
-                  "defaultValue": null,
-                  "isDeprecated": false,
-                  "deprecationReason": null
-                },
-                {
-                  "name": "before",
-                  "description": "Returns the elements in the list that come before the specified cursor.",
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "String",
-                    "ofType": null
-                  },
-                  "defaultValue": null,
-                  "isDeprecated": false,
-                  "deprecationReason": null
-                },
-                {
-                  "name": "first",
-                  "description": "Returns the first _n_ elements from the list.",
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "Int",
-                    "ofType": null
-                  },
-                  "defaultValue": null,
-                  "isDeprecated": false,
-                  "deprecationReason": null
-                },
-                {
-                  "name": "last",
-                  "description": "Returns the last _n_ elements from the list.",
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "Int",
-                    "ofType": null
-                  },
-                  "defaultValue": null,
-                  "isDeprecated": false,
-                  "deprecationReason": null
-                }
-              ],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "OBJECT",
-                  "name": "MolecularProfileConnection",
-                  "ofType": null
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "myVariantInfo",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "OBJECT",
-                "name": "MyVariantInfo",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
             {
               "name": "name",
               "description": null,
@@ -44466,54 +47323,6 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
-            {
-              "name": "openCravatUrl",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "primaryCoordinates",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "OBJECT",
-                "name": "Coordinate",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "referenceBases",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "referenceBuild",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "ENUM",
-                "name": "ReferenceBuild",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
             {
               "name": "revisions",
               "description": "List and filter revisions.",
@@ -44640,51 +47449,7 @@
               "deprecationReason": null
             },
             {
-              "name": "secondaryCoordinates",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "OBJECT",
-                "name": "Coordinate",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "singleVariantMolecularProfile",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "OBJECT",
-                  "name": "MolecularProfile",
-                  "ofType": null
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "singleVariantMolecularProfileId",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Int",
-                  "ofType": null
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "variantAliases",
+              "name": "sources",
               "description": null,
               "args": [],
               "type": {
@@ -44697,8 +47462,8 @@
                     "kind": "NON_NULL",
                     "name": null,
                     "ofType": {
-                      "kind": "SCALAR",
-                      "name": "String",
+                      "kind": "OBJECT",
+                      "name": "Source",
                       "ofType": null
                     }
                   }
@@ -44708,36 +47473,77 @@
               "deprecationReason": null
             },
             {
-              "name": "variantBases",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "variantTypes",
-              "description": null,
-              "args": [],
+              "name": "variants",
+              "description": "List and filter variants.",
+              "args": [
+                {
+                  "name": "name",
+                  "description": "Left anchored filtering for variant name and aliases.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "after",
+                  "description": "Returns the elements in the list that come after the specified cursor.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "before",
+                  "description": "Returns the elements in the list that come before the specified cursor.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "first",
+                  "description": "Returns the first _n_ elements from the list.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "last",
+                  "description": "Returns the last _n_ elements from the list.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                }
+              ],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "OBJECT",
-                      "name": "VariantType",
-                      "ofType": null
-                    }
-                  }
+                  "kind": "OBJECT",
+                  "name": "VariantInterfaceConnection",
+                  "ofType": null
                 }
               },
               "isDeprecated": false,
@@ -44751,11 +47557,6 @@
               "name": "Commentable",
               "ofType": null
             },
-            {
-              "kind": "INTERFACE",
-              "name": "EventOriginObject",
-              "ofType": null
-            },
             {
               "kind": "INTERFACE",
               "name": "EventSubject",
@@ -44766,11 +47567,6 @@
               "name": "Flaggable",
               "ofType": null
             },
-            {
-              "kind": "INTERFACE",
-              "name": "MolecularProfileComponent",
-              "ofType": null
-            },
             {
               "kind": "INTERFACE",
               "name": "WithRevisions",
@@ -44782,78 +47578,8 @@
         },
         {
           "kind": "OBJECT",
-          "name": "VariantAlias",
-          "description": null,
-          "fields": [
-            {
-              "name": "name",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            }
-          ],
-          "inputFields": null,
-          "interfaces": [],
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "INPUT_OBJECT",
-          "name": "VariantComponent",
-          "description": "Representation of a Variant's membership in a Molecular Profile.",
-          "fields": null,
-          "inputFields": [
-            {
-              "name": "variantId",
-              "description": "The ID of the Variant involved in the Molecular Profile.",
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Int",
-                  "ofType": null
-                }
-              },
-              "defaultValue": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "not",
-              "description": "When set to true, this means the NOT operator will be applied to the Variant in the Molecluar Profile.",
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Boolean",
-                  "ofType": null
-                }
-              },
-              "defaultValue": "false",
-              "isDeprecated": false,
-              "deprecationReason": null
-            }
-          ],
-          "interfaces": null,
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "OBJECT",
-          "name": "VariantConnection",
-          "description": "The connection type for Variant.",
+          "name": "VariantGroupConnection",
+          "description": "The connection type for VariantGroup.",
           "fields": [
             {
               "name": "edges",
@@ -44870,7 +47596,7 @@
                     "name": null,
                     "ofType": {
                       "kind": "OBJECT",
-                      "name": "VariantEdge",
+                      "name": "VariantGroupEdge",
                       "ofType": null
                     }
                   }
@@ -44894,7 +47620,7 @@
                     "name": null,
                     "ofType": {
                       "kind": "OBJECT",
-                      "name": "Variant",
+                      "name": "VariantGroup",
                       "ofType": null
                     }
                   }
@@ -44957,44 +47683,9 @@
           "enumValues": null,
           "possibleTypes": null
         },
-        {
-          "kind": "ENUM",
-          "name": "VariantDeprecationReason",
-          "description": null,
-          "fields": null,
-          "inputFields": null,
-          "interfaces": null,
-          "enumValues": [
-            {
-              "name": "DUPLICATE",
-              "description": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "INVALID",
-              "description": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "OTHER",
-              "description": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "FEATURE_DEPRECATED",
-              "description": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            }
-          ],
-          "possibleTypes": null
-        },
         {
           "kind": "OBJECT",
-          "name": "VariantEdge",
+          "name": "VariantGroupEdge",
           "description": "An edge in a connection.",
           "fields": [
             {
@@ -45019,7 +47710,7 @@
               "args": [],
               "type": {
                 "kind": "OBJECT",
-                "name": "Variant",
+                "name": "VariantGroup",
                 "ofType": null
               },
               "isDeprecated": false,
@@ -45033,19 +47724,19 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "VariantFields",
-          "description": "Fields on a Variant that curators may propose revisions to.",
+          "name": "VariantGroupFields",
+          "description": "Fields on a VariantGroup that curators may propose revisions to.",
           "fields": null,
           "inputFields": [
             {
-              "name": "name",
-              "description": "The Variant's name.",
+              "name": "description",
+              "description": "The VariantGroups's description/summary text.",
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
+                  "kind": "INPUT_OBJECT",
+                  "name": "NullableStringInput",
                   "ofType": null
                 }
               },
@@ -45054,62 +47745,14 @@
               "deprecationReason": null
             },
             {
-              "name": "aliases",
-              "description": "List of aliases or alternate names for the Variant.",
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "SCALAR",
-                      "name": "String",
-                      "ofType": null
-                    }
-                  }
-                }
-              },
-              "defaultValue": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "hgvsDescriptions",
-              "description": "List of HGVS descriptions for the Variant.",
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "SCALAR",
-                      "name": "String",
-                      "ofType": null
-                    }
-                  }
-                }
-              },
-              "defaultValue": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "clinvarIds",
-              "description": "List of ClinVar IDs for the Variant.",
+              "name": "name",
+              "description": "The VariantGroups's name.",
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "INPUT_OBJECT",
-                  "name": "ClinvarInput",
+                  "kind": "SCALAR",
+                  "name": "String",
                   "ofType": null
                 }
               },
@@ -45118,8 +47761,8 @@
               "deprecationReason": null
             },
             {
-              "name": "variantTypeIds",
-              "description": "List of IDs for the variant types for this Variant",
+              "name": "sourceIds",
+              "description": "Source IDs cited by the VariantGroup's summary.",
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
@@ -45142,30 +47785,49 @@
               "deprecationReason": null
             },
             {
-              "name": "referenceBuild",
-              "description": "The reference build for the genomic coordinates of this Variant.",
+              "name": "variantIds",
+              "description": "Variants in this VariantGroup.",
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "INPUT_OBJECT",
-                  "name": "NullableReferenceBuildTypeInput",
-                  "ofType": null
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "SCALAR",
+                      "name": "Int",
+                      "ofType": null
+                    }
+                  }
                 }
               },
               "defaultValue": null,
               "isDeprecated": false,
               "deprecationReason": null
-            },
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "VariantGroupsSort",
+          "description": null,
+          "fields": null,
+          "inputFields": [
             {
-              "name": "ensemblVersion",
-              "description": "The Ensembl database version.",
+              "name": "column",
+              "description": "Available columns for sorting",
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "INPUT_OBJECT",
-                  "name": "NullableIntInput",
+                  "kind": "ENUM",
+                  "name": "VariantGroupsSortColumns",
                   "ofType": null
                 }
               },
@@ -45174,94 +47836,71 @@
               "deprecationReason": null
             },
             {
-              "name": "secondaryCoordinates",
-              "description": "In the case of Fusions these will be the coordinates of the 3' partner, otherwise set the values to null.",
+              "name": "direction",
+              "description": "Sort direction",
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "INPUT_OBJECT",
-                  "name": "CoordinateInput",
+                  "kind": "ENUM",
+                  "name": "SortDirection",
                   "ofType": null
                 }
               },
               "defaultValue": null,
               "isDeprecated": false,
               "deprecationReason": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "ENUM",
+          "name": "VariantGroupsSortColumns",
+          "description": null,
+          "fields": null,
+          "inputFields": null,
+          "interfaces": null,
+          "enumValues": [
+            {
+              "name": "NAME",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
             },
             {
-              "name": "primaryCoordinates",
-              "description": "The primary coordinates for this Variant. In the case of Fusions this will be the coordinates of the 5' partner.",
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "INPUT_OBJECT",
-                  "name": "CoordinateInput",
-                  "ofType": null
-                }
-              },
-              "defaultValue": null,
+              "name": "GENE_NAMES",
+              "description": null,
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "featureId",
-              "description": "The ID of the Feature this Variant corresponds to.",
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Int",
-                  "ofType": null
-                }
-              },
-              "defaultValue": null,
+              "name": "VARIANT_NAMES",
+              "description": null,
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "referenceBases",
-              "description": "Reference bases for this variant",
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "INPUT_OBJECT",
-                  "name": "NullableStringInput",
-                  "ofType": null
-                }
-              },
-              "defaultValue": null,
+              "name": "VARIANT_COUNT",
+              "description": null,
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "variantBases",
-              "description": "Variant bases for this variant",
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "INPUT_OBJECT",
-                  "name": "NullableStringInput",
-                  "ofType": null
-                }
-              },
-              "defaultValue": null,
+              "name": "EVIDENCE_ITEM_COUNT",
+              "description": null,
               "isDeprecated": false,
               "deprecationReason": null
             }
           ],
-          "interfaces": null,
-          "enumValues": null,
           "possibleTypes": null
         },
         {
-          "kind": "OBJECT",
-          "name": "VariantGroup",
-          "description": null,
+          "kind": "INTERFACE",
+          "name": "VariantInterface",
+          "description": "A taggable/linkable component of a molecular profile\n",
           "fields": [
             {
               "name": "comments",
@@ -45389,7 +48028,19 @@
               "deprecationReason": null
             },
             {
-              "name": "description",
+              "name": "creationActivity",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "CreateVariantActivity",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "deprecated",
               "description": null,
               "args": [],
               "type": {
@@ -45397,13 +48048,37 @@
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "String",
+                  "name": "Boolean",
                   "ofType": null
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "deprecationActivity",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "DeprecateVariantActivity",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "deprecationReason",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "ENUM",
+                "name": "VariantDeprecationReason",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "events",
               "description": "List and filter events for an object",
@@ -45517,6 +48192,22 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "feature",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "Feature",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "flagged",
               "description": null,
@@ -45715,85 +48406,9 @@
               "deprecationReason": null
             },
             {
-              "name": "name",
+              "name": "molecularProfiles",
               "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "revisions",
-              "description": "List and filter revisions.",
               "args": [
-                {
-                  "name": "originatingUserId",
-                  "description": "Limit to revisions by a certain user",
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "Int",
-                    "ofType": null
-                  },
-                  "defaultValue": null,
-                  "isDeprecated": false,
-                  "deprecationReason": null
-                },
-                {
-                  "name": "status",
-                  "description": "Limit to revisions with a certain status",
-                  "type": {
-                    "kind": "ENUM",
-                    "name": "RevisionStatus",
-                    "ofType": null
-                  },
-                  "defaultValue": null,
-                  "isDeprecated": false,
-                  "deprecationReason": null
-                },
-                {
-                  "name": "sortBy",
-                  "description": "Sort order for the comments. Defaults to most recent.",
-                  "type": {
-                    "kind": "INPUT_OBJECT",
-                    "name": "DateSort",
-                    "ofType": null
-                  },
-                  "defaultValue": null,
-                  "isDeprecated": false,
-                  "deprecationReason": null
-                },
-                {
-                  "name": "fieldName",
-                  "description": "Limit to revisions on a particular field.",
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "String",
-                    "ofType": null
-                  },
-                  "defaultValue": null,
-                  "isDeprecated": false,
-                  "deprecationReason": null
-                },
-                {
-                  "name": "revisionSetId",
-                  "description": "Limit to revisions suggested as part of a single Revision Set.",
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "Int",
-                    "ofType": null
-                  },
-                  "defaultValue": null,
-                  "isDeprecated": false,
-                  "deprecationReason": null
-                },
                 {
                   "name": "after",
                   "description": "Returns the elements in the list that come after the specified cursor.",
@@ -45848,7 +48463,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "OBJECT",
-                  "name": "RevisionConnection",
+                  "name": "MolecularProfileConnection",
                   "ofType": null
                 }
               },
@@ -45856,36 +48471,64 @@
               "deprecationReason": null
             },
             {
-              "name": "sources",
+              "name": "name",
               "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "OBJECT",
-                      "name": "Source",
-                      "ofType": null
-                    }
-                  }
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "variants",
-              "description": "List and filter variants.",
+              "name": "revisions",
+              "description": "List and filter revisions.",
               "args": [
                 {
-                  "name": "name",
-                  "description": "Left anchored filtering for variant name and aliases.",
+                  "name": "originatingUserId",
+                  "description": "Limit to revisions by a certain user",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "status",
+                  "description": "Limit to revisions with a certain status",
+                  "type": {
+                    "kind": "ENUM",
+                    "name": "RevisionStatus",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "sortBy",
+                  "description": "Sort order for the comments. Defaults to most recent.",
+                  "type": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "DateSort",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "fieldName",
+                  "description": "Limit to revisions on a particular field.",
                   "type": {
                     "kind": "SCALAR",
                     "name": "String",
@@ -45895,6 +48538,18 @@
                   "isDeprecated": false,
                   "deprecationReason": null
                 },
+                {
+                  "name": "revisionSetId",
+                  "description": "Limit to revisions suggested as part of a single Revision Set.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
                 {
                   "name": "after",
                   "description": "Returns the elements in the list that come after the specified cursor.",
@@ -45949,12 +48604,92 @@
                 "name": null,
                 "ofType": {
                   "kind": "OBJECT",
-                  "name": "VariantConnection",
+                  "name": "RevisionConnection",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "singleVariantMolecularProfile",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "MolecularProfile",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "singleVariantMolecularProfileId",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Int",
                   "ofType": null
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
+            },
+            {
+              "name": "variantAliases",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "SCALAR",
+                      "name": "String",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "variantTypes",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "VariantType",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
             }
           ],
           "inputFields": null,
@@ -45964,6 +48699,11 @@
               "name": "Commentable",
               "ofType": null
             },
+            {
+              "kind": "INTERFACE",
+              "name": "EventOriginObject",
+              "ofType": null
+            },
             {
               "kind": "INTERFACE",
               "name": "EventSubject",
@@ -45974,6 +48714,11 @@
               "name": "Flaggable",
               "ofType": null
             },
+            {
+              "kind": "INTERFACE",
+              "name": "MolecularProfileComponent",
+              "ofType": null
+            },
             {
               "kind": "INTERFACE",
               "name": "WithRevisions",
@@ -45981,12 +48726,28 @@
             }
           ],
           "enumValues": null,
-          "possibleTypes": null
+          "possibleTypes": [
+            {
+              "kind": "OBJECT",
+              "name": "FactorVariant",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "GeneVariant",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "Variant",
+              "ofType": null
+            }
+          ]
         },
         {
           "kind": "OBJECT",
-          "name": "VariantGroupConnection",
-          "description": "The connection type for VariantGroup.",
+          "name": "VariantInterfaceConnection",
+          "description": "The connection type for VariantInterface.",
           "fields": [
             {
               "name": "edges",
@@ -46003,7 +48764,7 @@
                     "name": null,
                     "ofType": {
                       "kind": "OBJECT",
-                      "name": "VariantGroupEdge",
+                      "name": "VariantInterfaceEdge",
                       "ofType": null
                     }
                   }
@@ -46026,8 +48787,8 @@
                     "kind": "NON_NULL",
                     "name": null,
                     "ofType": {
-                      "kind": "OBJECT",
-                      "name": "VariantGroup",
+                      "kind": "INTERFACE",
+                      "name": "VariantInterface",
                       "ofType": null
                     }
                   }
@@ -46092,7 +48853,7 @@
         },
         {
           "kind": "OBJECT",
-          "name": "VariantGroupEdge",
+          "name": "VariantInterfaceEdge",
           "description": "An edge in a connection.",
           "fields": [
             {
@@ -46116,8 +48877,8 @@
               "description": "The item at the end of the edge.",
               "args": [],
               "type": {
-                "kind": "OBJECT",
-                "name": "VariantGroup",
+                "kind": "INTERFACE",
+                "name": "VariantInterface",
                 "ofType": null
               },
               "isDeprecated": false,
@@ -46129,181 +48890,6 @@
           "enumValues": null,
           "possibleTypes": null
         },
-        {
-          "kind": "INPUT_OBJECT",
-          "name": "VariantGroupFields",
-          "description": "Fields on a VariantGroup that curators may propose revisions to.",
-          "fields": null,
-          "inputFields": [
-            {
-              "name": "description",
-              "description": "The VariantGroups's description/summary text.",
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "INPUT_OBJECT",
-                  "name": "NullableStringInput",
-                  "ofType": null
-                }
-              },
-              "defaultValue": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "name",
-              "description": "The VariantGroups's name.",
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
-              },
-              "defaultValue": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "sourceIds",
-              "description": "Source IDs cited by the VariantGroup's summary.",
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "SCALAR",
-                      "name": "Int",
-                      "ofType": null
-                    }
-                  }
-                }
-              },
-              "defaultValue": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "variantIds",
-              "description": "Variants in this VariantGroup.",
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "SCALAR",
-                      "name": "Int",
-                      "ofType": null
-                    }
-                  }
-                }
-              },
-              "defaultValue": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            }
-          ],
-          "interfaces": null,
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "INPUT_OBJECT",
-          "name": "VariantGroupsSort",
-          "description": null,
-          "fields": null,
-          "inputFields": [
-            {
-              "name": "column",
-              "description": "Available columns for sorting",
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "ENUM",
-                  "name": "VariantGroupsSortColumns",
-                  "ofType": null
-                }
-              },
-              "defaultValue": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "direction",
-              "description": "Sort direction",
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "ENUM",
-                  "name": "SortDirection",
-                  "ofType": null
-                }
-              },
-              "defaultValue": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            }
-          ],
-          "interfaces": null,
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "ENUM",
-          "name": "VariantGroupsSortColumns",
-          "description": null,
-          "fields": null,
-          "inputFields": null,
-          "interfaces": null,
-          "enumValues": [
-            {
-              "name": "NAME",
-              "description": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "GENE_NAMES",
-              "description": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "VARIANT_NAMES",
-              "description": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "VARIANT_COUNT",
-              "description": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "EVIDENCE_ITEM_COUNT",
-              "description": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            }
-          ],
-          "possibleTypes": null
-        },
         {
           "kind": "INPUT_OBJECT",
           "name": "VariantMenuSort",
@@ -46969,6 +49555,11 @@
               "name": "Factor",
               "ofType": null
             },
+            {
+              "kind": "OBJECT",
+              "name": "FactorVariant",
+              "ofType": null
+            },
             {
               "kind": "OBJECT",
               "name": "Feature",
@@ -46979,6 +49570,11 @@
               "name": "Gene",
               "ofType": null
             },
+            {
+              "kind": "OBJECT",
+              "name": "GeneVariant",
+              "ofType": null
+            },
             {
               "kind": "OBJECT",
               "name": "MolecularProfile",
diff --git a/client/src/app/views/molecular-profiles/molecular-profiles-detail/molecular-profiles-summary/molecular-profiles-summary.query.gql b/client/src/app/views/molecular-profiles/molecular-profiles-detail/molecular-profiles-summary/molecular-profiles-summary.query.gql
index cd59f2f04..6229fed4e 100644
--- a/client/src/app/views/molecular-profiles/molecular-profiles-detail/molecular-profiles-summary/molecular-profiles-summary.query.gql
+++ b/client/src/app/views/molecular-profiles/molecular-profiles-detail/molecular-profiles-summary/molecular-profiles-summary.query.gql
@@ -69,7 +69,7 @@ fragment MolecularProfileParsedName on MolecularProfileSegment {
   }
 }
 
-fragment VariantMolecularProfileCardFields on Variant {
+fragment VariantMolecularProfileCardFields on VariantInterface {
   id
   name
   link
@@ -87,31 +87,17 @@ fragment VariantMolecularProfileCardFields on Variant {
       deprecated
     }
   }
+  ... on GeneVariant {
+    ... GeneVariantSummaryFields
+  }
+  ... on FactorVariant {
+    ... FactorVariantSummaryFields
+  }
   variantAliases
-  clinvarIds
-  alleleRegistryId
-  openCravatUrl
   variantTypes {
     id
     link
     soid
     name
   }
-  referenceBuild
-  ensemblVersion
-  primaryCoordinates {
-    representativeTranscript
-    chromosome
-    start
-    stop
-  }
-  secondaryCoordinates {
-    representativeTranscript
-    chromosome
-    start
-    stop
-  }
-  referenceBases
-  variantBases
-  hgvsDescriptions
 }
diff --git a/client/src/app/views/variants/variants-detail/variants-detail.query.gql b/client/src/app/views/variants/variants-detail/variants-detail.query.gql
index 1c296ccb0..6ec96d317 100644
--- a/client/src/app/views/variants/variants-detail/variants-detail.query.gql
+++ b/client/src/app/views/variants/variants-detail/variants-detail.query.gql
@@ -4,7 +4,7 @@ query VariantDetail($variantId: Int!) {
   }
 }
 
-fragment VariantDetailFields on Variant {
+fragment VariantDetailFields on VariantInterface {
   id
   name
   deprecated
diff --git a/client/src/app/views/variants/variants-detail/variants-detail.view.html b/client/src/app/views/variants/variants-detail/variants-detail.view.html
index 72190484f..ac114a83b 100644
--- a/client/src/app/views/variants/variants-detail/variants-detail.view.html
+++ b/client/src/app/views/variants/variants-detail/variants-detail.view.html
@@ -60,6 +60,7 @@
           <span *nzSpaceItem>
             <button
               [routerLink]="['/variants', variant.id, 'revise']"
+              [queryParams]="{variantType: variant.__typename}"
               *ngIf="viewer?.signedIn"
               routerLinkActive
               #rlaComments="routerLinkActive"
diff --git a/client/src/app/views/variants/variants-detail/variants-summary/variants-summary.module.ts b/client/src/app/views/variants/variants-detail/variants-summary/variants-summary.module.ts
index 1df6f5c14..9ab27e282 100644
--- a/client/src/app/views/variants/variants-detail/variants-summary/variants-summary.module.ts
+++ b/client/src/app/views/variants/variants-detail/variants-summary/variants-summary.module.ts
@@ -1,53 +1,10 @@
 import { NgModule } from '@angular/core'
-import { CommonModule } from '@angular/common'
 import { VariantsSummaryPage } from './variants-summary.page'
-import { LetDirective, PushPipe } from '@ngrx/component'
-import { NzSpaceModule } from 'ng-zorro-antd/space'
-import { NzGridModule } from 'ng-zorro-antd/grid'
-import { CvcTagListModule } from '@app/components/shared/tag-list/tag-list.module'
-import { CvcSourceTagModule } from '@app/components/sources/source-tag/source-tag.module'
-import { NzDescriptionsModule } from 'ng-zorro-antd/descriptions'
-import { CvcVariantTypeTagModule } from '@app/components/variant-types/variant-type-tag/variant-type-tag.module'
-import { CvcLinkTagModule } from '@app/components/shared/link-tag/link-tag.module'
-import { CvcMyVariantInfoModule } from '@app/components/variants/my-variant-info/my-variant-info.module'
-import { CvcEmptyRevisableModule } from '@app/components/shared/empty-revisable/empty-revisable.module'
-import { CvcEventFeedModule } from '@app/components/events/event-feed/event-feed.module'
-import { NzCardModule } from 'ng-zorro-antd/card'
-import { NzTypographyModule } from 'ng-zorro-antd/typography'
-import { CvcPipesModule } from '@app/core/pipes/pipes.module'
-import { NzIconModule } from 'ng-zorro-antd/icon'
-import { CvcUserTagModule } from '@app/components/users/user-tag/user-tag.module'
-import { NzTagModule } from 'ng-zorro-antd/tag'
-import { CvcCoordinatesCardModule } from '@app/components/variants/coordinates-card/coordinates-card.module'
-import { CvcMolecularProfilesTableModule } from '@app/components/molecular-profiles/molecular-profile-table/molecular-profile-table.module'
-import { CvcFeatureTagModule } from '@app/components/features/feature-tag/feature-tag.module'
+import { CvcGeneVariantSummaryComponent } from '@app/components/variants/gene-variant-summary/gene-variant-summary.page'
 
 @NgModule({
   declarations: [VariantsSummaryPage],
-  imports: [
-    CommonModule,
-    LetDirective,
-    PushPipe,
-    NzSpaceModule,
-    NzGridModule,
-    NzDescriptionsModule,
-    NzCardModule,
-    NzTypographyModule,
-    NzIconModule,
-    NzTagModule,
-    CvcCoordinatesCardModule,
-    CvcPipesModule,
-    CvcTagListModule,
-    CvcUserTagModule,
-    CvcSourceTagModule,
-    CvcFeatureTagModule,
-    CvcVariantTypeTagModule,
-    CvcLinkTagModule,
-    CvcMyVariantInfoModule,
-    CvcEmptyRevisableModule,
-    CvcEventFeedModule,
-    CvcMolecularProfilesTableModule,
-  ],
+  imports: [CvcGeneVariantSummaryComponent],
   exports: [VariantsSummaryPage],
 })
 export class VariantsSummaryModule {}
diff --git a/client/src/app/views/variants/variants-detail/variants-summary/variants-summary.page.html b/client/src/app/views/variants/variants-detail/variants-summary/variants-summary.page.html
index cac238ad5..b403368ad 100644
--- a/client/src/app/views/variants/variants-detail/variants-summary/variants-summary.page.html
+++ b/client/src/app/views/variants/variants-detail/variants-summary/variants-summary.page.html
@@ -1,244 +1,7 @@
-<ng-container *ngIf="(variant$ | ngrxPush) as variant">
-  <!-- variant description, details, myvariantinfo row -->
-  <nz-row [nzGutter]="[8,16]">
-    <!-- LEFT COL -->
-    <nz-col [nzSpan]="12">
-      <!-- left col layout row -->
-      <nz-row [nzGutter]="[8,8]">
-        <!-- variant attributes block -->
-        <nz-col nzSpan="24">
-          <nz-descriptions
-            nzLayout="horizontal"
-            nzSize="small"
-            [nzColumn]="1"
-            nzBordered="true">
-            <!-- aliases -->
-            <nz-descriptions-item nzTitle="Aliases">
-              <ng-container
-                *ngIf="variant.variantAliases.length > 0; else noAliases">
-                <cvc-tag-list>
-                  <nz-tag *ngFor="let alias of variant.variantAliases"
-                    >{{ alias }}</nz-tag
-                  >
-                </cvc-tag-list>
-              </ng-container>
-              <ng-template #noAliases>
-                <span
-                  nz-typography
-                  nzType="secondary"
-                  >None specified</span
-                >
-              </ng-template>
-            </nz-descriptions-item>
-
-            <!-- variant type(s) -->
-            <nz-descriptions-item
-              [nzTitle]="variant.variantTypes.length > 1 ? 'Variant Types' : 'Variant Type'">
-              <ng-container
-                *ngIf="variant.variantTypes.length > 0; else noTypes">
-                <cvc-tag-list>
-                  <cvc-variant-type-tag
-                    [variantType]="type"
-                    *ngFor="let type of variant.variantTypes"></cvc-variant-type-tag>
-                </cvc-tag-list>
-              </ng-container>
-              <ng-template #noTypes>
-                <span
-                  nz-typography
-                  nzType="secondary"
-                  >None specified</span
-                >
-              </ng-template>
-            </nz-descriptions-item>
-
-            <!-- HGVS descriptions -->
-            <nz-descriptions-item
-              [nzTitle]="variant.hgvsDescriptions.length > 1 ? 'HGVS Descriptions' : 'HGVS Description'">
-              <ng-container
-                *ngIf="variant.hgvsDescriptions.length > 0; else noDescriptions">
-                <cvc-tag-list>
-                  <nz-tag *ngFor="let desc of variant.hgvsDescriptions"
-                    >{{ desc }}</nz-tag
-                  >
-                </cvc-tag-list>
-              </ng-container>
-              <ng-template #noDescriptions>
-                <span
-                  nz-typography
-                  nzType="secondary"
-                  >None specified</span
-                >
-              </ng-template>
-            </nz-descriptions-item>
-
-            <!-- MANE Select Transcript -->
-            <nz-descriptions-item nzTitle="MANE Select Transcript">
-              <ng-container *ngIf="variant.maneSelectTranscript; else noMane">
-                <cvc-tag-list>
-                  <nz-tag>{{variant.maneSelectTranscript}}</nz-tag>
-                </cvc-tag-list>
-              </ng-container>
-              <ng-template #noMane>
-                <span nz-typography
-                  nzType="secondary">None found</span>
-              </ng-template>
-            </nz-descriptions-item>
-
-          </nz-descriptions>
-        </nz-col>
-        <!-- coordinates -->
-        <nz-col [nzSpan]="24">
-          <cvc-coordinates-card
-            [cvcVariantId]="variant.id"></cvc-coordinates-card>
-        </nz-col>
-      </nz-row>
-    </nz-col>
-
-    <!-- RIGHT COLUMN -->
-    <nz-col nzSpan="12">
-      <!-- right col layout row -->
-      <nz-row [nzGutter]="[8,8]">
-        <!-- BLOCK: creation and deprecation events -->
-        <nz-col [nzSpan]="24">
-         <nz-descriptions nzLayout="vertical"
-            nzSize="small"
-            [nzColumn]="{ xxl: 2, xl: 2, lg: 1, md: 1, sm: 1, xs: 1 }"
-            nzBordered="true">
-
-            <!-- creation/deprecation curation events -->
-            <ng-container *ngIf="variant.creationActivity">
-              <nz-descriptions-item [nzTitle]="createdTitle">
-                by
-                <cvc-user-tag [user]="variant.creationActivity.user"></cvc-user-tag>
-              </nz-descriptions-item>
-              <ng-template #createdTitle>
-                Created
-                <span nz-typography
-                  nzType="secondary">
-                  ({{ variant.creationActivity.createdAt | timeAgo }})
-                </span>
-              </ng-template>
-            </ng-container>
-            <ng-container *ngIf="variant.deprecationActivity">
-              <nz-descriptions-item
-                [nzTitle]="deprecatedTitle">
-                by
-                <cvc-user-tag [user]="variant.deprecationActivity.user"></cvc-user-tag>
-              </nz-descriptions-item>
-              <ng-template #deprecatedTitle>
-                Deprecated
-                <span nz-typography
-                  nzType="secondary">
-                  ({{ variant.deprecationActivity.createdAt | timeAgo }})
-                </span>
-              </ng-template>
-            </ng-container>
-          </nz-descriptions>
-        </nz-col>
-
-        <!-- variant related entities, attributes -->
-        <nz-col [nzSpan]="24">
-          <nz-descriptions
-            nzLayout="horizontal"
-            nzSize="small"
-            [nzColumn]="{ xxl: 2, xl: 2, lg: 1, md: 1, sm: 1, xs: 1 }"
-            nzBordered="true">
-            <!-- feature -->
-            <nz-descriptions-item [nzTitle]="variant.feature.__typename">
-              <cvc-feature-tag [feature]="variant.feature"></cvc-feature-tag>
-            </nz-descriptions-item>
-
-            <!-- allele reg. id -->
-            <nz-descriptions-item nzTitle="Allele Registry ID">
-              <cvc-link-tag
-                *ngIf="variant.alleleRegistryId && variant.alleleRegistryId != 'unregistered'; else noAlleleRegistry"
-                [href]="'https://reg.genome.network/allele/' + variant.alleleRegistryId + '.html'"
-                tooltip="View on ClinGen Allele Registry">
-                {{ variant.alleleRegistryId }}
-              </cvc-link-tag>
-              <ng-template #noAlleleRegistry>
-                <span
-                  nz-typography
-                  nzType="secondary"
-                  >Unregistered</span
-                >
-              </ng-template>
-            </nz-descriptions-item>
-
-            <!-- clinvar ids-->
-            <nz-descriptions-item
-              [nzTitle]="variant.clinvarIds.length > 1 ? 'ClinVar IDs' : 'ClinVar ID'">
-              <ng-container
-                *ngIf="variant.clinvarIds.length > 0 else noClinvarIds">
-                <cvc-tag-list
-                  *ngIf="variant.clinvarIds[0] !== 'N/A' && variant.clinvarIds[0] !== 'NONE FOUND' else clinvarNotApplicable">
-                  <ng-container *ngFor="let id of variant.clinvarIds">
-                    <cvc-link-tag
-                      [href]="'https://www.ncbi.nlm.nih.gov/clinvar/variation/' + id"
-                      tooltip="View on ClinVar">
-                      {{ id }}
-                    </cvc-link-tag>
-                  </ng-container>
-                </cvc-tag-list>
-              </ng-container>
-
-              <ng-template #clinvarNotApplicable>
-                <span
-                  nz-typography
-                  nzType="secondary"
-                  >{{ variant.clinvarIds[0] }}</span
-                >
-              </ng-template>
-
-              <ng-template #noClinvarIds>
-                <span
-                  nz-typography
-                  nzType="secondary"
-                  >None provided</span
-                >
-              </ng-template>
-            </nz-descriptions-item>
-
-            <nz-descriptions-item
-              *ngIf="variant.openCravatUrl"
-              nzTitle="OpenCRAVAT">
-              <cvc-link-tag
-                [href]="variant.openCravatUrl"
-                tooltip="View on OpenCRAVAT">
-                Variant Report
-              </cvc-link-tag>
-            </nz-descriptions-item>
-          </nz-descriptions>
-        </nz-col>
-
-        <!-- myvariant info -->
-        <ng-container
-          *ngIf="variantInfo$ | ngrxPush as variantInfo else noVariantInfo">
-          <nz-col [nzSpan]="24">
-            <cvc-my-variant-info
-              [variantInfo]="variantInfo"></cvc-my-variant-info>
-          </nz-col>
-        </ng-container>
-        <ng-template #noVariantInfo>
-          <nz-col [nzSpan]="24">
-            <nz-card nzTitle="MyVariantInfo">
-              <cvc-empty-revisable
-                notification="Not available, provide Representative Variant Coordinates">
-              </cvc-empty-revisable>
-            </nz-card>
-          </nz-col>
-        </ng-template>
-      </nz-row>
-    </nz-col>
-    <!-- END RIGHT COL -->
-
-    <!-- evidence table -->
-    <nz-col nzSpan="24">
-      <cvc-molecular-profiles-table
-        [variantId]="variant.id"
-        cvcHeight="300px"
-        cvcTitle="{{variant.name}} Molecular Profiles">
-      </cvc-molecular-profiles-table>
-    </nz-col>
-  </nz-row>
+<ng-container *ngIf="variant$ | ngrxPush as variant">
+  <!-- prettier-ignore -->
+  @switch(variant.__typename) {
+    @case('GeneVariant') {
+  <cvc-gene-variant-summary [variant]="variant"></cvc-gene-variant-summary>
+  } @case('FactorVariant') { TBD } }
 </ng-container>
diff --git a/client/src/app/views/variants/variants-detail/variants-summary/variants-summary.page.ts b/client/src/app/views/variants/variants-detail/variants-summary/variants-summary.page.ts
index 6bfd310ee..2ab4cbaec 100644
--- a/client/src/app/views/variants/variants-detail/variants-summary/variants-summary.page.ts
+++ b/client/src/app/views/variants/variants-detail/variants-summary/variants-summary.page.ts
@@ -8,7 +8,6 @@ import {
   VariantSummaryFieldsFragment,
   SubscribableInput,
   SubscribableEntities,
-  MyVariantInfoFieldsFragment,
 } from '@app/generated/civic.apollo'
 import { QueryRef } from 'apollo-angular'
 import { startWith } from 'rxjs/operators'
@@ -26,7 +25,6 @@ export class VariantsSummaryPage {
   queryRef: QueryRef<VariantSummaryQuery, VariantSummaryQueryVariables>
   loading$: Observable<boolean>
   variant$: Observable<Maybe<VariantSummaryFieldsFragment>>
-  variantInfo$: Observable<Maybe<MyVariantInfoFieldsFragment>>
 
   subscribable: SubscribableInput
 
@@ -50,10 +48,6 @@ export class VariantsSummaryPage {
 
     this.variant$ = observable.pipe(pluck('data', 'variant'))
 
-    this.variantInfo$ = observable.pipe(
-      pluck('data', 'variant', 'myVariantInfo')
-    )
-
     this.subscribable = {
       entityType: SubscribableEntities.Variant,
       id: queryVariantId,
diff --git a/client/src/app/views/variants/variants-detail/variants-summary/variants-summary.query.gql b/client/src/app/views/variants/variants-detail/variants-summary/variants-summary.query.gql
index 250d5e88d..83134a492 100644
--- a/client/src/app/views/variants/variants-detail/variants-summary/variants-summary.query.gql
+++ b/client/src/app/views/variants/variants-detail/variants-summary/variants-summary.query.gql
@@ -4,7 +4,7 @@ query VariantSummary($variantId: Int!) {
   }
 }
 
-fragment VariantSummaryFields on Variant {
+fragment VariantSummaryFields on VariantInterface {
   id
   name
   feature {
@@ -14,33 +14,12 @@ fragment VariantSummaryFields on Variant {
     link
   }
   variantAliases
-  alleleRegistryId
-  openCravatUrl
-  maneSelectTranscript
   variantTypes {
     id
     link
     soid
     name
   }
-  hgvsDescriptions
-  clinvarIds
-  referenceBuild
-  ensemblVersion
-  primaryCoordinates {
-    representativeTranscript
-    chromosome
-    start
-    stop
-  }
-  secondaryCoordinates {
-    representativeTranscript
-    chromosome
-    start
-    stop
-  }
-  referenceBases
-  variantBases
   flags(state: OPEN) {
     totalCount
   }
@@ -50,9 +29,6 @@ fragment VariantSummaryFields on Variant {
   comments {
     totalCount
   }
-  myVariantInfo {
-    ...MyVariantInfoFields
-  }
   lastSubmittedRevisionEvent {
     originatingUser {
       id
@@ -87,6 +63,44 @@ fragment VariantSummaryFields on Variant {
     }
     createdAt
   }
+  ... on GeneVariant {
+    ... GeneVariantSummaryFields
+  }
+  ... on FactorVariant {
+    ... FactorVariantSummaryFields
+  }
+}
+
+
+fragment FactorVariantSummaryFields on FactorVariant {
+  ncitId
+}
+
+fragment GeneVariantSummaryFields on GeneVariant {
+  alleleRegistryId
+  openCravatUrl
+  maneSelectTranscript
+  hgvsDescriptions
+  clinvarIds
+  referenceBuild
+  ensemblVersion
+  primaryCoordinates {
+    representativeTranscript
+    chromosome
+    start
+    stop
+  }
+  secondaryCoordinates {
+    representativeTranscript
+    chromosome
+    start
+    stop
+  }
+  referenceBases
+  variantBases
+  myVariantInfo {
+    ...MyVariantInfoFields
+  }
 }
 
 fragment MyVariantInfoFields on MyVariantInfo {
diff --git a/client/src/app/views/variants/variants-revise/variants-suggest/variants-suggest.module.ts b/client/src/app/views/variants/variants-revise/variants-suggest/variants-suggest.module.ts
index bd17b6d64..d7bd8700b 100644
--- a/client/src/app/views/variants/variants-revise/variants-suggest/variants-suggest.module.ts
+++ b/client/src/app/views/variants/variants-revise/variants-suggest/variants-suggest.module.ts
@@ -1,10 +1,10 @@
 import { NgModule } from '@angular/core'
 import { CommonModule } from '@angular/common'
 import { VariantsSuggestPage } from './variants-suggest.page'
-import { CvcVariantReviseFormModule } from '@app/forms/config/variant-revise/variant-revise.form.module'
+import { CvcGeneVariantReviseFormModule } from '@app/forms/config/gene-variant-revise/gene-variant-revise.form.module'
 
 @NgModule({
   declarations: [VariantsSuggestPage],
-  imports: [CommonModule, CvcVariantReviseFormModule],
+  imports: [CommonModule, CvcGeneVariantReviseFormModule],
 })
 export class VariantsSuggestModule {}
diff --git a/client/src/app/views/variants/variants-revise/variants-suggest/variants-suggest.page.html b/client/src/app/views/variants/variants-revise/variants-suggest/variants-suggest.page.html
index 14183c7d9..b0cd3318f 100644
--- a/client/src/app/views/variants/variants-revise/variants-suggest/variants-suggest.page.html
+++ b/client/src/app/views/variants/variants-revise/variants-suggest/variants-suggest.page.html
@@ -1,4 +1,7 @@
-<ng-container *ngIf="variantId; else loadingVariant">
-  <cvc-variant-revise-form [variantId]="variantId"> </cvc-variant-revise-form>
+<ng-container *ngIf="variantId && variantType; else loadingVariant">
+  @switch(variantType) { @case("GeneVariant") {
+  <cvc-gene-variant-revise-form [variantId]="variantId">
+  </cvc-gene-variant-revise-form>
+  } @case("FactorVariant") { TBD } }
 </ng-container>
 <ng-template #loadingVariant>Loading Variant...</ng-template>
diff --git a/client/src/app/views/variants/variants-revise/variants-suggest/variants-suggest.page.ts b/client/src/app/views/variants/variants-revise/variants-suggest/variants-suggest.page.ts
index cc265d8fe..bdec6d9f3 100644
--- a/client/src/app/views/variants/variants-revise/variants-suggest/variants-suggest.page.ts
+++ b/client/src/app/views/variants/variants-revise/variants-suggest/variants-suggest.page.ts
@@ -8,15 +8,23 @@ import { Subscription } from 'rxjs'
 })
 export class VariantsSuggestPage implements OnDestroy {
   variantId?: number
+  variantType?: string
   routeParams$: Subscription
+  queryParams$: Subscription
 
   constructor(private route: ActivatedRoute) {
     this.routeParams$ = this.route.params.subscribe((params) => {
       this.variantId = +params.variantId
     })
+    this.queryParams$ = this.route.queryParamMap.subscribe((params) => {
+      if (params.has('variantType')) {
+        this.variantType = params.get('variantType')!
+      }
+    })
   }
 
   ngOnDestroy(): void {
     this.routeParams$.unsubscribe()
+    this.queryParams$.unsubscribe()
   }
 }
diff --git a/server/app/graphql/mutations/create_variant.rb b/server/app/graphql/mutations/create_variant.rb
index 5242b5cca..ef8b604ea 100644
--- a/server/app/graphql/mutations/create_variant.rb
+++ b/server/app/graphql/mutations/create_variant.rb
@@ -8,7 +8,7 @@ class Mutations::CreateVariant < Mutations::MutationWithOrg
   argument :feature_id, Int, required: true,
     description: 'The CIViC ID of the Feature to which the new variant belongs.'
 
-  field :variant, Types::Entities::VariantType, null: false,
+  field :variant, Types::Interfaces::VariantInterface, null: false,
     description: 'The newly created Variant.'
 
   field :molecular_profile, Types::Entities::MolecularProfileType, null: false,
diff --git a/server/app/graphql/mutations/deprecate_feature.rb b/server/app/graphql/mutations/deprecate_feature.rb
index 8264abb7c..686af16fe 100644
--- a/server/app/graphql/mutations/deprecate_feature.rb
+++ b/server/app/graphql/mutations/deprecate_feature.rb
@@ -16,7 +16,7 @@ class Mutations::DeprecateFeature < Mutations::MutationWithOrg
   field :feature, Types::Entities::FeatureType, null: true,
     description: 'The deprecated Feature.'
 
-  field :newly_deprecated_variants, [Types::Entities::VariantType], null: true,
+  field :newly_deprecated_variants, [Types::Interfaces::VariantInterface], null: true,
     description: 'The variants linked to this feature that are newly deprecated.'
 
   field :newly_deprecated_molecular_profiles, [Types::Entities::MolecularProfileType], null: true,
diff --git a/server/app/graphql/mutations/deprecate_variant.rb b/server/app/graphql/mutations/deprecate_variant.rb
index 7ff0b24c5..7a72f62da 100644
--- a/server/app/graphql/mutations/deprecate_variant.rb
+++ b/server/app/graphql/mutations/deprecate_variant.rb
@@ -13,7 +13,7 @@ class Mutations::DeprecateVariant < Mutations::MutationWithOrg
     validates: { length: { minimum: 10 } },
     description: 'Text giving more context for deprecation this variant.'
 
-  field :variant, Types::Entities::VariantType, null: true,
+  field :variant, Types::Interfaces::VariantInterface, null: true,
     description: 'The deprecated Variant.'
 
   field :newly_deprecated_molecular_profiles, [Types::Entities::MolecularProfileType], null: true,
diff --git a/server/app/graphql/mutations/suggest_variant_revision.rb b/server/app/graphql/mutations/suggest_gene_variant_revision.rb
similarity index 87%
rename from server/app/graphql/mutations/suggest_variant_revision.rb
rename to server/app/graphql/mutations/suggest_gene_variant_revision.rb
index 28ed51836..1d0ce8443 100644
--- a/server/app/graphql/mutations/suggest_variant_revision.rb
+++ b/server/app/graphql/mutations/suggest_gene_variant_revision.rb
@@ -1,9 +1,9 @@
-class Mutations::SuggestVariantRevision < Mutations::MutationWithOrg
+class Mutations::SuggestGeneVariantRevision < Mutations::MutationWithOrg
   description 'Suggest a Revision to a Variant entity.'
   argument :id, Int, required: true,
     description: 'The ID of the Variant to suggest a Revision to.'
 
-  argument :fields, Types::Revisions::VariantFields, required: true,
+  argument :fields, Types::Revisions::GeneVariantFields, required: true,
     description: <<~DOC.strip
       The desired state of the Variant's editable fields if the change were applied.
       If no change is desired for a particular field, pass in the current value of that field.
@@ -13,7 +13,7 @@ class Mutations::SuggestVariantRevision < Mutations::MutationWithOrg
     validates: { length: { minimum: 10 } },
     description: 'Text describing the reason for the change. Will be attached to the Revision as a comment.'
 
-  field :variant, Types::Entities::VariantType, null: false,
+  field :variant, Types::Interfaces::VariantInterface, null: false,
     description: 'The Variant the user has proposed a Revision to.'
 
   field :results, [Types::Revisions::RevisionResult], null: false,
@@ -36,6 +36,10 @@ def ready?(organization_id: nil, id:, fields:, **kwargs)
       raise GraphQL::ExecutionError, "Variant with id #{id} doesn't exist."
     end
 
+    if !variant.is_a?(Variants::GeneVariant)
+      raise GraphQL::ExecutionError, "Variant with id #{id} is a #{variant.type} and you called the GeneVariant mutation."
+    end
+
     @variant = variant
 
     if !Feature.find_by(id: fields.feature_id)
diff --git a/server/app/graphql/resolvers/quicksearch.rb b/server/app/graphql/resolvers/quicksearch.rb
index 065e0a98c..b26dd402f 100644
--- a/server/app/graphql/resolvers/quicksearch.rb
+++ b/server/app/graphql/resolvers/quicksearch.rb
@@ -33,7 +33,7 @@ def resolve(query:, types: nil, highlight_matches: false)
                   models: query_targets,
                   highlight: tag,
                   limit: 10,
-                  fields: ['id^10', 'name', 'aliases', 'gene', 'feature_type']
+                  fields: ['id^10', 'name', 'aliases', 'feature', 'feature_type']
                 ).with_highlights(multiple: true)
 
     results.map do |res, highlights|
diff --git a/server/app/graphql/resolvers/top_level_variants.rb b/server/app/graphql/resolvers/top_level_variants.rb
index 4ee52c2e9..d89d08ee1 100644
--- a/server/app/graphql/resolvers/top_level_variants.rb
+++ b/server/app/graphql/resolvers/top_level_variants.rb
@@ -3,7 +3,7 @@
 class Resolvers::TopLevelVariants < GraphQL::Schema::Resolver
   include SearchObject.module(:graphql)
 
-  type Types::Entities::VariantType.connection_type, null: false
+  type Types::Interfaces::VariantInterface.connection_type, null: false
 
   description 'List and filter variants.'
 
diff --git a/server/app/graphql/resolvers/variants.rb b/server/app/graphql/resolvers/variants.rb
index ccf042021..89c90d7ff 100644
--- a/server/app/graphql/resolvers/variants.rb
+++ b/server/app/graphql/resolvers/variants.rb
@@ -4,7 +4,7 @@
 class Resolvers::Variants < GraphQL::Schema::Resolver
   include SearchObject.module(:graphql)
 
-  type Types::Entities::VariantType.connection_type, null: false
+  type Types::Interfaces::VariantInterface.connection_type, null: false
 
   description 'List and filter variants.'
 
diff --git a/server/app/graphql/types/activities/deprecate_feature_activity_type.rb b/server/app/graphql/types/activities/deprecate_feature_activity_type.rb
index 91671135d..844e819c1 100644
--- a/server/app/graphql/types/activities/deprecate_feature_activity_type.rb
+++ b/server/app/graphql/types/activities/deprecate_feature_activity_type.rb
@@ -3,7 +3,7 @@ class DeprecateFeatureActivityType < Types::BaseObject
     implements Types::Interfaces::ActivityInterface
 
     field :molecular_profiles, [Types::Entities::MolecularProfileType], null: false
-    field :variants, [Types::Entities::VariantType], null: false
+    field :variants, [Types::Interfaces::VariantInterface], null: false
 
     def molecular_profiles
       Loaders::AssociationLoader.for(DeprecateFeatureActivity, :linked_molecular_profiles).load(object)
diff --git a/server/app/graphql/types/entities/molecular_profile_type.rb b/server/app/graphql/types/entities/molecular_profile_type.rb
index 07df26c9b..e702713b1 100644
--- a/server/app/graphql/types/entities/molecular_profile_type.rb
+++ b/server/app/graphql/types/entities/molecular_profile_type.rb
@@ -13,7 +13,7 @@ class MolecularProfileType < Types::BaseObject
       description: 'The human readable name of this profile, including gene and variant names.'
     field :parsed_name, [Types::MolecularProfile::MolecularProfileSegmentType], null: false, 
       description: 'The profile name with its constituent parts as objects, suitable for building tags.'
-    field :variants, [Types::Entities::VariantType], null: false,
+    field :variants, [Types::Interfaces::VariantInterface], null: false,
       description: 'The collection of variants included in this molecular profile. Please note the name for their relation to each other.'
     field :assertions, Types::Entities::AssertionType.connection_type, null: false,
       description: 'The collection of assertions associated with this molecular profile.'
@@ -24,7 +24,7 @@ class MolecularProfileType < Types::BaseObject
     field :molecular_profile_aliases, [String], null: false
     field :deprecated, Boolean, null: false
     field :deprecation_reason, Types::MolecularProfileDeprecationReasonType, null: true
-    field :deprecated_variants, [Types::Entities::VariantType], null: false
+    field :deprecated_variants, [Types::Interfaces::VariantInterface], null: false
     field :variant_deprecation_activity, Types::Activities::DeprecateVariantActivityType, null: true
     field :complex_molecular_profile_deprecation_activity, Types::Activities::DeprecateComplexMolecularProfileActivityType, null: true
     field :molecular_profile_score, Float, null: false
diff --git a/server/app/graphql/types/entities/variant_type.rb b/server/app/graphql/types/entities/variant_type.rb
index ab2b22e95..bc486ee37 100644
--- a/server/app/graphql/types/entities/variant_type.rb
+++ b/server/app/graphql/types/entities/variant_type.rb
@@ -1,130 +1,5 @@
 module Types::Entities
   class VariantType < Types::BaseObject
-    connection_type_class Types::Connections::VariantsConnection
-
-    implements Types::Interfaces::Commentable
-    implements Types::Interfaces::Flaggable
-    implements Types::Interfaces::WithRevisions
-    implements Types::Interfaces::EventSubject
-    implements Types::Interfaces::EventOriginObject
-    implements Types::Interfaces::MolecularProfileComponent
-
-    field :id, Int, null: false
-    field :name, String, null: false
-    field :feature, Types::Entities::FeatureType, null: false
-    field :reference_build, Types::ReferenceBuildType, null: true
-    field :ensembl_version, Int, null: true
-    field :primary_coordinates, Types::Entities::CoordinateType, null: true
-    field :secondary_coordinates, Types::Entities::CoordinateType, null: true
-    field :reference_bases, String, null: true
-    field :variant_bases, String, null: true
-    field :allele_registry_id, String, null: true
-    field :variant_aliases, [String], null: false
-    field :variant_types, [Types::Entities::VariantTypeType], null: false
-    field :clinvar_ids, [String], null: false
-    field :hgvs_descriptions, [String], null: false
-    field :my_variant_info, Types::Entities::MyVariantInfoType, null: true
-    field :mane_select_transcript, String, null: true
-    field :link, String, null: false
-    field :single_variant_molecular_profile, Types::Entities::MolecularProfileType, null: false
-    field :single_variant_molecular_profile_id, Int, null: false
-    field :deprecation_activity, Types::Activities::DeprecateVariantActivityType, null: true
-    field :deprecated, Boolean, null: false
-    field :deprecation_reason, Types::VariantDeprecationReasonType, null: true
-    field :creation_activity, Types::Activities::CreateVariantActivityType, null: true #TODO: should try to make this non-nullable if complete backfill is possible
-    field :molecular_profiles, Types::Entities::MolecularProfileType.connection_type, null: false
-    field :open_cravat_url, String, null: true
-
-    def feature
-      Loaders::AssociationLoader.for(Variant, :feature).load(object)
-    end
-
-    def variant_types
-      Loaders::AssociationLoader.for(Variant, :variant_types).load(object)
-    end
-
-    def molecular_profiles
-      Loaders::AssociationLoader.for(Variant, :molecular_profiles).load(object)
-    end
-
-    def single_variant_molecular_profile
-      Loaders::AssociationLoader.for(Variant, :single_variant_molecular_profile).load(object)
-    end
-
-    def deprecation_activity
-      Loaders::AssociationLoader.for(Variant, :deprecation_activity).load(object)
-    end
-
-    def creation_activity
-      Loaders::AssociationLoader.for(Variant, :creation_activity).load(object)
-    end
-
-    def primary_coordinates
-      if (object.representative_transcript.blank? && object.chromosome.blank? && object.start.blank? && object.stop.blank?)
-        return nil
-      else
-        return {
-          representative_transcript: object.representative_transcript,
-          chromosome: object.chromosome,
-          start: object.start,
-          stop: object.stop,
-        }
-      end
-    end
-
-    def secondary_coordinates
-      if (object.representative_transcript2.blank? && object.chromosome2.blank? && object.start2.blank? && object.stop2.blank?)
-        return nil
-      else
-        return {
-          representative_transcript: object.representative_transcript2,
-          chromosome: object.chromosome2,
-          start: object.start2,
-          stop: object.stop2,
-        }
-      end
-    end
-
-    def variant_bases
-      if (object.variant_bases.blank?)
-        return nil
-      else
-        return object.variant_bases
-      end
-    end
-
-    def reference_bases
-      if (object.reference_bases.blank?)
-        return nil
-      else
-        return object.reference_bases
-      end
-    end
-
-    def variant_aliases
-      Loaders::AssociationLoader.for(Variant, :variant_aliases).load(object).then do |va|
-        va.map(&:name)
-      end
-    end
-
-    def clinvar_ids
-      Loaders::AssociationLoader.for(Variant, :clinvar_entries).load(object).then do |clinvar_entries|
-        clinvar_entries.map(&:clinvar_id)
-      end
-    end
-
-    def hgvs_descriptions
-      Loaders::AssociationLoader.for(Variant, :hgvs_descriptions).load(object).then do |hgvs|
-        hgvs.map(&:description)
-      end
-    end
-
-    def my_variant_info
-      MyVariantInfo.new(object).response
-    end
-
-    def mane_select_transcript
-      ManeSelectTranscript.new(object).mane_select_transcript
-    end
+    implements Types::Interfaces::VariantInterface
   end
 end
diff --git a/server/app/graphql/types/interfaces/commentable.rb b/server/app/graphql/types/interfaces/commentable.rb
index 3ccb3ef24..e23c4d63b 100644
--- a/server/app/graphql/types/interfaces/commentable.rb
+++ b/server/app/graphql/types/interfaces/commentable.rb
@@ -24,7 +24,7 @@ def resolve_type(object, context)
         when Source
           Types::Entities::SourceType
         when Variant
-          Types::Entities::VariantType
+          Types::Interfaces::VariantInterface
         when VariantGroup
           Types::Entities::VariantGroupType
         when Source
diff --git a/server/app/graphql/types/interfaces/event_origin_object.rb b/server/app/graphql/types/interfaces/event_origin_object.rb
index 2cb945bcc..2b181fb72 100644
--- a/server/app/graphql/types/interfaces/event_origin_object.rb
+++ b/server/app/graphql/types/interfaces/event_origin_object.rb
@@ -37,7 +37,7 @@ def resolve_type(object, context)
         when SourceSuggestion
           Types::Entities::SourceSuggestionType
         when Variant
-          Types::Entities::VariantType
+          Types::Interfaces::VariantInterface
         when MolecularProfile
           Types::Entities::MolecularProfileType
         when Feature
diff --git a/server/app/graphql/types/interfaces/event_subject.rb b/server/app/graphql/types/interfaces/event_subject.rb
index 7af62074a..13d41d9c8 100644
--- a/server/app/graphql/types/interfaces/event_subject.rb
+++ b/server/app/graphql/types/interfaces/event_subject.rb
@@ -16,7 +16,7 @@ def resolve_type(object, context)
         when Feature
           Types::Entities::FeatureType
         when Variant
-          Types::Entities::VariantType
+          Types::Interfaces::VariantInterface
         when EvidenceItem
           Types::Entities::EvidenceItemType
         when Assertion
diff --git a/server/app/graphql/types/interfaces/flaggable.rb b/server/app/graphql/types/interfaces/flaggable.rb
index fa370cd29..b37585502 100644
--- a/server/app/graphql/types/interfaces/flaggable.rb
+++ b/server/app/graphql/types/interfaces/flaggable.rb
@@ -17,7 +17,7 @@ def resolve_type(object, context)
         when Feature
           Types::Entities::FeatureType
         when Variant
-          Types::Entities::VariantType
+          Types::Interfaces::VariantInterface
         when EvidenceItem
           Types::Entities::EvidenceItemType
         when Assertion
diff --git a/server/app/graphql/types/interfaces/molecular_profile_component.rb b/server/app/graphql/types/interfaces/molecular_profile_component.rb
index a93a02fe0..64701e599 100644
--- a/server/app/graphql/types/interfaces/molecular_profile_component.rb
+++ b/server/app/graphql/types/interfaces/molecular_profile_component.rb
@@ -24,7 +24,7 @@ def resolve_type(object, context)
         when Feature
           Types::Entities::FeatureType
         when Variant
-          Types::Entities::VariantType
+          Types::Interfaces::VariantInterface
         else
           raise "Unexpected MolecularProfileTag type: #{object.class}"
         end
diff --git a/server/app/graphql/types/interfaces/variant_interface.rb b/server/app/graphql/types/interfaces/variant_interface.rb
new file mode 100644
index 000000000..f2c7819cc
--- /dev/null
+++ b/server/app/graphql/types/interfaces/variant_interface.rb
@@ -0,0 +1,75 @@
+module Types::Interfaces
+  module VariantInterface
+    include Types::BaseInterface
+    connection_type_class Types::Connections::VariantsConnection
+
+    implements Types::Interfaces::Commentable
+    implements Types::Interfaces::Flaggable
+    implements Types::Interfaces::WithRevisions
+    implements Types::Interfaces::EventSubject
+    implements Types::Interfaces::EventOriginObject
+    implements Types::Interfaces::MolecularProfileComponent
+
+    field :id, Int, null: false
+    field :name, String, null: false
+    field :feature, Types::Entities::FeatureType, null: false
+    field :variant_types, [Types::Entities::VariantTypeType], null: false
+    field :link, String, null: false
+    field :variant_aliases, [String], null: false
+    field :single_variant_molecular_profile, Types::Entities::MolecularProfileType, null: false
+    field :single_variant_molecular_profile_id, Int, null: false
+    field :deprecation_activity, Types::Activities::DeprecateVariantActivityType, null: true
+    field :deprecated, Boolean, null: false
+    field :deprecation_reason, Types::VariantDeprecationReasonType, null: true
+    field :creation_activity, Types::Activities::CreateVariantActivityType, null: true #TODO: should try to make this non-nullable if complete backfill is possible
+    field :molecular_profiles, Types::Entities::MolecularProfileType.connection_type, null: false
+
+    def feature
+      Loaders::AssociationLoader.for(Variant, :feature).load(object)
+    end
+
+    def variant_types
+      Loaders::AssociationLoader.for(Variant, :variant_types).load(object)
+    end
+
+    def molecular_profiles
+      Loaders::AssociationLoader.for(Variant, :molecular_profiles).load(object)
+    end
+
+    def single_variant_molecular_profile
+      Loaders::AssociationLoader.for(Variant, :single_variant_molecular_profile).load(object)
+    end
+
+    def deprecation_activity
+      Loaders::AssociationLoader.for(Variant, :deprecation_activity).load(object)
+    end
+
+    def creation_activity
+      Loaders::AssociationLoader.for(Variant, :creation_activity).load(object)
+    end
+
+    def variant_aliases
+      Loaders::AssociationLoader.for(Variant, :variant_aliases).load(object).then do |va|
+        va.map(&:name)
+      end
+    end
+
+    orphan_types(
+      Types::Variants::FactorVariantType,
+      Types::Variants::GeneVariantType,
+    )
+
+    definition_methods do
+      def resolve_type(object, context)
+        case object
+        when Variants::GeneVariant
+          Types::Variants::GeneVariantType
+        when Variants::FactorVariant
+          Types::Variants::FactorVariantType
+        else
+          raise "Unexpected Variant type #{object.class}"
+        end
+      end
+    end
+  end
+end
diff --git a/server/app/graphql/types/molecular_profile/molecular_profile_name_preview_type.rb b/server/app/graphql/types/molecular_profile/molecular_profile_name_preview_type.rb
index 9ea54a90f..f2198c645 100644
--- a/server/app/graphql/types/molecular_profile/molecular_profile_name_preview_type.rb
+++ b/server/app/graphql/types/molecular_profile/molecular_profile_name_preview_type.rb
@@ -3,6 +3,6 @@ class MolecularProfileNamePreviewType < Types::BaseObject
     field :segments, [Types::MolecularProfile::MolecularProfileSegmentType], null: false
     field :existing_molecular_profile, Types::Entities::MolecularProfileType, null: true,
       description: 'The already existing MP matching this name, if it exists'
-    field :deprecated_variants, [Types::Entities::VariantType], null: false
+    field :deprecated_variants, [Types::Interfaces::VariantInterface], null: false
   end
 end
diff --git a/server/app/graphql/types/mutation_type.rb b/server/app/graphql/types/mutation_type.rb
index 974271c66..93cd123ab 100644
--- a/server/app/graphql/types/mutation_type.rb
+++ b/server/app/graphql/types/mutation_type.rb
@@ -6,7 +6,7 @@ class MutationType < Types::BaseObject
     #revisions
     field :suggest_gene_revision, mutation: Mutations::SuggestGeneRevision
     field :suggest_factor_revision, mutation: Mutations::SuggestFactorRevision
-    field :suggest_variant_revision, mutation: Mutations::SuggestVariantRevision
+    field :suggest_gene_variant_revision, mutation: Mutations::SuggestGeneVariantRevision
     field :suggest_molecular_profile_revision, mutation: Mutations::SuggestMolecularProfileRevision
     field :suggest_evidence_item_revision, mutation: Mutations::SuggestEvidenceItemRevision
     field :suggest_assertion_revision, mutation: Mutations::SuggestAssertionRevision
diff --git a/server/app/graphql/types/query_type.rb b/server/app/graphql/types/query_type.rb
index ac533f081..9a821e760 100644
--- a/server/app/graphql/types/query_type.rb
+++ b/server/app/graphql/types/query_type.rb
@@ -64,7 +64,7 @@ def authorized?(object, args, context)
       argument :id, Int, required: false
     end
 
-    field :variant, Types::Entities::VariantType, null: true do
+    field :variant, Types::Interfaces::VariantInterface, null: true do
       description "Find a variant by CIViC ID"
       argument :id, Int, required: true
     end
@@ -193,7 +193,6 @@ def authorized?(object, args, context)
 
     field :activities, resolver: Resolvers::Activities
 
-
     def molecular_profile(id: )
       ::MolecularProfile.find_by(id: id)
     end
diff --git a/server/app/graphql/types/revisions/variant_fields.rb b/server/app/graphql/types/revisions/gene_variant_fields.rb
similarity index 93%
rename from server/app/graphql/types/revisions/variant_fields.rb
rename to server/app/graphql/types/revisions/gene_variant_fields.rb
index c2c1347ff..221254f0b 100644
--- a/server/app/graphql/types/revisions/variant_fields.rb
+++ b/server/app/graphql/types/revisions/gene_variant_fields.rb
@@ -1,6 +1,6 @@
 module Types::Revisions
-  class VariantFields < Types::BaseInputObject
-    description 'Fields on a Variant that curators may propose revisions to.'
+  class GeneVariantFields < Types::BaseInputObject
+    description 'Fields on a GeneVariant that curators may propose revisions to.'
     argument :name, String, required: true,
       description: "The Variant's name."
     argument :aliases, [String], required: true,
diff --git a/server/app/graphql/types/variants/factor_variant_type.rb b/server/app/graphql/types/variants/factor_variant_type.rb
new file mode 100644
index 000000000..7d2e1bf0f
--- /dev/null
+++ b/server/app/graphql/types/variants/factor_variant_type.rb
@@ -0,0 +1,7 @@
+module Types::Variants
+  class FactorVariantType < Types::BaseObject
+    implements Types::Interfaces::VariantInterface
+
+    field :ncit_id, String, null: true
+  end
+end
diff --git a/server/app/graphql/types/variants/gene_variant_type.rb b/server/app/graphql/types/variants/gene_variant_type.rb
new file mode 100644
index 000000000..3f65cf7e4
--- /dev/null
+++ b/server/app/graphql/types/variants/gene_variant_type.rb
@@ -0,0 +1,81 @@
+module Types::Variants
+  class GeneVariantType < Types::BaseObject
+    implements Types::Interfaces::VariantInterface
+
+    field :reference_build, Types::ReferenceBuildType, null: true
+    field :ensembl_version, Int, null: true
+    field :primary_coordinates, Types::Entities::CoordinateType, null: true
+    field :secondary_coordinates, Types::Entities::CoordinateType, null: true
+    field :reference_bases, String, null: true
+    field :variant_bases, String, null: true
+    field :allele_registry_id, String, null: true
+    field :clinvar_ids, [String], null: false
+    field :hgvs_descriptions, [String], null: false
+    field :my_variant_info, Types::Entities::MyVariantInfoType, null: true
+    field :mane_select_transcript, String, null: true
+    field :open_cravat_url, String, null: true
+
+
+    def primary_coordinates
+      if (object.representative_transcript.blank? && object.chromosome.blank? && object.start.blank? && object.stop.blank?)
+        return nil
+      else
+        return {
+          representative_transcript: object.representative_transcript,
+          chromosome: object.chromosome,
+          start: object.start,
+          stop: object.stop,
+        }
+      end
+    end
+
+    def secondary_coordinates
+      if (object.representative_transcript2.blank? && object.chromosome2.blank? && object.start2.blank? && object.stop2.blank?)
+        return nil
+      else
+        return {
+          representative_transcript: object.representative_transcript2,
+          chromosome: object.chromosome2,
+          start: object.start2,
+          stop: object.stop2,
+        }
+      end
+    end
+
+    def variant_bases
+      if (object.variant_bases.blank?)
+        return nil
+      else
+        return object.variant_bases
+      end
+    end
+
+    def reference_bases
+      if (object.reference_bases.blank?)
+        return nil
+      else
+        return object.reference_bases
+      end
+    end
+
+    def clinvar_ids
+      Loaders::AssociationLoader.for(Variant, :clinvar_entries).load(object).then do |clinvar_entries|
+        clinvar_entries.map(&:clinvar_id)
+      end
+    end
+
+    def hgvs_descriptions
+      Loaders::AssociationLoader.for(Variant, :hgvs_descriptions).load(object).then do |hgvs|
+        hgvs.map(&:description)
+      end
+    end
+
+    def my_variant_info
+      MyVariantInfo.new(object).response
+    end
+
+    def mane_select_transcript
+      ManeSelectTranscript.new(object).mane_select_transcript
+    end
+  end
+end
diff --git a/server/app/models/actions/create_variant.rb b/server/app/models/actions/create_variant.rb
index d39f98baa..2d4ce4c48 100644
--- a/server/app/models/actions/create_variant.rb
+++ b/server/app/models/actions/create_variant.rb
@@ -5,8 +5,15 @@ class CreateVariant
     attr_reader :variant, :molecular_profile, :originating_user, :organization_id
 
     def initialize(variant_name:, feature_id:, originating_user:, organization_id: nil)
+      variant_type = Feature.find(feature_id).compatible_variant_type
+
       #TODO - REMOVE gene_id
-      @variant = Variant.new(name: variant_name, feature_id: feature_id, gene_id: 999)
+      @variant = Variant.new(
+        name: variant_name,
+        feature_id: feature_id,
+        type: variant_type,
+        gene_id: 999
+      )
       @originating_user = originating_user
       @organization_id = organization_id
     end
diff --git a/server/app/models/feature.rb b/server/app/models/feature.rb
index ecc1deaf7..637e28e4e 100644
--- a/server/app/models/feature.rb
+++ b/server/app/models/feature.rb
@@ -41,6 +41,10 @@ def link
     Rails.application.routes.url_helpers.url_for("/features/#{self.id}")
   end
 
+  def compatible_variant_type
+    feature_instance.compatible_variant_type
+  end
+
   def self.timepoint_query
     ->(x) {
       self.joins(variants: { molecular_profiles: [:evidence_items] })
diff --git a/server/app/models/features/factor.rb b/server/app/models/features/factor.rb
index 9ecd7410c..aace8f89c 100644
--- a/server/app/models/features/factor.rb
+++ b/server/app/models/features/factor.rb
@@ -20,5 +20,9 @@ def editable_fields
         :feature_alias_ids
       ]
     end
+
+    def compatible_variant_type
+      Variants::FactorVariant
+    end
   end
 end
diff --git a/server/app/models/features/gene.rb b/server/app/models/features/gene.rb
index 5147816db..dc4324247 100644
--- a/server/app/models/features/gene.rb
+++ b/server/app/models/features/gene.rb
@@ -19,5 +19,9 @@ def editable_fields
         :source_ids
       ]
     end
+
+    def compatible_variant_type
+      Variants::GeneVariant
+    end
   end
 end
diff --git a/server/app/models/variant.rb b/server/app/models/variant.rb
index 008642109..0710e9f92 100644
--- a/server/app/models/variant.rb
+++ b/server/app/models/variant.rb
@@ -6,8 +6,6 @@ class Variant < ApplicationRecord
   include WithTimepointCounts
 
   belongs_to :feature
-  belongs_to :gene, class_name: 'Features::Gene', optional: true
-  belongs_to :secondary_gene, class_name: 'Features::Gene', optional: true
 
   has_and_belongs_to_many :molecular_profiles
   has_many :variant_group_variants
@@ -18,9 +16,9 @@ class Variant < ApplicationRecord
   has_and_belongs_to_many :hgvs_descriptions
   has_many :comment_mentions, foreign_key: :comment_id, class_name: 'EntityMention'
 
-  belongs_to :single_variant_molecular_profile, 
+  belongs_to :single_variant_molecular_profile,
     class_name: "MolecularProfile",
-    foreign_key: :single_variant_molecular_profile_id 
+    foreign_key: :single_variant_molecular_profile_id
 
   has_one :deprecation_activity,
     as: :subject,
@@ -32,7 +30,6 @@ class Variant < ApplicationRecord
     class_name: 'CreateVariantActivity'
   has_one :creating_user, through: :creation_activity, source: :user
 
-  enum reference_build: [:GRCh38, :GRCh37, :NCBI36]
   enum deprecation_reason: ['duplicate', 'invalid_variant', 'other', 'feature_deprecated']
 
   has_many :activities_linked_entities,
@@ -52,25 +49,17 @@ class Variant < ApplicationRecord
 
   validates :name, presence: true
 
-  validates :reference_bases, format: {
-    with: /\A[ACTG]+\z|\A[ACTG]+\/[ACTG]+\z/,
-    message: "only allows A,C,T,G or /"
-  }, allow_nil: true
-
-  validates :variant_bases, format: {
-    with: /\A[ACTG]+\z|\A[ACTG]+\/[ACTG]+\z/,
-    message: "only allows A,C,T,G or /"
-  }, allow_nil: true
-
   validate :unique_name_in_context
+  validate :feature_type_matches_variant_type
+  validates_with VariantFieldsValidator
 
   searchkick highlight: [:name, :aliases], callbacks: :async
-  scope :search_import, -> { includes(:variant_aliases, :gene) }
+  scope :search_import, -> { includes(:variant_aliases, :feature) }
 
   def search_data
     {
-      name: "#{gene.name} - #{name}",
-      gene: gene.name,
+      name: "#{feature.name} - #{name}",
+      feature: feature.name,
       aliases: variant_aliases.map(&:name),
     }
   end
@@ -142,26 +131,40 @@ def unique_name_in_context
     end
   end
 
+  def feature_type_matches_variant_type
+    feature_instance = feature.feature_instance
+    if compatible_features.none? { |cf| feature_instance.is_a?(cf) }
+      errors.add(:feature_id, "#{type} is not compatible with #{feature_instance.feature_instance_type.demodulize} Features")
+    end
+  end
+
   def editable_fields
+    raise StandardError.new("Implement in Variant subclass")
+  end
+
+  def forbidden_fields
+    other_editable_fields = Variant.known_subclasses
+      .reject { |c| self.is_a?(c) }
+      .flat_map { |c| c.new.editable_fields }
+
+    other_editable_fields - self.editable_fields
+  end
+
+  def required_fields
+    #Fields that this variant type _must_ have populated
+    #(Excluding name and feature id, that is handled in the parent)
+    raise StandardError.new("Implement in Variant subclass")
+  end
+
+  def compatible_features
+    #Feature types this Variant may be assigned to
+    raise StandardError.new("Implement in Variant subclass")
+  end
+
+  def self.known_subclasses
     [
-      :feature_id,
-      :name,
-      :variant_alias_ids,
-      :hgvs_description_ids,
-      :clinvar_entry_ids,
-      :variant_type_ids,
-      :reference_build,
-      :ensembl_version,
-      :chromosome,
-      :start,
-      :stop,
-      :reference_bases,
-      :variant_bases,
-      :representative_transcript,
-      :chromosome2,
-      :start2,
-      :stop2,
-      :representative_transcript2,
+      Variants::GeneVariant,
+      Variants::FactorVariant
     ]
   end
 end
diff --git a/server/app/models/variants/factor_variant.rb b/server/app/models/variants/factor_variant.rb
new file mode 100644
index 000000000..891ede3c6
--- /dev/null
+++ b/server/app/models/variants/factor_variant.rb
@@ -0,0 +1,19 @@
+module Variants
+  class FactorVariant < Variant
+    def editable_fields
+      [
+        :ncit_id
+      ]
+    end
+
+    def required_fields
+      []
+    end
+
+    def compatible_features
+      [
+        Features::Factor
+      ]
+    end
+  end
+end
diff --git a/server/app/models/variants/gene_variant.rb b/server/app/models/variants/gene_variant.rb
new file mode 100644
index 000000000..51e7afe7a
--- /dev/null
+++ b/server/app/models/variants/gene_variant.rb
@@ -0,0 +1,53 @@
+module Variants
+  class GeneVariant < Variant
+    belongs_to :gene, class_name: 'Features::Gene', optional: true
+
+    #not used in V2, delete when Fusions added?
+    #belongs_to :secondary_gene, class_name: 'Features::Gene', optional: true
+
+    enum reference_build: [:GRCh38, :GRCh37, :NCBI36]
+
+    validates :reference_bases, format: {
+      with: /\A[ACTG]+\z|\A[ACTG]+\/[ACTG]+\z/,
+      message: "only allows A,C,T,G or /"
+    }, allow_nil: true
+
+    validates :variant_bases, format: {
+      with: /\A[ACTG]+\z|\A[ACTG]+\/[ACTG]+\z/,
+      message: "only allows A,C,T,G or /"
+    }, allow_nil: true
+
+    def editable_fields
+      [
+        :feature_id,
+        :name,
+        :variant_alias_ids,
+        :hgvs_description_ids,
+        :clinvar_entry_ids,
+        :variant_type_ids,
+        :reference_build,
+        :ensembl_version,
+        :chromosome,
+        :start,
+        :stop,
+        :reference_bases,
+        :variant_bases,
+        :representative_transcript,
+        :chromosome2,
+        :start2,
+        :stop2,
+        :representative_transcript2,
+      ]
+    end
+
+    def required_fields
+      []
+    end
+
+    def compatible_features
+      [
+        Features::Gene
+      ]
+    end
+  end
+end
diff --git a/server/app/validators/variant_fields_validator.rb b/server/app/validators/variant_fields_validator.rb
new file mode 100644
index 000000000..18344c3fc
--- /dev/null
+++ b/server/app/validators/variant_fields_validator.rb
@@ -0,0 +1,15 @@
+class VariantFieldsValidator < ActiveModel::Validator
+  def validate(record)
+    record.required_fields.each do |field|
+      if record.send(field).blank?
+        record.errors.add field, "#{field} is required but not provided"
+      end
+    end
+
+    record.forbidden_fields.each do |field|
+      if record.send(field).present?
+        record.errors.add field, "#{field} is not allowed on this Variant type"
+      end
+    end
+  end
+end
diff --git a/server/db/migrate/20240314185837_add_variant_sti.rb b/server/db/migrate/20240314185837_add_variant_sti.rb
new file mode 100644
index 000000000..d88c01cee
--- /dev/null
+++ b/server/db/migrate/20240314185837_add_variant_sti.rb
@@ -0,0 +1,19 @@
+class AddVariantSti < ActiveRecord::Migration[6.1]
+  def up
+    add_column :variants, :type, :string, index: true
+    add_column :variants, :ncit_id, :string, null: true, index: true
+
+    Variant.find_each do |v|
+      v.type = 'Variants::GeneVariant'
+      v.save!(validate: false)
+    end
+
+    change_column_null :variants, :type, false
+
+  end
+
+  def down
+    remove_column :variants, :type
+    remove_column :variants, :ncit_id
+  end
+end
diff --git a/server/db/schema.rb b/server/db/schema.rb
index ef00de6f9..d0a1b1dab 100644
--- a/server/db/schema.rb
+++ b/server/db/schema.rb
@@ -10,12 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-<<<<<<< HEAD
-ActiveRecord::Schema.define(version: 2024_02_01_182724) do
-
-=======
-ActiveRecord::Schema[7.1].define(version: 2024_02_01_182724) do
->>>>>>> main
+ActiveRecord::Schema[7.1].define(version: 2024_03_14_185837) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -50,11 +45,7 @@
     t.string "service_name", null: false
     t.bigint "byte_size", null: false
     t.string "checksum"
-<<<<<<< HEAD
-    t.datetime "created_at", null: false
-=======
     t.datetime "created_at", precision: nil, null: false
->>>>>>> main
     t.index ["key"], name: "index_active_storage_blobs_on_key", unique: true
   end
 
@@ -452,13 +443,8 @@
 
   create_table "factors", force: :cascade do |t|
     t.text "ncit_id"
-<<<<<<< HEAD
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
-=======
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
->>>>>>> main
   end
 
   create_table "feature_aliases", force: :cascade do |t|
@@ -708,15 +694,9 @@
     t.string "message", null: false
     t.string "severity", null: false
     t.string "source"
-<<<<<<< HEAD
-    t.datetime "resolved_at", precision: 6
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
-=======
     t.datetime "resolved_at"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
->>>>>>> main
     t.index ["exception_class", "message", "severity", "source"], name: "solid_error_uniqueness_index", unique: true
     t.index ["resolved_at"], name: "index_solid_errors_on_resolved_at"
   end
@@ -725,13 +705,8 @@
     t.bigint "error_id", null: false
     t.text "backtrace"
     t.json "context"
-<<<<<<< HEAD
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
-=======
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
->>>>>>> main
     t.index ["error_id"], name: "index_solid_errors_occurrences_on_error_id"
   end
 
@@ -958,6 +933,8 @@
     t.integer "deprecation_comment_id"
     t.text "open_cravat_url"
     t.bigint "feature_id"
+    t.string "type", null: false
+    t.string "ncit_id"
     t.index "lower((name)::text) varchar_pattern_ops", name: "idx_case_insensitive_variant_name"
     t.index "lower((name)::text)", name: "variant_lower_name_idx"
     t.index ["chromosome"], name: "index_variants_on_chromosome"

From e48ac4b0b7c59ab21614a683f03ae477cfa4d3f1 Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Wed, 20 Mar 2024 16:53:28 -0500
Subject: [PATCH 100/125] refactor compatability logic to avoid redundancy

---
 server/app/models/concerns/is_feature_instance.rb | 5 +++++
 server/app/models/variant.rb                      | 8 +-------
 server/app/models/variants/factor_variant.rb      | 8 ++------
 server/app/models/variants/gene_variant.rb        | 6 ------
 4 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/server/app/models/concerns/is_feature_instance.rb b/server/app/models/concerns/is_feature_instance.rb
index dd42437e8..e2dd03de2 100644
--- a/server/app/models/concerns/is_feature_instance.rb
+++ b/server/app/models/concerns/is_feature_instance.rb
@@ -5,5 +5,10 @@ module IsFeatureInstance
     has_one :feature, as: :feature_instance, touch: true, autosave: true
 
     delegate_missing_to :feature
+
+    #What variant type can be attached to this feature
+    def compatible_variant_type
+      raise StandardError.new("Must implement in FeatureInstance type")
+    end
   end
 end
diff --git a/server/app/models/variant.rb b/server/app/models/variant.rb
index 0710e9f92..02d929353 100644
--- a/server/app/models/variant.rb
+++ b/server/app/models/variant.rb
@@ -132,8 +132,7 @@ def unique_name_in_context
   end
 
   def feature_type_matches_variant_type
-    feature_instance = feature.feature_instance
-    if compatible_features.none? { |cf| feature_instance.is_a?(cf) }
+    unless self.is_a?(feature.compatible_variant_type)
       errors.add(:feature_id, "#{type} is not compatible with #{feature_instance.feature_instance_type.demodulize} Features")
     end
   end
@@ -156,11 +155,6 @@ def required_fields
     raise StandardError.new("Implement in Variant subclass")
   end
 
-  def compatible_features
-    #Feature types this Variant may be assigned to
-    raise StandardError.new("Implement in Variant subclass")
-  end
-
   def self.known_subclasses
     [
       Variants::GeneVariant,
diff --git a/server/app/models/variants/factor_variant.rb b/server/app/models/variants/factor_variant.rb
index 891ede3c6..c13e28755 100644
--- a/server/app/models/variants/factor_variant.rb
+++ b/server/app/models/variants/factor_variant.rb
@@ -2,6 +2,8 @@ module Variants
   class FactorVariant < Variant
     def editable_fields
       [
+        :feature_id,
+        :name,
         :ncit_id
       ]
     end
@@ -9,11 +11,5 @@ def editable_fields
     def required_fields
       []
     end
-
-    def compatible_features
-      [
-        Features::Factor
-      ]
-    end
   end
 end
diff --git a/server/app/models/variants/gene_variant.rb b/server/app/models/variants/gene_variant.rb
index 51e7afe7a..be9271420 100644
--- a/server/app/models/variants/gene_variant.rb
+++ b/server/app/models/variants/gene_variant.rb
@@ -43,11 +43,5 @@ def editable_fields
     def required_fields
       []
     end
-
-    def compatible_features
-      [
-        Features::Gene
-      ]
-    end
   end
 end

From df774c2477153cce0cad36af3bff8b730bd83556 Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Wed, 20 Mar 2024 16:53:52 -0500
Subject: [PATCH 101/125] client builds, need to fix a few more components

---
 ...profile-factor-variant-card.component.html | 109 ++++++++++++++++++
 ...rofile-factor-variant-card.component.less} |   0
 ...r-profile-factor-variant-card.component.ts |  78 +++++++++++++
 ...-profile-gene-variant-card.component.html} |   2 +
 ...r-profile-gene-variant-card.component.less |   3 +
 ...ar-profile-gene-variant-card.component.ts} |  12 +-
 ...cular-profile-gene-variant-card.module.ts} |  10 +-
 .../variant-popover.component.html            |   1 +
 .../molecular-profiles-summary.module.ts      |   4 +-
 .../molecular-profiles-summary.page.html      |  70 +++++++----
 10 files changed, 253 insertions(+), 36 deletions(-)
 create mode 100644 client/src/app/components/molecular-profiles/molecular-profile-factor-variant-card/molecular-profile-factor-variant-card.component.html
 rename client/src/app/components/molecular-profiles/{molecular-profile-variant-card/molecular-profile-variant-card.component.less => molecular-profile-factor-variant-card/molecular-profile-factor-variant-card.component.less} (100%)
 create mode 100644 client/src/app/components/molecular-profiles/molecular-profile-factor-variant-card/molecular-profile-factor-variant-card.component.ts
 rename client/src/app/components/molecular-profiles/{molecular-profile-variant-card/molecular-profile-variant-card.component.html => molecular-profile-gene-variant-card/molecular-profile-gene-variant-card.component.html} (99%)
 create mode 100644 client/src/app/components/molecular-profiles/molecular-profile-gene-variant-card/molecular-profile-gene-variant-card.component.less
 rename client/src/app/components/molecular-profiles/{molecular-profile-variant-card/molecular-profile-variant-card.component.ts => molecular-profile-gene-variant-card/molecular-profile-gene-variant-card.component.ts} (67%)
 rename client/src/app/components/molecular-profiles/{molecular-profile-variant-card/molecular-profile-variant-card.module.ts => molecular-profile-gene-variant-card/molecular-profile-gene-variant-card.module.ts} (86%)

diff --git a/client/src/app/components/molecular-profiles/molecular-profile-factor-variant-card/molecular-profile-factor-variant-card.component.html b/client/src/app/components/molecular-profiles/molecular-profile-factor-variant-card/molecular-profile-factor-variant-card.component.html
new file mode 100644
index 000000000..82b5e1a0e
--- /dev/null
+++ b/client/src/app/components/molecular-profiles/molecular-profile-factor-variant-card/molecular-profile-factor-variant-card.component.html
@@ -0,0 +1,109 @@
+@if(variant.__typename == "FactorVariant") {
+<nz-card
+  [nzTitle]="cardTitle"
+  nzType="inner"
+  nzSize="small">
+  <ng-template #cardTitle>
+    <i
+      nz-icon
+      nzType="civic-variant"
+      nzTheme="twotone"
+      [nzTwotoneColor]="'Variant' | entityColor"></i>
+    {{ variant.name }}
+  </ng-template>
+  <nz-row [nzGutter]="[8, 16]">
+    <nz-col [nzSpan]="24">
+      <nz-row [nzGutter]="[8, 8]">
+        <!-- gene attributes block -->
+        <nz-col nzSpan="24">
+          <nz-descriptions
+            nzLayout="horizontal"
+            nzSize="small"
+            [nzColumn]="4"
+            nzBordered="true">
+            <nz-descriptions-item
+              [nzSpan]="4"
+              nzTitle="Variant">
+              <cvc-feature-variant-tag
+                [variant]="variant"></cvc-feature-variant-tag>
+            </nz-descriptions-item>
+            <!-- aliases -->
+            <nz-descriptions-item
+              [nzSpan]="2"
+              nzTitle="Aliases">
+              <ng-container
+                *ngIf="variant.variantAliases.length > 0; else noAliases">
+                <cvc-tag-list>
+                  <nz-tag *ngFor="let alias of variant.variantAliases">{{
+                    alias
+                  }}</nz-tag>
+                </cvc-tag-list>
+              </ng-container>
+              <ng-template #noAliases>
+                <span
+                  nz-typography
+                  nzType="secondary"
+                  >None specified</span
+                >
+              </ng-template>
+            </nz-descriptions-item>
+
+            <!-- variant type(s) -->
+            <nz-descriptions-item
+              [nzSpan]="2"
+              [nzTitle]="
+                variant.variantTypes.length > 1
+                  ? 'Variant Types'
+                  : 'Variant Type'
+              ">
+              <ng-container
+                *ngIf="variant.variantTypes.length > 0; else noTypes">
+                <cvc-tag-list>
+                  <cvc-variant-type-tag
+                    [variantType]="type"
+                    *ngFor="let type of variant.variantTypes">
+                  </cvc-variant-type-tag>
+                </cvc-tag-list>
+              </ng-container>
+              <ng-template #noTypes>
+                <span
+                  nz-typography
+                  nzType="secondary"
+                  >None specified</span
+                >
+              </ng-template>
+            </nz-descriptions-item>
+
+            <nz-descriptions-item
+              [nzSpan]="4"
+              *ngIf="this.displayMps.length > 0"
+              nzTitle="Other Molecular Profiles">
+              <cvc-tag-list>
+                <ng-container *ngFor="let mp of this.displayMps">
+                  <cvc-molecular-profile-tag
+                    [molecularProfile]="mp"
+                    [truncateLongName]="true"></cvc-molecular-profile-tag>
+                </ng-container>
+                <ng-container
+                  *ngIf="
+                    variant.molecularProfiles.totalCount >
+                    this.displayMps.length + 1
+                  ">
+                  <a routerLink="/variants/{{ variant.id }}/summary">
+                    + view
+                    {{
+                      variant.molecularProfiles.totalCount -
+                        this.displayMps.length
+                    }}
+                    more
+                  </a>
+                </ng-container>
+              </cvc-tag-list>
+            </nz-descriptions-item>
+          </nz-descriptions>
+        </nz-col>
+      </nz-row>
+    </nz-col>
+  </nz-row>
+</nz-card>
+}
diff --git a/client/src/app/components/molecular-profiles/molecular-profile-variant-card/molecular-profile-variant-card.component.less b/client/src/app/components/molecular-profiles/molecular-profile-factor-variant-card/molecular-profile-factor-variant-card.component.less
similarity index 100%
rename from client/src/app/components/molecular-profiles/molecular-profile-variant-card/molecular-profile-variant-card.component.less
rename to client/src/app/components/molecular-profiles/molecular-profile-factor-variant-card/molecular-profile-factor-variant-card.component.less
diff --git a/client/src/app/components/molecular-profiles/molecular-profile-factor-variant-card/molecular-profile-factor-variant-card.component.ts b/client/src/app/components/molecular-profiles/molecular-profile-factor-variant-card/molecular-profile-factor-variant-card.component.ts
new file mode 100644
index 000000000..8896a3a81
--- /dev/null
+++ b/client/src/app/components/molecular-profiles/molecular-profile-factor-variant-card/molecular-profile-factor-variant-card.component.ts
@@ -0,0 +1,78 @@
+import { Component, Input, OnInit } from '@angular/core'
+import { VariantMolecularProfileCardFieldsFragment } from '@app/generated/civic.apollo'
+import { LinkableMolecularProfile } from '../molecular-profile-tag/molecular-profile-tag.component'
+
+import { CommonModule } from '@angular/common'
+import { CvcVariantTagModule } from '@app/components/variants/variant-tag/variant-tag.module'
+import { NzTagModule } from 'ng-zorro-antd/tag'
+import { NzIconModule } from 'ng-zorro-antd/icon'
+import { NzGridModule } from 'ng-zorro-antd/grid'
+import { NzDescriptionsModule } from 'ng-zorro-antd/descriptions'
+import { NzTypographyModule } from 'ng-zorro-antd/typography'
+import { CvcEmptyRevisableModule } from '@app/components/shared/empty-revisable/empty-revisable.module'
+import { CvcTagListModule } from '@app/components/shared/tag-list/tag-list.module'
+import { CvcVariantTypeTagModule } from '@app/components/variant-types/variant-type-tag/variant-type-tag.module'
+import { CvcLinkTagModule } from '@app/components/shared/link-tag/link-tag.module'
+import { NzCardModule } from 'ng-zorro-antd/card'
+import { CvcPipesModule } from '@app/core/pipes/pipes.module'
+import { CvcMolecularProfileTagModule } from '../molecular-profile-tag/molecular-profile-tag.module'
+import { RouterModule } from '@angular/router'
+import { NzCollapseModule } from 'ng-zorro-antd/collapse'
+import { CvcCoordinatesCardModule } from '@app/components/variants/coordinates-card/coordinates-card.module'
+import { NzSpaceModule } from 'ng-zorro-antd/space'
+import { CvcFeatureTagModule } from '@app/components/features/feature-tag/feature-tag.module'
+import { CvcFeatureVariantTagModule } from '@app/components/shared/feature-variant-tag/feature-variant-tag.module'
+
+@Component({
+  selector: 'cvc-mp-factor-variant-card',
+  templateUrl: './molecular-profile-factor-variant-card.component.html',
+  styleUrls: ['./molecular-profile-factor-variant-card.component.less'],
+  standalone: true,
+  imports: [
+    CommonModule,
+    RouterModule,
+    NzTagModule,
+    NzIconModule,
+    NzGridModule,
+    NzDescriptionsModule,
+    NzTypographyModule,
+    NzCardModule,
+    NzCollapseModule,
+    NzSpaceModule,
+    CvcPipesModule,
+    CvcVariantTagModule,
+    CvcFeatureTagModule,
+    CvcEmptyRevisableModule,
+    CvcTagListModule,
+    CvcVariantTypeTagModule,
+    CvcLinkTagModule,
+    CvcTagListModule,
+    CvcMolecularProfileTagModule,
+    CvcCoordinatesCardModule,
+    CvcFeatureVariantTagModule,
+  ],
+})
+export class CvcMolecularProfileGeneVariantCardComponent implements OnInit {
+  @Input() variant!: VariantMolecularProfileCardFieldsFragment
+  @Input() currentMolecularProfileId!: number
+
+  displayMps: LinkableMolecularProfile[] = []
+
+  ngOnInit() {
+    if (this.variant === undefined) {
+      throw new Error('Must pass a Variant into the MP Variant Card Component')
+    }
+
+    if (this.currentMolecularProfileId === undefined) {
+      throw new Error('Must pass a MP ID into the MP Variant Card Component')
+    }
+
+    if (this.variant.__typename !== 'FactorVariant') {
+      throw new Error('This card is for FactorVariant variant types only.')
+    }
+
+    this.displayMps = this.variant.molecularProfiles.nodes.filter(
+      (mp) => mp.id != this.currentMolecularProfileId
+    )
+  }
+}
diff --git a/client/src/app/components/molecular-profiles/molecular-profile-variant-card/molecular-profile-variant-card.component.html b/client/src/app/components/molecular-profiles/molecular-profile-gene-variant-card/molecular-profile-gene-variant-card.component.html
similarity index 99%
rename from client/src/app/components/molecular-profiles/molecular-profile-variant-card/molecular-profile-variant-card.component.html
rename to client/src/app/components/molecular-profiles/molecular-profile-gene-variant-card/molecular-profile-gene-variant-card.component.html
index 41b4226a7..c0b6ca041 100644
--- a/client/src/app/components/molecular-profiles/molecular-profile-variant-card/molecular-profile-variant-card.component.html
+++ b/client/src/app/components/molecular-profiles/molecular-profile-gene-variant-card/molecular-profile-gene-variant-card.component.html
@@ -1,3 +1,4 @@
+@if(variant.__typename == "GeneVariant") {
 <nz-card
   [nzTitle]="cardTitle"
   nzType="inner"
@@ -201,3 +202,4 @@
     </nz-col>
   </nz-row>
 </nz-card>
+}
diff --git a/client/src/app/components/molecular-profiles/molecular-profile-gene-variant-card/molecular-profile-gene-variant-card.component.less b/client/src/app/components/molecular-profiles/molecular-profile-gene-variant-card/molecular-profile-gene-variant-card.component.less
new file mode 100644
index 000000000..3e2f98759
--- /dev/null
+++ b/client/src/app/components/molecular-profiles/molecular-profile-gene-variant-card/molecular-profile-gene-variant-card.component.less
@@ -0,0 +1,3 @@
+.card-title {
+  font-size: 120%;
+}
diff --git a/client/src/app/components/molecular-profiles/molecular-profile-variant-card/molecular-profile-variant-card.component.ts b/client/src/app/components/molecular-profiles/molecular-profile-gene-variant-card/molecular-profile-gene-variant-card.component.ts
similarity index 67%
rename from client/src/app/components/molecular-profiles/molecular-profile-variant-card/molecular-profile-variant-card.component.ts
rename to client/src/app/components/molecular-profiles/molecular-profile-gene-variant-card/molecular-profile-gene-variant-card.component.ts
index 113d1c72b..1f8942a0a 100644
--- a/client/src/app/components/molecular-profiles/molecular-profile-variant-card/molecular-profile-variant-card.component.ts
+++ b/client/src/app/components/molecular-profiles/molecular-profile-gene-variant-card/molecular-profile-gene-variant-card.component.ts
@@ -3,11 +3,11 @@ import { VariantMolecularProfileCardFieldsFragment } from '@app/generated/civic.
 import { LinkableMolecularProfile } from '../molecular-profile-tag/molecular-profile-tag.component'
 
 @Component({
-  selector: 'cvc-mp-variant-card',
-  templateUrl: './molecular-profile-variant-card.component.html',
-  styleUrls: ['./molecular-profile-variant-card.component.less'],
+  selector: 'cvc-mp-gene-variant-card',
+  templateUrl: './molecular-profile-gene-variant-card.component.html',
+  styleUrls: ['./molecular-profile-gene-variant-card.component.less'],
 })
-export class CvcMolecularProfileVariantCardComponent implements OnInit {
+export class CvcMolecularProfileGeneVariantCardComponent implements OnInit {
   @Input() variant!: VariantMolecularProfileCardFieldsFragment
   @Input() currentMolecularProfileId!: number
 
@@ -22,6 +22,10 @@ export class CvcMolecularProfileVariantCardComponent implements OnInit {
       throw new Error('Must pass a MP ID into the MP Variant Card Component')
     }
 
+    if (this.variant.__typename !== 'GeneVariant') {
+      throw new Error('This card is for GeneVariant variant types only.')
+    }
+
     this.displayMps = this.variant.molecularProfiles.nodes.filter(
       (mp) => mp.id != this.currentMolecularProfileId
     )
diff --git a/client/src/app/components/molecular-profiles/molecular-profile-variant-card/molecular-profile-variant-card.module.ts b/client/src/app/components/molecular-profiles/molecular-profile-gene-variant-card/molecular-profile-gene-variant-card.module.ts
similarity index 86%
rename from client/src/app/components/molecular-profiles/molecular-profile-variant-card/molecular-profile-variant-card.module.ts
rename to client/src/app/components/molecular-profiles/molecular-profile-gene-variant-card/molecular-profile-gene-variant-card.module.ts
index 4ff4d3fd8..ae5d27a18 100644
--- a/client/src/app/components/molecular-profiles/molecular-profile-variant-card/molecular-profile-variant-card.module.ts
+++ b/client/src/app/components/molecular-profiles/molecular-profile-gene-variant-card/molecular-profile-gene-variant-card.module.ts
@@ -3,7 +3,6 @@ import { CommonModule } from '@angular/common'
 import { CvcVariantTagModule } from '@app/components/variants/variant-tag/variant-tag.module'
 import { NzTagModule } from 'ng-zorro-antd/tag'
 import { NzIconModule } from 'ng-zorro-antd/icon'
-import { CvcMolecularProfileVariantCardComponent } from './molecular-profile-variant-card.component'
 import { NzGridModule } from 'ng-zorro-antd/grid'
 import { NzDescriptionsModule } from 'ng-zorro-antd/descriptions'
 import { NzTypographyModule } from 'ng-zorro-antd/typography'
@@ -20,9 +19,10 @@ import { CvcCoordinatesCardModule } from '@app/components/variants/coordinates-c
 import { NzSpaceModule } from 'ng-zorro-antd/space'
 import { CvcFeatureTagModule } from '@app/components/features/feature-tag/feature-tag.module'
 import { CvcFeatureVariantTagModule } from '@app/components/shared/feature-variant-tag/feature-variant-tag.module'
+import { CvcMolecularProfileGeneVariantCardComponent } from './molecular-profile-gene-variant-card.component'
 
 @NgModule({
-  declarations: [CvcMolecularProfileVariantCardComponent],
+  declarations: [CvcMolecularProfileGeneVariantCardComponent],
   imports: [
     CommonModule,
     RouterModule,
@@ -44,8 +44,8 @@ import { CvcFeatureVariantTagModule } from '@app/components/shared/feature-varia
     CvcTagListModule,
     CvcMolecularProfileTagModule,
     CvcCoordinatesCardModule,
-    CvcFeatureVariantTagModule
+    CvcFeatureVariantTagModule,
   ],
-  exports: [CvcMolecularProfileVariantCardComponent],
+  exports: [CvcMolecularProfileGeneVariantCardComponent],
 })
-export class CvcMolecularProfileVariantCardModule {}
+export class CvcMolecularProfileGeneVariantCardModule {}
diff --git a/client/src/app/components/variants/variant-popover/variant-popover.component.html b/client/src/app/components/variants/variant-popover/variant-popover.component.html
index 8785005f5..9c1ede6e8 100644
--- a/client/src/app/components/variants/variant-popover/variant-popover.component.html
+++ b/client/src/app/components/variants/variant-popover/variant-popover.component.html
@@ -38,6 +38,7 @@
           nzTitle="Allele Registry ID"
           nzSpan="2"
           *ngIf="
+            variant.__typename == 'GeneVariant' &&
             variant.alleleRegistryId &&
             variant.alleleRegistryId != 'unregistered'
           ">
diff --git a/client/src/app/views/molecular-profiles/molecular-profiles-detail/molecular-profiles-summary/molecular-profiles-summary.module.ts b/client/src/app/views/molecular-profiles/molecular-profiles-detail/molecular-profiles-summary/molecular-profiles-summary.module.ts
index 04062197a..6a3515dc7 100644
--- a/client/src/app/views/molecular-profiles/molecular-profiles-detail/molecular-profiles-summary/molecular-profiles-summary.module.ts
+++ b/client/src/app/views/molecular-profiles/molecular-profiles-detail/molecular-profiles-summary/molecular-profiles-summary.module.ts
@@ -19,8 +19,8 @@ import { CvcUserTagModule } from '@app/components/users/user-tag/user-tag.module
 import { NzTagModule } from 'ng-zorro-antd/tag'
 import { MolecularProfilesSummaryPage } from './molecular-profiles-summary.page'
 import { CvcMolecularProfileTagNameModule } from '@app/components/molecular-profiles/molecular-profile-tag-name/molecular-profile-tag-name.module'
-import { CvcMolecularProfileVariantCardModule } from '@app/components/molecular-profiles/molecular-profile-variant-card/molecular-profile-variant-card.module'
 import { CvcEmptyValueModule } from '@app/forms/components/empty-value/empty-value.module'
+import { CvcMolecularProfileGeneVariantCardModule } from '@app/components/molecular-profiles/molecular-profile-gene-variant-card/molecular-profile-gene-variant-card.module'
 
 @NgModule({
   declarations: [MolecularProfilesSummaryPage],
@@ -46,7 +46,7 @@ import { CvcEmptyValueModule } from '@app/forms/components/empty-value/empty-val
     CvcLinkTagModule,
     CvcEmptyRevisableModule,
     CvcMolecularProfileTagNameModule,
-    CvcMolecularProfileVariantCardModule,
+    CvcMolecularProfileGeneVariantCardModule,
   ],
   exports: [MolecularProfilesSummaryPage],
 })
diff --git a/client/src/app/views/molecular-profiles/molecular-profiles-detail/molecular-profiles-summary/molecular-profiles-summary.page.html b/client/src/app/views/molecular-profiles/molecular-profiles-detail/molecular-profiles-summary/molecular-profiles-summary.page.html
index df595f31e..686416169 100644
--- a/client/src/app/views/molecular-profiles/molecular-profiles-detail/molecular-profiles-summary/molecular-profiles-summary.page.html
+++ b/client/src/app/views/molecular-profiles/molecular-profiles-detail/molecular-profiles-summary/molecular-profiles-summary.page.html
@@ -1,55 +1,68 @@
-<ng-container *ngIf="(molecularProfile$ | ngrxPush) as mp">
+<ng-container *ngIf="molecularProfile$ | ngrxPush as mp">
   <!-- component layout row -->
-  <nz-row [nzGutter]="[8,16]">
+  <nz-row [nzGutter]="[8, 16]">
     <!-- molecular profile attributes block -->
     <nz-col [nzSpan]="24">
-      <nz-row [nzGutter]="[8,8]">
+      <nz-row [nzGutter]="[8, 8]">
         <nz-col [nzSpan]="24">
           <nz-descriptions
             nzSize="small"
             nzBordered="true"
             [nzColumn]="3"
             nzLayout="vertical">
-            <nz-descriptions-item
-              nzTitle="MP Expression">
+            <nz-descriptions-item nzTitle="MP Expression">
               <cvc-mp-tag-name [nameSegments]="mp.parsedName"></cvc-mp-tag-name>
             </nz-descriptions-item>
             <ng-container *ngIf="mp.complexMolecularProfileCreationActivity">
               <nz-descriptions-item [nzTitle]="createdTitle">
                 by
-                <cvc-user-tag [user]="mp.complexMolecularProfileCreationActivity.user"></cvc-user-tag>
+                <cvc-user-tag
+                  [user]="
+                    mp.complexMolecularProfileCreationActivity.user
+                  "></cvc-user-tag>
               </nz-descriptions-item>
               <ng-template #createdTitle>
                 Created
-                <span nz-typography
+                <span
+                  nz-typography
                   nzType="secondary">
-                  ({{ mp.complexMolecularProfileCreationActivity.createdAt | timeAgo }})
+                  ({{
+                    mp.complexMolecularProfileCreationActivity.createdAt
+                      | timeAgo
+                  }})
                 </span>
               </ng-template>
             </ng-container>
             <ng-container *ngIf="mp.complexMolecularProfileDeprecationActivity">
-              <nz-descriptions-item
-                [nzTitle]="deprecatedTitle">
+              <nz-descriptions-item [nzTitle]="deprecatedTitle">
                 by
-                <cvc-user-tag [user]="mp.complexMolecularProfileDeprecationActivity.user"></cvc-user-tag>
+                <cvc-user-tag
+                  [user]="
+                    mp.complexMolecularProfileDeprecationActivity.user
+                  "></cvc-user-tag>
               </nz-descriptions-item>
               <ng-template #deprecatedTitle>
                 Deprecated
-                <span nz-typography
+                <span
+                  nz-typography
                   nzType="secondary">
-                  ({{ mp.complexMolecularProfileDeprecationActivity.createdAt | timeAgo }})
+                  ({{
+                    mp.complexMolecularProfileDeprecationActivity.createdAt
+                      | timeAgo
+                  }})
                 </span>
               </ng-template>
             </ng-container>
             <ng-container *ngIf="mp.variantDeprecationActivity">
-              <nz-descriptions-item
-                [nzTitle]="deprecatedTitle">
+              <nz-descriptions-item [nzTitle]="deprecatedTitle">
                 by
-                <cvc-user-tag [user]="mp.variantDeprecationActivity.user"></cvc-user-tag>
+                <cvc-user-tag
+                  [user]="mp.variantDeprecationActivity.user"></cvc-user-tag>
               </nz-descriptions-item>
               <ng-template #deprecatedTitle>
                 Deprecated
-                <span nz-typography
+                <span
+                  nz-typography
                   nzType="secondary">
                   ({{ mp.variantDeprecationActivity.createdAt | timeAgo }})
                 </span>
@@ -97,10 +110,13 @@
             <!-- aliases -->
             <nz-descriptions-item nzTitle="Aliases">
               <cvc-tag-list
-                *ngIf="mp.molecularProfileAliases.length > 0; else valueUnspecified">
-                <nz-tag *ngFor="let alias of mp.molecularProfileAliases"
-                  >{{ alias }}</nz-tag
-                >
+                *ngIf="
+                  mp.molecularProfileAliases.length > 0;
+                  else valueUnspecified
+                ">
+                <nz-tag *ngFor="let alias of mp.molecularProfileAliases">{{
+                  alias
+                }}</nz-tag>
               </cvc-tag-list>
             </nz-descriptions-item>
           </nz-descriptions>
@@ -111,13 +127,17 @@
     <!-- variant cards -->
     <nz-col nzSpan="24">
       <nz-card nzTitle="MP Variants">
-        <nz-row [nzGutter]="[8,8]">
+        <nz-row [nzGutter]="[8, 8]">
           <nz-col
             nzSpan="24"
             *ngFor="let v of mp.variants">
-            <cvc-mp-variant-card
+            <!-- prettier-ignore -->
+            @switch(v.__typename) {
+            @case('GeneVariant') {
+            <cvc-mp-gene-variant-card
               [variant]="v"
-              [currentMolecularProfileId]="mp.id"></cvc-mp-variant-card>
+              [currentMolecularProfileId]="mp.id"></cvc-mp-gene-variant-card>
+            } }
           </nz-col>
         </nz-row>
       </nz-card>
@@ -138,7 +158,7 @@
       <cvc-assertions-table
         [molecularProfileId]="mp.id"
         cvcHeight="200px"
-        cvcTitle="{{mp.name}} Assertions">
+        cvcTitle="{{ mp.name }} Assertions">
       </cvc-assertions-table>
     </nz-col>
   </nz-row>

From 1d5735fc932214ca0ad4b83f1c95c7b2f4a07b03 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 21 Mar 2024 19:57:29 +0000
Subject: [PATCH 102/125] Bump webpack-dev-middleware from 5.3.3 to 5.3.4 in
 /client

Bumps [webpack-dev-middleware](https://github.com/webpack/webpack-dev-middleware) from 5.3.3 to 5.3.4.
- [Release notes](https://github.com/webpack/webpack-dev-middleware/releases)
- [Changelog](https://github.com/webpack/webpack-dev-middleware/blob/v5.3.4/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-dev-middleware/compare/v5.3.3...v5.3.4)

---
updated-dependencies:
- dependency-name: webpack-dev-middleware
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 client/yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/yarn.lock b/client/yarn.lock
index 3b9605ba6..95b92a642 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -10120,9 +10120,9 @@ webpack-dev-middleware@6.1.1:
     schema-utils "^4.0.0"
 
 webpack-dev-middleware@^5.3.1:
-  version "5.3.3"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz#efae67c2793908e7311f1d9b06f2a08dcc97e51f"
-  integrity sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==
+  version "5.3.4"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz#eb7b39281cbce10e104eb2b8bf2b63fce49a3517"
+  integrity sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==
   dependencies:
     colorette "^2.0.10"
     memfs "^3.4.3"

From 5156113f1976122a7e1f24268fbbc324989f789b Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Thu, 21 Mar 2024 17:35:37 -0500
Subject: [PATCH 103/125] factor variant wired through everything, revise forms
 completed, new mutation added

---
 .../activity-feed/activity-feed.gql           |   2 +-
 .../events/event-feed/event-feed.gql          |   2 +-
 .../flags/flag-popover/flag-popover.query.gql |   2 +-
 ...profile-factor-variant-card.component.html |   2 +-
 ...r-profile-factor-variant-card.component.ts |   2 +-
 ...r-profile-gene-variant-card.component.html |   2 +-
 .../revision-popover.query.gql                |   2 +-
 .../factor-variant-summary.page.html          | 162 ++++++++
 .../factor-variant-summary.page.less          |   9 +
 .../factor-variant-summary.page.ts            |  55 +++
 .../factor-variant-revise.form.config.ts      | 145 +++++++
 .../factor-variant-revise.form.html           |  32 ++
 .../factor-variant-revise.form.module.ts      |  26 ++
 .../factor-variant-revise.form.ts             | 100 +++++
 .../factor-variant-revise.query.gql           |  37 ++
 .../variant-revise.form.config.ts             | 366 +++++++++++++++++
 .../gene-variant-revise.form.config.ts        |   1 +
 .../models/factor-variant-fields.model.ts     |   7 +
 .../models/factor-variant-revise.model.ts     |  22 +
 .../feature-select/feature-select.type.html   |   1 +
 .../feature-select/feature-select.type.ts     |   6 +-
 .../factor-variant-to-model-fields.ts         |  43 ++
 .../src/app/generated/civic.apollo-helpers.ts |  16 +-
 client/src/app/generated/civic.apollo.ts      | 229 +++++++++--
 client/src/app/generated/server.model.graphql | 101 ++++-
 client/src/app/generated/server.schema.json   | 384 +++++++++++++++++-
 .../molecular-profiles-summary.module.ts      |   2 +
 .../molecular-profiles-summary.page.html      |   7 +
 .../variants-summary.module.ts                |  10 +-
 .../variants-summary.page.html                |   8 +-
 .../variants-summary.query.gql                |   3 +
 .../variants-suggest.module.ts                |   7 +-
 .../variants-suggest.page.html                |   5 +-
 .../suggest_factor_variant_revision.rb        |  94 +++++
 .../suggest_gene_variant_revision.rb          |  11 +-
 server/app/graphql/resolvers/comments.rb      |  40 +-
 .../graphql/resolvers/top_level_comments.rb   |  46 ++-
 .../graphql/types/entities/variant_type.rb    |   6 +
 .../graphql/types/interfaces/commentable.rb   |   6 +-
 .../types/interfaces/event_origin_object.rb   |   6 +-
 .../graphql/types/interfaces/event_subject.rb |   6 +-
 .../app/graphql/types/interfaces/flaggable.rb |   6 +-
 .../interfaces/molecular_profile_component.rb |   6 +
 .../types/interfaces/variant_interface.rb     |   8 +-
 server/app/graphql/types/mutation_type.rb     |   1 +
 server/app/graphql/types/query_type.rb        |   2 +-
 .../types/revisions/factor_variant_fields.rb  |  16 +
 .../types/variants/factor_variant_type.rb     |   8 +-
 .../types/variants/gene_variant_type.rb       |   3 +-
 .../factor_variant_input_adaptor.rb           |  25 ++
 ...aptor.rb => gene_variant_input_adaptor.rb} |   2 +-
 server/app/models/variant.rb                  |   2 +-
 server/app/models/variants/factor_variant.rb  |   3 +-
 53 files changed, 1969 insertions(+), 126 deletions(-)
 create mode 100644 client/src/app/components/variants/factor-variant-summary/factor-variant-summary.page.html
 create mode 100644 client/src/app/components/variants/factor-variant-summary/factor-variant-summary.page.less
 create mode 100644 client/src/app/components/variants/factor-variant-summary/factor-variant-summary.page.ts
 create mode 100644 client/src/app/forms/config/factor-variant-revise/factor-variant-revise.form.config.ts
 create mode 100644 client/src/app/forms/config/factor-variant-revise/factor-variant-revise.form.html
 create mode 100644 client/src/app/forms/config/factor-variant-revise/factor-variant-revise.form.module.ts
 create mode 100644 client/src/app/forms/config/factor-variant-revise/factor-variant-revise.form.ts
 create mode 100644 client/src/app/forms/config/factor-variant-revise/factor-variant-revise.query.gql
 create mode 100644 client/src/app/forms/config/factor-variant-revise/variant-revise.form.config.ts
 create mode 100644 client/src/app/forms/models/factor-variant-fields.model.ts
 create mode 100644 client/src/app/forms/models/factor-variant-revise.model.ts
 create mode 100644 client/src/app/forms/utilities/factor-variant-to-model-fields.ts
 create mode 100644 server/app/graphql/mutations/suggest_factor_variant_revision.rb
 create mode 100644 server/app/graphql/types/revisions/factor_variant_fields.rb
 create mode 100644 server/app/models/input_adaptors/factor_variant_input_adaptor.rb
 rename server/app/models/input_adaptors/{variant_input_adaptor.rb => gene_variant_input_adaptor.rb} (97%)

diff --git a/client/src/app/components/activities/activity-feed/activity-feed.gql b/client/src/app/components/activities/activity-feed/activity-feed.gql
index 0f7d706a3..db359c73c 100644
--- a/client/src/app/components/activities/activity-feed/activity-feed.gql
+++ b/client/src/app/components/activities/activity-feed/activity-feed.gql
@@ -115,7 +115,7 @@ fragment activityFeedNode on ActivityInterface {
     ... on Revision {
       revisionSetId
     }
-    ... on Variant {
+    ... on VariantInterface {
       deprecated
       feature {
         id
diff --git a/client/src/app/components/events/event-feed/event-feed.gql b/client/src/app/components/events/event-feed/event-feed.gql
index f3dab3438..23dc82756 100644
--- a/client/src/app/components/events/event-feed/event-feed.gql
+++ b/client/src/app/components/events/event-feed/event-feed.gql
@@ -115,7 +115,7 @@ fragment eventFeedNode on Event {
     ... on Revision {
       revisionSetId
     }
-    ... on Variant {
+    ... on VariantInterface {
       deprecated
       feature {
         id
diff --git a/client/src/app/components/flags/flag-popover/flag-popover.query.gql b/client/src/app/components/flags/flag-popover/flag-popover.query.gql
index a66091098..65c055b07 100644
--- a/client/src/app/components/flags/flag-popover/flag-popover.query.gql
+++ b/client/src/app/components/flags/flag-popover/flag-popover.query.gql
@@ -17,7 +17,7 @@ fragment flagPopover on Flag {
     id
     link
     name
-    ...on Variant {
+    ...on VariantInterface {
       deprecated
       feature {
         id
diff --git a/client/src/app/components/molecular-profiles/molecular-profile-factor-variant-card/molecular-profile-factor-variant-card.component.html b/client/src/app/components/molecular-profiles/molecular-profile-factor-variant-card/molecular-profile-factor-variant-card.component.html
index 82b5e1a0e..b699c3f22 100644
--- a/client/src/app/components/molecular-profiles/molecular-profile-factor-variant-card/molecular-profile-factor-variant-card.component.html
+++ b/client/src/app/components/molecular-profiles/molecular-profile-factor-variant-card/molecular-profile-factor-variant-card.component.html
@@ -23,7 +23,7 @@
             nzBordered="true">
             <nz-descriptions-item
               [nzSpan]="4"
-              nzTitle="Variant">
+              nzTitle="Factor Variant">
               <cvc-feature-variant-tag
                 [variant]="variant"></cvc-feature-variant-tag>
             </nz-descriptions-item>
diff --git a/client/src/app/components/molecular-profiles/molecular-profile-factor-variant-card/molecular-profile-factor-variant-card.component.ts b/client/src/app/components/molecular-profiles/molecular-profile-factor-variant-card/molecular-profile-factor-variant-card.component.ts
index 8896a3a81..b0950c506 100644
--- a/client/src/app/components/molecular-profiles/molecular-profile-factor-variant-card/molecular-profile-factor-variant-card.component.ts
+++ b/client/src/app/components/molecular-profiles/molecular-profile-factor-variant-card/molecular-profile-factor-variant-card.component.ts
@@ -52,7 +52,7 @@ import { CvcFeatureVariantTagModule } from '@app/components/shared/feature-varia
     CvcFeatureVariantTagModule,
   ],
 })
-export class CvcMolecularProfileGeneVariantCardComponent implements OnInit {
+export class CvcMolecularProfileFactorVariantCardComponent implements OnInit {
   @Input() variant!: VariantMolecularProfileCardFieldsFragment
   @Input() currentMolecularProfileId!: number
 
diff --git a/client/src/app/components/molecular-profiles/molecular-profile-gene-variant-card/molecular-profile-gene-variant-card.component.html b/client/src/app/components/molecular-profiles/molecular-profile-gene-variant-card/molecular-profile-gene-variant-card.component.html
index c0b6ca041..6748c8ccc 100644
--- a/client/src/app/components/molecular-profiles/molecular-profile-gene-variant-card/molecular-profile-gene-variant-card.component.html
+++ b/client/src/app/components/molecular-profiles/molecular-profile-gene-variant-card/molecular-profile-gene-variant-card.component.html
@@ -23,7 +23,7 @@
             nzBordered="true">
             <nz-descriptions-item
               [nzSpan]="4"
-              nzTitle="Variant">
+              nzTitle="Gene Variant">
               <cvc-feature-variant-tag
                 [variant]="variant"></cvc-feature-variant-tag>
             </nz-descriptions-item>
diff --git a/client/src/app/components/revisions/revision-popover/revision-popover.query.gql b/client/src/app/components/revisions/revision-popover/revision-popover.query.gql
index a0f8efbb9..efc8d9ad9 100644
--- a/client/src/app/components/revisions/revision-popover/revision-popover.query.gql
+++ b/client/src/app/components/revisions/revision-popover/revision-popover.query.gql
@@ -23,7 +23,7 @@ fragment revisionPopover on Revision {
     id
     link
     name
-    ... on Variant {
+    ... on VariantInterface {
       deprecated
       feature {
         id
diff --git a/client/src/app/components/variants/factor-variant-summary/factor-variant-summary.page.html b/client/src/app/components/variants/factor-variant-summary/factor-variant-summary.page.html
new file mode 100644
index 000000000..a11ff520a
--- /dev/null
+++ b/client/src/app/components/variants/factor-variant-summary/factor-variant-summary.page.html
@@ -0,0 +1,162 @@
+@if(variant.__typename == "FactorVariant") {
+<!-- variant description, details, myvariantinfo row -->
+<nz-row [nzGutter]="[8, 16]">
+  <!-- LEFT COL -->
+  <nz-col [nzSpan]="12">
+    <!-- left col layout row -->
+    <nz-row [nzGutter]="[8, 8]">
+      <!-- variant attributes block -->
+      <nz-col nzSpan="24">
+        <nz-descriptions
+          nzLayout="horizontal"
+          nzSize="small"
+          [nzColumn]="1"
+          nzBordered="true">
+          <!-- aliases -->
+          <nz-descriptions-item nzTitle="Aliases">
+            <ng-container
+              *ngIf="variant.variantAliases.length > 0; else noAliases">
+              <cvc-tag-list>
+                <nz-tag *ngFor="let alias of variant.variantAliases">{{
+                  alias
+                }}</nz-tag>
+              </cvc-tag-list>
+            </ng-container>
+            <ng-template #noAliases>
+              <span
+                nz-typography
+                nzType="secondary"
+                >None specified</span
+              >
+            </ng-template>
+          </nz-descriptions-item>
+
+          <!-- variant type(s) -->
+          <nz-descriptions-item
+            [nzTitle]="
+              variant.variantTypes.length > 1 ? 'Variant Types' : 'Variant Type'
+            ">
+            <ng-container *ngIf="variant.variantTypes.length > 0; else noTypes">
+              <cvc-tag-list>
+                <cvc-variant-type-tag
+                  [variantType]="type"
+                  *ngFor="
+                    let type of variant.variantTypes
+                  "></cvc-variant-type-tag>
+              </cvc-tag-list>
+            </ng-container>
+            <ng-template #noTypes>
+              <span
+                nz-typography
+                nzType="secondary"
+                >None specified</span
+              >
+            </ng-template>
+          </nz-descriptions-item>
+        </nz-descriptions>
+      </nz-col>
+      <ng-container *ngIf="variant.ncitId; else noNcit">
+        <nz-col [nzSpan]="24">
+          <cvc-ncit-details
+            [ncitDetails]="variant.ncitDetails"></cvc-ncit-details>
+        </nz-col>
+      </ng-container>
+      <ng-template #noNcit>
+        <nz-col [nzSpan]="24">
+          <nz-card nzTitle="">
+            <cvc-empty-revisable
+              notification="Not available, please provide an NCIt ID">
+            </cvc-empty-revisable>
+          </nz-card>
+        </nz-col>
+      </ng-template>
+    </nz-row>
+  </nz-col>
+
+  <!-- RIGHT COLUMN -->
+  <nz-col nzSpan="12">
+    <!-- right col layout row -->
+    <nz-row [nzGutter]="[8, 8]">
+      <!-- BLOCK: creation and deprecation events -->
+      <nz-col [nzSpan]="24">
+        <nz-descriptions
+          nzLayout="vertical"
+          nzSize="small"
+          [nzColumn]="{ xxl: 2, xl: 2, lg: 1, md: 1, sm: 1, xs: 1 }"
+          nzBordered="true">
+          <!-- creation/deprecation curation events -->
+          <ng-container *ngIf="variant.creationActivity">
+            <nz-descriptions-item [nzTitle]="createdTitle">
+              by
+              <cvc-user-tag
+                [user]="variant.creationActivity.user"></cvc-user-tag>
+            </nz-descriptions-item>
+            <ng-template #createdTitle>
+              Created
+              <span
+                nz-typography
+                nzType="secondary">
+                ({{ variant.creationActivity.createdAt | timeAgo }})
+              </span>
+            </ng-template>
+          </ng-container>
+          <ng-container *ngIf="variant.deprecationActivity">
+            <nz-descriptions-item [nzTitle]="deprecatedTitle">
+              by
+              <cvc-user-tag
+                [user]="variant.deprecationActivity.user"></cvc-user-tag>
+            </nz-descriptions-item>
+            <ng-template #deprecatedTitle>
+              Deprecated
+              <span
+                nz-typography
+                nzType="secondary">
+                ({{ variant.deprecationActivity.createdAt | timeAgo }})
+              </span>
+            </ng-template>
+          </ng-container>
+        </nz-descriptions>
+      </nz-col>
+
+      <!-- variant related entities, attributes -->
+      <nz-col [nzSpan]="24">
+        <nz-descriptions
+          nzLayout="horizontal"
+          nzSize="small"
+          [nzColumn]="{ xxl: 2, xl: 2, lg: 1, md: 1, sm: 1, xs: 1 }"
+          nzBordered="true">
+          <!-- feature -->
+          <nz-descriptions-item [nzTitle]="variant.feature.__typename">
+            <cvc-feature-tag [feature]="variant.feature"></cvc-feature-tag>
+          </nz-descriptions-item>
+
+          <nz-descriptions-item
+            *ngIf="variant.ncitId"
+            nzTitle="Resources">
+            <cvc-tag-list>
+              <cvc-link-tag
+                [href]="
+                  'https://ncithesaurus.nci.nih.gov/ncitbrowser/ConceptReport.jsp?dictionary=NCI_Thesaurus&ns=ncit&code=' +
+                  variant.ncitId
+                "
+                [tooltip]="'View ' + variant.name + ' in the NCI Thesaurus'">
+                NCIt: {{ variant.ncitId }}
+              </cvc-link-tag>
+            </cvc-tag-list>
+          </nz-descriptions-item>
+        </nz-descriptions>
+      </nz-col>
+    </nz-row>
+  </nz-col>
+  <!-- END RIGHT COL -->
+
+  <!-- evidence table -->
+  <nz-col nzSpan="24">
+    <cvc-molecular-profiles-table
+      [variantId]="variant.id"
+      cvcHeight="300px"
+      cvcTitle="{{ variant.name }} Molecular Profiles">
+    </cvc-molecular-profiles-table>
+  </nz-col>
+</nz-row>
+}
diff --git a/client/src/app/components/variants/factor-variant-summary/factor-variant-summary.page.less b/client/src/app/components/variants/factor-variant-summary/factor-variant-summary.page.less
new file mode 100644
index 000000000..b2848ee08
--- /dev/null
+++ b/client/src/app/components/variants/factor-variant-summary/factor-variant-summary.page.less
@@ -0,0 +1,9 @@
+@import "themes/overrides/descriptions-overrides.less";
+:host {
+  display: block;
+}
+
+nz-space,
+nz-space-item {
+  width: 100%;
+}
diff --git a/client/src/app/components/variants/factor-variant-summary/factor-variant-summary.page.ts b/client/src/app/components/variants/factor-variant-summary/factor-variant-summary.page.ts
new file mode 100644
index 000000000..91cf5189c
--- /dev/null
+++ b/client/src/app/components/variants/factor-variant-summary/factor-variant-summary.page.ts
@@ -0,0 +1,55 @@
+import { CommonModule } from '@angular/common'
+import { Component, Input, OnInit } from '@angular/core'
+import { CvcTagListModule } from '@app/components/shared/tag-list/tag-list.module'
+
+import { NzDescriptionsModule } from 'ng-zorro-antd/descriptions'
+import { NzGridModule } from 'ng-zorro-antd/grid'
+import { NzTagModule } from 'ng-zorro-antd/tag'
+import { CvcVariantTypeTagModule } from '@app/components/variant-types/variant-type-tag/variant-type-tag.module'
+import { CvcCoordinatesCardModule } from '../coordinates-card/coordinates-card.module'
+import { CvcLinkTagModule } from '@app/components/shared/link-tag/link-tag.module'
+import { NzCardModule } from 'ng-zorro-antd/card'
+import { CvcEmptyRevisableModule } from '@app/components/shared/empty-revisable/empty-revisable.module'
+import { CvcMolecularProfilesTableModule } from '@app/components/molecular-profiles/molecular-profile-table/molecular-profile-table.module'
+import { CvcMyVariantInfoModule } from '../my-variant-info/my-variant-info.module'
+import { PushPipe } from '@ngrx/component'
+import { VariantSummaryFieldsFragment } from '@app/generated/civic.apollo'
+import { CvcUserTagModule } from '@app/components/users/user-tag/user-tag.module'
+import { CvcFeatureTagModule } from '@app/components/features/feature-tag/feature-tag.module'
+import { CvcPipesModule } from '@app/core/pipes/pipes.module'
+import { CvcNcitDetailsComponent } from '@app/components/factors/ncit-details/ncit-details.component'
+
+@Component({
+  standalone: true,
+  selector: 'cvc-factor-variant-summary',
+  templateUrl: './factor-variant-summary.page.html',
+  styleUrls: ['./factor-variant-summary.page.less'],
+  imports: [
+    CommonModule,
+    PushPipe,
+    NzGridModule,
+    NzDescriptionsModule,
+    NzTagModule,
+    NzCardModule,
+    CvcEmptyRevisableModule,
+    CvcTagListModule,
+    CvcVariantTypeTagModule,
+    CvcCoordinatesCardModule,
+    CvcLinkTagModule,
+    CvcUserTagModule,
+    CvcFeatureTagModule,
+    CvcMolecularProfilesTableModule,
+    CvcMyVariantInfoModule,
+    CvcPipesModule,
+    CvcNcitDetailsComponent,
+  ],
+})
+export class CvcFactorVariantSummaryComponent implements OnInit {
+  @Input() variant!: VariantSummaryFieldsFragment
+
+  ngOnInit() {
+    if (this.variant == undefined) {
+      throw new Error('Must pass FactorVariant into FactorVariant summary')
+    }
+  }
+}
diff --git a/client/src/app/forms/config/factor-variant-revise/factor-variant-revise.form.config.ts b/client/src/app/forms/config/factor-variant-revise/factor-variant-revise.form.config.ts
new file mode 100644
index 000000000..61db592ee
--- /dev/null
+++ b/client/src/app/forms/config/factor-variant-revise/factor-variant-revise.form.config.ts
@@ -0,0 +1,145 @@
+import { factorVariantReviseFormInitialModel } from '@app/forms/models/factor-variant-revise.model'
+import assignFieldConfigDefaultValues from '@app/forms/utilities/assign-field-default-values'
+import { CvcFormCardWrapperProps } from '@app/forms/wrappers/form-card/form-card.wrapper'
+import { CvcFormLayoutWrapperProps } from '@app/forms/wrappers/form-layout/form-layout.wrapper'
+import { FormlyFieldConfig } from '@ngx-formly/core'
+import { CvcFormRowWrapperProps } from '@app/forms/wrappers/form-row/form-row.wrapper'
+import { CvcOrgSubmitButtonFieldConfig } from '@app/forms/types/org-submit-button/org-submit-button.type'
+import { FeatureInstanceTypes } from '@app/generated/civic.apollo'
+
+const formFieldConfig: FormlyFieldConfig[] = [
+  {
+    wrappers: ['form-layout'],
+    props: <CvcFormLayoutWrapperProps>{
+      showDevPanel: false,
+    },
+    fieldGroup: [
+      {
+        key: 'clientMutationId',
+        props: {
+          hidden: true,
+        },
+      },
+      {
+        key: 'fields',
+        wrappers: ['form-card'],
+        props: <CvcFormCardWrapperProps>{
+          formCardOptions: { title: 'Revise Variant' },
+        },
+        fieldGroup: [
+          {
+            wrappers: ['form-row'],
+            props: <CvcFormRowWrapperProps>{
+              formRowOptions: {
+                responsiveIndexed: [
+                  { xs: 24, md: 12, lg: 8 },
+                  { xs: 24, md: 12, lg: 8 },
+                  { xs: 24, lg: 8 },
+                ],
+              },
+            },
+            fieldGroup: [
+              {
+                key: 'featureId',
+                type: 'feature-select',
+                props: {
+                  description: 'Enter a Factor for this Variant',
+                  required: true,
+                  featureType: FeatureInstanceTypes.Factor,
+                  canChangeFeatureType: false,
+                },
+              },
+              {
+                key: 'name',
+                type: 'base-input',
+                props: {
+                  placeholder: 'Enter a name for this Variant',
+                  description:
+                    "Enter the name of the Variant according to the <a href='https://civic.readthedocs.io/en/latest/model/variants/name.html#curating-variant-names' target='blank'>Variant Curation SOP</a>",
+                  label: 'Name',
+                  required: true,
+                  rows: 1,
+                },
+              },
+              {
+                key: 'aliases',
+                type: 'tag-multi-input',
+                props: {
+                  label: 'Aliases',
+                  description:
+                    'List any aliases commonly used to refer to this Variant',
+                  placeholder: 'Enter Alias and hit return',
+                },
+              },
+            ],
+          },
+          {
+            wrappers: ['form-row'],
+            props: <CvcFormRowWrapperProps>{
+              formRowOptions: {
+                responsiveIndexed: [
+                  { xs: 24, lg: 12, xl: 6, xxl: 8 },
+                  { xs: 24, lg: 12, xl: 6, xxl: 8 },
+                  { xs: 24, xl: 12, xxl: 8 },
+                ],
+              },
+            },
+            fieldGroup: [
+              {
+                key: 'variantTypeIds',
+                type: 'variant-type-multi-select',
+              },
+              {
+                key: 'ncitId',
+                type: 'base-input',
+                props: {
+                  placeholder: 'NCI Thesaurus Code',
+                  description:
+                    'Enter the NCI Thesaurus ID for this Factor Variant',
+                  label: 'NCI Thesaurus ID',
+                  required: false,
+                },
+              },
+            ],
+          },
+        ],
+      },
+      {
+        wrappers: ['form-row'],
+        props: <CvcFormRowWrapperProps>{
+          formRowOptions: {
+            spanIndexed: [24, 12, 12],
+          },
+        },
+        fieldGroup: [
+          {
+            key: 'comment',
+            type: 'base-textarea',
+            props: {
+              label: 'Comment',
+              placeholder: 'Please enter a comment describing your revisions.',
+              required: true,
+              minLength: 10,
+            },
+          },
+          {
+            type: 'cvc-cancel-button',
+          },
+          <CvcOrgSubmitButtonFieldConfig>{
+            key: 'organizationId',
+            type: 'org-submit-button',
+            props: {
+              submitLabel: 'Submit Variant Revisions',
+              align: 'right',
+            },
+          },
+        ],
+      },
+    ],
+  },
+]
+export const factorVariantReviseFields: FormlyFieldConfig[] =
+  assignFieldConfigDefaultValues(
+    formFieldConfig,
+    factorVariantReviseFormInitialModel
+  )
diff --git a/client/src/app/forms/config/factor-variant-revise/factor-variant-revise.form.html b/client/src/app/forms/config/factor-variant-revise/factor-variant-revise.form.html
new file mode 100644
index 000000000..4cba0f61e
--- /dev/null
+++ b/client/src/app/forms/config/factor-variant-revise/factor-variant-revise.form.html
@@ -0,0 +1,32 @@
+<cvc-form-submission-status-display [redirectUrl]="this.url" [mutationState]="this.mutationState" entityType="Variant" [successMessage]="success">
+  <ng-template #success>
+    Revision(s) submitted! You will be redirected to the Revisions page or can view them <a href="{{this.url}}">here.</a>
+  </ng-template>
+  <form
+    *ngIf="model; else loadingModel"
+    nz-form
+    nzLayout="vertical"
+    [formGroup]="form"
+    (ngSubmit)="onSubmit(model)">
+    <formly-form
+      [form]="form"
+      [fields]="fields"
+      [model]="model"
+      [options]="{}"
+      (modelChange)="model = $event">
+    </formly-form>
+  </form>
+  <ng-template #loadingModel> Loading Variant... </ng-template>
+</cvc-form-submission-status-display>
+<!-- <nz-row style="background-color: #eef">
+  <nz-col nzSpan="12">
+    <h4>evidence-revise.form.html Model</h4>
+    <ngx-json-viewer [json]="model"></ngx-json-viewer>
+  </nz-col>
+  <nz-col nzSpan="12">
+    <h4>Form</h4>
+    <pre>
+touched: {{ form.touched }}
+    </pre>
+  </nz-col>
+</nz-row> -->
diff --git a/client/src/app/forms/config/factor-variant-revise/factor-variant-revise.form.module.ts b/client/src/app/forms/config/factor-variant-revise/factor-variant-revise.form.module.ts
new file mode 100644
index 000000000..0f2c94094
--- /dev/null
+++ b/client/src/app/forms/config/factor-variant-revise/factor-variant-revise.form.module.ts
@@ -0,0 +1,26 @@
+import { NgModule } from '@angular/core'
+import { CommonModule } from '@angular/common'
+import { NzFormModule } from 'ng-zorro-antd/form'
+import { NzButtonModule } from 'ng-zorro-antd/button'
+import { CvcForms2Module } from '@app/forms/forms.module'
+import { NgxJsonViewerModule } from 'ngx-json-viewer'
+import { LetDirective, PushPipe } from '@ngrx/component'
+import { CvcFormSubmissionStatusDisplayModule } from '@app/forms/components/form-submission-status-display/form-submission-status-display.module'
+import { CvcFactorVariantReviseForm } from './factor-variant-revise.form'
+
+@NgModule({
+  declarations: [CvcFactorVariantReviseForm],
+  imports: [
+    CommonModule,
+    LetDirective,
+    PushPipe,
+    NzFormModule,
+    NzButtonModule,
+    CvcForms2Module,
+    CvcFormSubmissionStatusDisplayModule,
+
+    NgxJsonViewerModule, // debug
+  ],
+  exports: [CvcFactorVariantReviseForm],
+})
+export class CvcFactorVariantReviseFormModule {}
diff --git a/client/src/app/forms/config/factor-variant-revise/factor-variant-revise.form.ts b/client/src/app/forms/config/factor-variant-revise/factor-variant-revise.form.ts
new file mode 100644
index 000000000..f4f788fdc
--- /dev/null
+++ b/client/src/app/forms/config/factor-variant-revise/factor-variant-revise.form.ts
@@ -0,0 +1,100 @@
+import {
+  AfterViewInit,
+  ChangeDetectionStrategy,
+  ChangeDetectorRef,
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core'
+import { UntypedFormGroup } from '@angular/forms'
+import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy'
+import { FormlyFieldConfig } from '@ngx-formly/core'
+import {
+  MutationState,
+  MutatorWithState,
+} from '@app/core/utilities/mutation-state-wrapper'
+import { NetworkErrorsService } from '@app/core/services/network-errors.service'
+import { FactorVariantReviseModel } from '@app/forms/models/factor-variant-revise.model'
+import {
+  FactorVariantRevisableFieldsGQL,
+  SuggestFactorVariantRevisionGQL,
+  SuggestFactorVariantRevisionMutation,
+  SuggestFactorVariantRevisionMutationVariables,
+} from '@app/generated/civic.apollo'
+import { factorVariantReviseFields } from './factor-variant-revise.form.config'
+import {
+  factorVariantFormModelToReviseInput,
+  factorVariantToModelFields,
+} from '@app/forms/utilities/factor-variant-to-model-fields'
+
+@UntilDestroy()
+@Component({
+  selector: 'cvc-factor-variant-revise-form',
+  templateUrl: './factor-variant-revise.form.html',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class CvcFactorVariantReviseForm implements OnInit, AfterViewInit {
+  @Input() variantId!: number
+  model?: FactorVariantReviseModel
+  form: UntypedFormGroup
+  fields: FormlyFieldConfig[]
+
+  reviseVariantMutator: MutatorWithState<
+    SuggestFactorVariantRevisionGQL,
+    SuggestFactorVariantRevisionMutation,
+    SuggestFactorVariantRevisionMutationVariables
+  >
+
+  mutationState?: MutationState
+  url?: string
+
+  constructor(
+    private revisableFieldsGQL: FactorVariantRevisableFieldsGQL,
+    private submitRevisionsGQL: SuggestFactorVariantRevisionGQL,
+    private networkErrorService: NetworkErrorsService,
+    private cdr: ChangeDetectorRef
+  ) {
+    this.form = new UntypedFormGroup({})
+    this.fields = factorVariantReviseFields
+    this.reviseVariantMutator = new MutatorWithState(networkErrorService)
+  }
+
+  ngOnInit() {
+    this.url = `/variants/${this.variantId}/revisions`
+  }
+
+  ngAfterViewInit(): void {
+    this.revisableFieldsGQL
+      .fetch({ variantId: this.variantId })
+      .pipe(untilDestroyed(this))
+      .subscribe({
+        next: ({ data: { variant } }) => {
+          if (variant && variant.__typename == 'FactorVariant') {
+            this.model = {
+              id: variant.id,
+              fields: factorVariantToModelFields(variant),
+            }
+            this.cdr.detectChanges()
+          }
+        },
+        error: (error) => {
+          console.error('Error retrieving Variant.')
+          console.error(error)
+        },
+        complete: () => {},
+      })
+  }
+
+  onSubmit(model: FactorVariantReviseModel) {
+    if (!this.variantId) {
+      return
+    }
+    let input = factorVariantFormModelToReviseInput(this.variantId, model)
+    if (input) {
+      this.mutationState = this.reviseVariantMutator.mutate(
+        this.submitRevisionsGQL,
+        { input: input }
+      )
+    }
+  }
+}
diff --git a/client/src/app/forms/config/factor-variant-revise/factor-variant-revise.query.gql b/client/src/app/forms/config/factor-variant-revise/factor-variant-revise.query.gql
new file mode 100644
index 000000000..ac03b8b44
--- /dev/null
+++ b/client/src/app/forms/config/factor-variant-revise/factor-variant-revise.query.gql
@@ -0,0 +1,37 @@
+query FactorVariantRevisableFields($variantId: Int!) {
+  variant(id: $variantId) {
+    id
+    ... on FactorVariant  {
+      ...RevisableFactorVariantFields
+    }
+  }
+}
+
+fragment RevisableFactorVariantFields on FactorVariant {
+  name
+  feature {
+    id
+    name
+  }
+  variantAliases
+  variantTypes {
+    id
+    name
+    soid
+  }
+  ncitId
+}
+
+mutation SuggestFactorVariantRevision($input: SuggestFactorVariantRevisionInput!) {
+  suggestFactorVariantRevision(input: $input) {
+    clientMutationId
+    variant {
+      id
+    }
+    results {
+      id
+      fieldName
+      newlyCreated
+    }
+  }
+}
diff --git a/client/src/app/forms/config/factor-variant-revise/variant-revise.form.config.ts b/client/src/app/forms/config/factor-variant-revise/variant-revise.form.config.ts
new file mode 100644
index 000000000..ff35f4cf3
--- /dev/null
+++ b/client/src/app/forms/config/factor-variant-revise/variant-revise.form.config.ts
@@ -0,0 +1,366 @@
+import { AbstractControl } from '@angular/forms'
+import { Chromosomes } from '@app/forms/utilities/input-formatters'
+import { geneVariantReviseFormInitialModel } from '@app/forms/models/gene-variant-revise.model'
+import assignFieldConfigDefaultValues from '@app/forms/utilities/assign-field-default-values'
+import { CvcFormCardWrapperProps } from '@app/forms/wrappers/form-card/form-card.wrapper'
+import { CvcFormLayoutWrapperProps } from '@app/forms/wrappers/form-layout/form-layout.wrapper'
+import { FormlyFieldConfig } from '@ngx-formly/core'
+import { CvcFormRowWrapperProps } from '@app/forms/wrappers/form-row/form-row.wrapper'
+import { CvcOrgSubmitButtonFieldConfig } from '@app/forms/types/org-submit-button/org-submit-button.type'
+
+const formFieldConfig: FormlyFieldConfig[] = [
+  {
+    wrappers: ['form-layout'],
+    props: <CvcFormLayoutWrapperProps>{
+      showDevPanel: false,
+    },
+    fieldGroup: [
+      {
+        key: 'clientMutationId',
+        props: {
+          hidden: true,
+        },
+      },
+      {
+        key: 'fields',
+        wrappers: ['form-card'],
+        props: <CvcFormCardWrapperProps>{
+          formCardOptions: { title: 'Revise Variant' },
+        },
+        fieldGroup: [
+          {
+            wrappers: ['form-row'],
+            props: <CvcFormRowWrapperProps>{
+              formRowOptions: {
+                responsiveIndexed: [
+                  { xs: 24, md: 12, lg: 8 },
+                  { xs: 24, md: 12, lg: 8 },
+                  { xs: 24, lg: 8 },
+                ],
+              },
+            },
+            fieldGroup: [
+              {
+                key: 'featureId',
+                type: 'feature-select',
+                props: {
+                  description: 'Enter an Entrez Gene for this Variant',
+                  required: true,
+                },
+              },
+              {
+                key: 'name',
+                type: 'base-input',
+                props: {
+                  placeholder: 'Enter a name for this Variant',
+                  description:
+                    "Enter the name of the Variant according to the <a href='https://civic.readthedocs.io/en/latest/model/variants/name.html#curating-variant-names' target='blank'>Variant Curation SOP</a>",
+                  label: 'Name',
+                  required: true,
+                  rows: 1,
+                },
+              },
+              {
+                key: 'aliases',
+                type: 'tag-multi-input',
+                props: {
+                  label: 'Aliases',
+                  description:
+                    'List any aliases commonly used to refer to this Variant',
+                  placeholder: 'Enter Alias and hit return',
+                },
+              },
+            ],
+          },
+          {
+            wrappers: ['form-row'],
+            props: <CvcFormRowWrapperProps>{
+              formRowOptions: {
+                responsiveIndexed: [
+                  { xs: 24, lg: 12, xl: 6, xxl: 8 },
+                  { xs: 24, lg: 12, xl: 6, xxl: 8 },
+                  { xs: 24, xl: 12, xxl: 8 },
+                ],
+              },
+            },
+            fieldGroup: [
+              {
+                key: 'hgvsDescriptions',
+                type: 'tag-multi-input',
+                props: {
+                  label: 'HGVS Descriptions',
+                  description:
+                    'Enter any HGVS nomenclature descriptions of this Variant',
+                  tooltip:
+                    'Human Genome Variation Society nomenclature descriptions',
+                  placeholder: 'Enter HGVS and hit return',
+                },
+              },
+              {
+                key: 'variantTypeIds',
+                type: 'variant-type-multi-select',
+              },
+              {
+                key: 'clinvarIds',
+                type: 'clinvar-multi-input',
+                wrappers: ['form-field'],
+                props: {
+                  label: 'ClinVar IDs',
+                },
+              },
+            ],
+          },
+          {
+            wrappers: ['form-row'],
+            props: <CvcFormRowWrapperProps>{
+              formRowOptions: {
+                span: 24,
+              },
+            },
+            fieldGroup: [
+              {
+                wrappers: ['form-card'],
+                props: <CvcFormCardWrapperProps>{
+                  formCardOptions: {
+                    title: `Primary (5') Coordinates`,
+                    size: 'small',
+                  },
+                },
+                fieldGroup: [
+                  {
+                    wrappers: ['form-row'],
+                    props: <CvcFormRowWrapperProps>{
+                      formRowOptions: {
+                        responsive: { xs: 24, md: 12, lg: 8, xxl: 6 },
+                      },
+                    },
+                    fieldGroup: [
+                      {
+                        key: 'referenceBuild',
+                        type: 'reference-build-select',
+                      },
+                      {
+                        key: 'ensemblVersion',
+                        type: 'base-input',
+                        validators: {
+                          nccnVersionNumber: {
+                            expression: (c: AbstractControl) =>
+                              c.value ? /^\d{2,3}$/.test(c.value) : true,
+                            message: (_: any, field: FormlyFieldConfig) =>
+                              `"${field.formControl?.value}" does not appear to be an Ensembl version number`,
+                          },
+                        },
+                        props: {
+                          label: 'Ensembl Version',
+                          description:
+                            'Enter a valid Ensembl database version (e.g. 75)',
+                        },
+                      },
+                      {
+                        key: 'referenceBases',
+                        type: 'base-input',
+                        validators: {
+                          nccnVersionNumber: {
+                            expression: (c: AbstractControl) =>
+                              c.value ? /^[ACTG\\]+$/.test(c.value) : true,
+                            message: (_: any, field: FormlyFieldConfig) =>
+                              `"${field.formControl?.value}" contains invalid characters.`,
+                          },
+                        },
+                        props: {
+                          label: 'Reference Bases',
+                          description:
+                            'The nucleotide(s) of the reference genome affected by the variant. Only used for SNVs and Indels (otherwise leave blank)',
+                        },
+                      },
+                      {
+                        key: 'variantBases',
+                        type: 'base-input',
+                        validators: {
+                          nccnVersionNumber: {
+                            expression: (c: AbstractControl) =>
+                              c.value ? /^[ACTG\\]+$/.test(c.value) : true,
+                            message: (_: any, field: FormlyFieldConfig) =>
+                              `"${field.formControl?.value}" contains invalid characters.`,
+                          },
+                        },
+                        props: {
+                          label: 'Variant Bases',
+                          description:
+                            'The nucleotide(s) of the variant allele. Only used for SNVs and Indels (otherwise leave blank)',
+                        },
+                      },
+                      {
+                        key: 'chromosome',
+                        type: 'base-select',
+                        props: {
+                          label: 'Chromosome',
+                          options: Chromosomes,
+                          description:
+                            'Specify the chromosome in which this variant occurs (e.g. 17).',
+                        },
+                      },
+                      {
+                        key: 'start',
+                        type: 'base-input',
+                        validators: {
+                          isNumeric: {
+                            expression: (c: AbstractControl) =>
+                              c.value ? /^\d+$/.test(c.value) : true,
+                            message: (_: any, field: FormlyFieldConfig) =>
+                              'Start coordinate must be numeric',
+                          },
+                        },
+                        props: {
+                          label: 'Start',
+                          description:
+                            'Enter the left/first coordinate of this variant. Must be ≤ the Stop coordinate. Coordinate must be compatible with the selected reference build.',
+                        },
+                      },
+                      {
+                        key: 'stop',
+                        type: 'base-input',
+                        validators: {
+                          isNumeric: {
+                            expression: (c: AbstractControl) =>
+                              c.value ? /^\d+$/.test(c.value) : true,
+                            message: (_: any, field: FormlyFieldConfig) =>
+                              'Stop coordinate must be numeric',
+                          },
+                        },
+                        props: {
+                          label: 'Stop',
+                          description:
+                            'Provide the right/second coordinate of this variant. Must be ≥ the Start coordinate. Coordinate must be compatible with the selected reference build.',
+                        },
+                      },
+                      {
+                        key: 'representativeTranscript',
+                        type: 'base-input',
+                        props: {
+                          label: 'Representative Transcript',
+                          description:
+                            'Specify a transcript ID, including version number (e.g. ENST00000348159.4, the canonical transcript defined by Ensembl).',
+                        },
+                      },
+                    ],
+                  },
+                ],
+              },
+              {
+                wrappers: ['form-card'],
+                props: <CvcFormCardWrapperProps>{
+                  formCardOptions: {
+                    title: `Secondary (3') Coordinates`,
+                    size: 'small',
+                  },
+                },
+                fieldGroup: [
+                  {
+                    wrappers: ['form-row'],
+                    props: <CvcFormRowWrapperProps>{
+                      formRowOptions: {
+                        responsive: { xs: 24, md: 12, lg: 8, xxl: 6 },
+                      },
+                    },
+                    fieldGroup: [
+                      {
+                        key: 'chromosome2',
+                        type: 'base-select',
+                        props: {
+                          label: 'Chromosome',
+                          options: Chromosomes,
+                          description:
+                            'If this variant is a fusion (e.g. BCR-ABL1), specify the chromosome name, coordinates, and representative transcript for the 3-prime partner.',
+                        },
+                      },
+                      {
+                        key: 'start2',
+                        type: 'base-input',
+                        validators: {
+                          isNumeric: {
+                            expression: (c: AbstractControl) =>
+                              c.value ? /^\d+$/.test(c.value) : true,
+                            message: (_: any, field: FormlyFieldConfig) =>
+                              'Start coordinate must be numeric',
+                          },
+                        },
+                        props: {
+                          label: 'Start',
+                          description:
+                            'Enter the left/first coordinate of this 3-prime partner fusion variant. Must be ≤ the Stop coordinate. Coordinate must be compatible with the selected reference build.',
+                        },
+                      },
+                      {
+                        key: 'stop2',
+                        type: 'base-input',
+                        validators: {
+                          isNumeric: {
+                            expression: (c: AbstractControl) =>
+                              c.value ? /^\d+$/.test(c.value) : true,
+                            message: (_: any, field: FormlyFieldConfig) =>
+                              'Stop coordinate must be numeric',
+                          },
+                        },
+                        props: {
+                          label: 'Stop',
+                          description:
+                            'Provide the right/second coordinate of this 3-prime partner fusion variant. Must be ≥ the Start coordinate. Coordinate must be compatible with the selected reference build.',
+                        },
+                      },
+                      {
+                        key: 'representativeTranscript2',
+                        type: 'base-input',
+                        props: {
+                          label: 'Representative Transcript',
+                          description:
+                            'Specify a transcript ID, including version number (e.g. ENST00000348159.4, the canonical transcript defined by Ensembl).',
+                        },
+                      },
+                    ],
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+      },
+      {
+        wrappers: ['form-row'],
+        props: <CvcFormRowWrapperProps>{
+          formRowOptions: {
+            spanIndexed: [24, 12, 12],
+          },
+        },
+        fieldGroup: [
+          {
+            key: 'comment',
+            type: 'base-textarea',
+            props: {
+              label: 'Comment',
+              placeholder: 'Please enter a comment describing your revisions.',
+              required: true,
+              minLength: 10,
+            },
+          },
+          {
+            type: 'cvc-cancel-button',
+          },
+          <CvcOrgSubmitButtonFieldConfig>{
+            key: 'organizationId',
+            type: 'org-submit-button',
+            props: {
+              submitLabel: 'Submit Variant Revisions',
+              align: 'right',
+            },
+          },
+        ],
+      },
+    ],
+  },
+]
+export const geneVariantReviseFields: FormlyFieldConfig[] =
+  assignFieldConfigDefaultValues(
+    formFieldConfig,
+    geneVariantReviseFormInitialModel
+  )
diff --git a/client/src/app/forms/config/gene-variant-revise/gene-variant-revise.form.config.ts b/client/src/app/forms/config/gene-variant-revise/gene-variant-revise.form.config.ts
index ff35f4cf3..2eedb98dc 100644
--- a/client/src/app/forms/config/gene-variant-revise/gene-variant-revise.form.config.ts
+++ b/client/src/app/forms/config/gene-variant-revise/gene-variant-revise.form.config.ts
@@ -46,6 +46,7 @@ const formFieldConfig: FormlyFieldConfig[] = [
                 props: {
                   description: 'Enter an Entrez Gene for this Variant',
                   required: true,
+                  canChangeFeatureType: false,
                 },
               },
               {
diff --git a/client/src/app/forms/models/factor-variant-fields.model.ts b/client/src/app/forms/models/factor-variant-fields.model.ts
new file mode 100644
index 000000000..fb7f6be4b
--- /dev/null
+++ b/client/src/app/forms/models/factor-variant-fields.model.ts
@@ -0,0 +1,7 @@
+export type FactorVariantFields = {
+  name?: string
+  aliases?: string[]
+  variantTypeIds?: number[]
+  featureId?: number
+  ncitId?: string
+}
diff --git a/client/src/app/forms/models/factor-variant-revise.model.ts b/client/src/app/forms/models/factor-variant-revise.model.ts
new file mode 100644
index 000000000..818da9c0c
--- /dev/null
+++ b/client/src/app/forms/models/factor-variant-revise.model.ts
@@ -0,0 +1,22 @@
+import { FormReviseBaseModel } from './form-revise-base.model'
+import { FactorVariantFields } from './factor-variant-fields.model'
+
+export interface FactorVariantReviseModel extends FormReviseBaseModel {
+  fields: FactorVariantFields
+}
+
+export const factorVariantReviseFieldsDefaults: FactorVariantFields = {
+  name: undefined,
+  aliases: undefined,
+  variantTypeIds: undefined,
+  featureId: undefined,
+  ncitId: undefined,
+}
+
+export const factorVariantReviseFormInitialModel: FactorVariantReviseModel = {
+  id: undefined,
+  clientMutationId: undefined,
+  fields: factorVariantReviseFieldsDefaults,
+  comment: undefined,
+  organizationId: undefined,
+}
diff --git a/client/src/app/forms/types/feature-select/feature-select.type.html b/client/src/app/forms/types/feature-select/feature-select.type.html
index 50d8ff65f..5e9caaa09 100644
--- a/client/src/app/forms/types/feature-select/feature-select.type.html
+++ b/client/src/app/forms/types/feature-select/feature-select.type.html
@@ -3,6 +3,7 @@
   <nz-col nzFlex="100px">
     <nz-form-item>
       <nz-select
+        [disabled]="!props.canChangeFeatureType"
         [(ngModel)]="selectedFeatureType"
         (ngModelChange)="this.onFeatureType$?.next($event)">
         <nz-option
diff --git a/client/src/app/forms/types/feature-select/feature-select.type.ts b/client/src/app/forms/types/feature-select/feature-select.type.ts
index e6d3c54bf..a47644d71 100644
--- a/client/src/app/forms/types/feature-select/feature-select.type.ts
+++ b/client/src/app/forms/types/feature-select/feature-select.type.ts
@@ -85,14 +85,15 @@ export class CvcFeatureSelectField
       isMultiSelect: false,
       entityName: { singular: 'Feature', plural: 'Features' },
       description: 'Feature Name',
+      featureType: FeatureInstanceTypes.Gene,
+      canChangeFeatureType: true,
     },
-    featureType: FeatureInstanceTypes.Gene,
   }
 
   @ViewChildren('optionTemplates', { read: TemplateRef })
   optionTemplates?: QueryList<TemplateRef<any>>
 
-  selectedFeatureType: FeatureInstanceTypes = this.defaultOptions.featureType
+  selectedFeatureType?: FeatureInstanceTypes = this.props.featureType
   onFeatureType$?: BehaviorSubject<Maybe<FeatureInstanceTypes>> =
     new BehaviorSubject<Maybe<FeatureInstanceTypes>>(undefined)
 
@@ -105,6 +106,7 @@ export class CvcFeatureSelectField
   }
 
   ngAfterViewInit(): void {
+    this.selectedFeatureType = this.props.featureType
     this.configureBaseField() // mixin fn
     this.configureEntitySelectField({
       // mixin fn
diff --git a/client/src/app/forms/utilities/factor-variant-to-model-fields.ts b/client/src/app/forms/utilities/factor-variant-to-model-fields.ts
new file mode 100644
index 000000000..d964a2e0d
--- /dev/null
+++ b/client/src/app/forms/utilities/factor-variant-to-model-fields.ts
@@ -0,0 +1,43 @@
+import {
+  Maybe,
+  RevisableFactorVariantFieldsFragment,
+  SuggestFactorVariantRevisionInput,
+} from '@app/generated/civic.apollo'
+import * as fmt from '@app/forms/utilities/input-formatters'
+import { FactorVariantReviseModel } from '../models/factor-variant-revise.model'
+import { FactorVariantFields } from '../models/factor-variant-fields.model'
+
+export function factorVariantToModelFields(
+  variant: RevisableFactorVariantFieldsFragment
+): FactorVariantFields {
+  return {
+    name: variant.name,
+    aliases: variant.variantAliases,
+    variantTypeIds: variant.variantTypes.map((vt) => vt.id),
+    featureId: variant.feature.id,
+    ncitId: variant.ncitId,
+  }
+}
+
+export function factorVariantFormModelToReviseInput(
+  vid: number,
+  model: FactorVariantReviseModel
+): Maybe<SuggestFactorVariantRevisionInput> {
+  const fields = model.fields
+  if (!model.comment || !fields.name || !fields.featureId) {
+    return undefined
+  }
+
+  return {
+    id: vid,
+    fields: {
+      name: fields.name,
+      aliases: fields.aliases || [],
+      variantTypeIds: fields.variantTypeIds || [],
+      featureId: fields.featureId,
+      ncitId: fmt.toNullableString(fields.ncitId),
+    },
+    organizationId: model.organizationId,
+    comment: model.comment!,
+  }
+}
diff --git a/client/src/app/generated/civic.apollo-helpers.ts b/client/src/app/generated/civic.apollo-helpers.ts
index a62ac9d64..e809a96fb 100644
--- a/client/src/app/generated/civic.apollo-helpers.ts
+++ b/client/src/app/generated/civic.apollo-helpers.ts
@@ -847,7 +847,7 @@ export type FactorFieldPolicy = {
 	sources?: FieldPolicy<any> | FieldReadFunction<any>,
 	variants?: FieldPolicy<any> | FieldReadFunction<any>
 };
-export type FactorVariantKeySpecifier = ('comments' | 'creationActivity' | 'deprecated' | 'deprecationActivity' | 'deprecationReason' | 'events' | 'feature' | 'flagged' | 'flags' | 'id' | 'lastAcceptedRevisionEvent' | 'lastCommentEvent' | 'lastSubmittedRevisionEvent' | 'link' | 'molecularProfiles' | 'name' | 'ncitId' | 'revisions' | 'singleVariantMolecularProfile' | 'singleVariantMolecularProfileId' | 'variantAliases' | 'variantTypes' | FactorVariantKeySpecifier)[];
+export type FactorVariantKeySpecifier = ('comments' | 'creationActivity' | 'deprecated' | 'deprecationActivity' | 'deprecationReason' | 'events' | 'feature' | 'flagged' | 'flags' | 'id' | 'lastAcceptedRevisionEvent' | 'lastCommentEvent' | 'lastSubmittedRevisionEvent' | 'link' | 'molecularProfiles' | 'name' | 'ncitDetails' | 'ncitId' | 'revisions' | 'singleVariantMolecularProfile' | 'singleVariantMolecularProfileId' | 'variantAliases' | 'variantTypes' | FactorVariantKeySpecifier)[];
 export type FactorVariantFieldPolicy = {
 	comments?: FieldPolicy<any> | FieldReadFunction<any>,
 	creationActivity?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -865,6 +865,7 @@ export type FactorVariantFieldPolicy = {
 	link?: FieldPolicy<any> | FieldReadFunction<any>,
 	molecularProfiles?: FieldPolicy<any> | FieldReadFunction<any>,
 	name?: FieldPolicy<any> | FieldReadFunction<any>,
+	ncitDetails?: FieldPolicy<any> | FieldReadFunction<any>,
 	ncitId?: FieldPolicy<any> | FieldReadFunction<any>,
 	revisions?: FieldPolicy<any> | FieldReadFunction<any>,
 	singleVariantMolecularProfile?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -1275,7 +1276,7 @@ export type MolecularProfileTextSegmentKeySpecifier = ('text' | MolecularProfile
 export type MolecularProfileTextSegmentFieldPolicy = {
 	text?: FieldPolicy<any> | FieldReadFunction<any>
 };
-export type MutationKeySpecifier = ('acceptRevisions' | 'addComment' | 'addDisease' | 'addRemoteCitation' | 'addTherapy' | 'createFeature' | 'createMolecularProfile' | 'createVariant' | 'deprecateComplexMolecularProfile' | 'deprecateFeature' | 'deprecateVariant' | 'editUser' | 'flagEntity' | 'moderateAssertion' | 'moderateEvidenceItem' | 'rejectRevisions' | 'resolveFlag' | 'submitAssertion' | 'submitEvidence' | 'submitVariantGroup' | 'subscribe' | 'suggestAssertionRevision' | 'suggestEvidenceItemRevision' | 'suggestFactorRevision' | 'suggestGeneRevision' | 'suggestGeneVariantRevision' | 'suggestMolecularProfileRevision' | 'suggestSource' | 'suggestVariantGroupRevision' | 'unsubscribe' | 'updateCoi' | 'updateNotificationStatus' | 'updateSourceSuggestionStatus' | MutationKeySpecifier)[];
+export type MutationKeySpecifier = ('acceptRevisions' | 'addComment' | 'addDisease' | 'addRemoteCitation' | 'addTherapy' | 'createFeature' | 'createMolecularProfile' | 'createVariant' | 'deprecateComplexMolecularProfile' | 'deprecateFeature' | 'deprecateVariant' | 'editUser' | 'flagEntity' | 'moderateAssertion' | 'moderateEvidenceItem' | 'rejectRevisions' | 'resolveFlag' | 'submitAssertion' | 'submitEvidence' | 'submitVariantGroup' | 'subscribe' | 'suggestAssertionRevision' | 'suggestEvidenceItemRevision' | 'suggestFactorRevision' | 'suggestFactorVariantRevision' | 'suggestGeneRevision' | 'suggestGeneVariantRevision' | 'suggestMolecularProfileRevision' | 'suggestSource' | 'suggestVariantGroupRevision' | 'unsubscribe' | 'updateCoi' | 'updateNotificationStatus' | 'updateSourceSuggestionStatus' | MutationKeySpecifier)[];
 export type MutationFieldPolicy = {
 	acceptRevisions?: FieldPolicy<any> | FieldReadFunction<any>,
 	addComment?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -1301,6 +1302,7 @@ export type MutationFieldPolicy = {
 	suggestAssertionRevision?: FieldPolicy<any> | FieldReadFunction<any>,
 	suggestEvidenceItemRevision?: FieldPolicy<any> | FieldReadFunction<any>,
 	suggestFactorRevision?: FieldPolicy<any> | FieldReadFunction<any>,
+	suggestFactorVariantRevision?: FieldPolicy<any> | FieldReadFunction<any>,
 	suggestGeneRevision?: FieldPolicy<any> | FieldReadFunction<any>,
 	suggestGeneVariantRevision?: FieldPolicy<any> | FieldReadFunction<any>,
 	suggestMolecularProfileRevision?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -1916,6 +1918,12 @@ export type SuggestFactorRevisionPayloadFieldPolicy = {
 	factor?: FieldPolicy<any> | FieldReadFunction<any>,
 	results?: FieldPolicy<any> | FieldReadFunction<any>
 };
+export type SuggestFactorVariantRevisionPayloadKeySpecifier = ('clientMutationId' | 'results' | 'variant' | SuggestFactorVariantRevisionPayloadKeySpecifier)[];
+export type SuggestFactorVariantRevisionPayloadFieldPolicy = {
+	clientMutationId?: FieldPolicy<any> | FieldReadFunction<any>,
+	results?: FieldPolicy<any> | FieldReadFunction<any>,
+	variant?: FieldPolicy<any> | FieldReadFunction<any>
+};
 export type SuggestGeneRevisionPayloadKeySpecifier = ('clientMutationId' | 'gene' | 'results' | SuggestGeneRevisionPayloadKeySpecifier)[];
 export type SuggestGeneRevisionPayloadFieldPolicy = {
 	clientMutationId?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -2937,6 +2945,10 @@ export type StrictTypedTypePolicies = {
 		keyFields?: false | SuggestFactorRevisionPayloadKeySpecifier | (() => undefined | SuggestFactorRevisionPayloadKeySpecifier),
 		fields?: SuggestFactorRevisionPayloadFieldPolicy,
 	},
+	SuggestFactorVariantRevisionPayload?: Omit<TypePolicy, "fields" | "keyFields"> & {
+		keyFields?: false | SuggestFactorVariantRevisionPayloadKeySpecifier | (() => undefined | SuggestFactorVariantRevisionPayloadKeySpecifier),
+		fields?: SuggestFactorVariantRevisionPayloadFieldPolicy,
+	},
 	SuggestGeneRevisionPayload?: Omit<TypePolicy, "fields" | "keyFields"> & {
 		keyFields?: false | SuggestGeneRevisionPayloadKeySpecifier | (() => undefined | SuggestGeneRevisionPayloadKeySpecifier),
 		fields?: SuggestGeneRevisionPayloadFieldPolicy,
diff --git a/client/src/app/generated/civic.apollo.ts b/client/src/app/generated/civic.apollo.ts
index aee224d68..73f0ef2e2 100644
--- a/client/src/app/generated/civic.apollo.ts
+++ b/client/src/app/generated/civic.apollo.ts
@@ -2055,6 +2055,7 @@ export type FactorVariant = Commentable & EventOriginObject & EventSubject & Fla
   link: Scalars['String'];
   molecularProfiles: MolecularProfileConnection;
   name: Scalars['String'];
+  ncitDetails?: Maybe<NcitDetails>;
   ncitId?: Maybe<Scalars['String']>;
   /** List and filter revisions. */
   revisions: RevisionConnection;
@@ -2122,6 +2123,20 @@ export type FactorVariantRevisionsArgs = {
   status?: InputMaybe<RevisionStatus>;
 };
 
+/** Fields on a FactorVariant that curators may propose revisions to. */
+export type FactorVariantFields = {
+  /** List of aliases or alternate names for the Variant. */
+  aliases: Array<Scalars['String']>;
+  /** The ID of the Feature this Variant corresponds to. */
+  featureId: Scalars['Int'];
+  /** The Variant's name. */
+  name: Scalars['String'];
+  /** NCI Thesaurus concept ID for this Factor */
+  ncitId: NullableStringInput;
+  /** List of IDs for the variant types for this Variant */
+  variantTypeIds: Array<Scalars['Int']>;
+};
+
 export type FdaCode = {
   __typename: 'FdaCode';
   code: Scalars['String'];
@@ -3322,6 +3337,8 @@ export type Mutation = {
   suggestEvidenceItemRevision?: Maybe<SuggestEvidenceItemRevisionPayload>;
   /** Suggest a Revision to a Feature entity of instance type "Factor". */
   suggestFactorRevision?: Maybe<SuggestFactorRevisionPayload>;
+  /** Suggest a Revision to a Variant entity. */
+  suggestFactorVariantRevision?: Maybe<SuggestFactorVariantRevisionPayload>;
   /** Suggest a Revision to a Feature entity of instance type "Gene". */
   suggestGeneRevision?: Maybe<SuggestGeneRevisionPayload>;
   /** Suggest a Revision to a Variant entity. */
@@ -3463,6 +3480,11 @@ export type MutationSuggestFactorRevisionArgs = {
 };
 
 
+export type MutationSuggestFactorVariantRevisionArgs = {
+  input: SuggestFactorVariantRevisionInput;
+};
+
+
 export type MutationSuggestGeneRevisionArgs = {
   input: SuggestGeneRevisionInput;
 };
@@ -5560,6 +5582,45 @@ export type SuggestFactorRevisionPayload = {
   results: Array<RevisionResult>;
 };
 
+/** Autogenerated input type of SuggestFactorVariantRevision */
+export type SuggestFactorVariantRevisionInput = {
+  /** A unique identifier for the client performing the mutation. */
+  clientMutationId?: InputMaybe<Scalars['String']>;
+  /** Text describing the reason for the change. Will be attached to the Revision as a comment. */
+  comment?: InputMaybe<Scalars['String']>;
+  /**
+   * The desired state of the Variant's editable fields if the change were applied.
+   * If no change is desired for a particular field, pass in the current value of that field.
+   */
+  fields: FactorVariantFields;
+  /** The ID of the Variant to suggest a Revision to. */
+  id: Scalars['Int'];
+  /**
+   * The ID of the organization to credit the user's contributions to.
+   * If the user belongs to a single organization or no organizations, this field is not required.
+   * This field is required if the user belongs to more than one organization.
+   * The user must belong to the organization provided.
+   */
+  organizationId?: InputMaybe<Scalars['Int']>;
+};
+
+/** Autogenerated return type of SuggestFactorVariantRevision. */
+export type SuggestFactorVariantRevisionPayload = {
+  __typename: 'SuggestFactorVariantRevisionPayload';
+  /** A unique identifier for the client performing the mutation. */
+  clientMutationId?: Maybe<Scalars['String']>;
+  /**
+   * A list of Revisions generated as a result of this suggestion.
+   * If an existing Revision exactly matches the proposed one, it will be returned instead.
+   * This is indicated via the 'newlyCreated' Boolean.
+   * Revisions are stored on a per-field basis.
+   * The changesetId can be used to group Revisions proposed at the same time.
+   */
+  results: Array<RevisionResult>;
+  /** The Variant the user has proposed a Revision to. */
+  variant: FactorVariant;
+};
+
 /** Autogenerated input type of SuggestGeneRevision */
 export type SuggestGeneRevisionInput = {
   /** A unique identifier for the client performing the mutation. */
@@ -5635,7 +5696,7 @@ export type SuggestGeneVariantRevisionPayload = {
    */
   results: Array<RevisionResult>;
   /** The Variant the user has proposed a Revision to. */
-  variant: VariantInterface;
+  variant: GeneVariant;
 };
 
 /** Autogenerated input type of SuggestMolecularProfileRevision */
@@ -6614,45 +6675,45 @@ export type ActivityFeedQueryVariables = Exact<{
 }>;
 
 
-export type ActivityFeedQuery = { __typename: 'Query', activities: { __typename: 'ActivityInterfaceConnection', pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, edges: Array<{ __typename: 'ActivityInterfaceEdge', cursor: string, node?: { __typename: 'AcceptRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CommentActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CreateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CreateFeatureActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CreateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'DeprecateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'DeprecateFeatureActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'DeprecateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'FlagEntityActivity', id: number, verbiage: string, createdAt: any, flag: { __typename: 'Flag', id: number, name: string, link: string }, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ModerateAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ModerateEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'RejectRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ResolveFlagActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SubmitAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SubmitEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SuggestRevisionSetActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SuggestSourceActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'UpdateSourceSuggestionStatusActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | undefined }> } };
+export type ActivityFeedQuery = { __typename: 'Query', activities: { __typename: 'ActivityInterfaceConnection', pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, edges: Array<{ __typename: 'ActivityInterfaceEdge', cursor: string, node?: { __typename: 'AcceptRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CommentActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CreateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CreateFeatureActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CreateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'DeprecateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'DeprecateFeatureActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'DeprecateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'FlagEntityActivity', id: number, verbiage: string, createdAt: any, flag: { __typename: 'Flag', id: number, name: string, link: string }, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ModerateAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ModerateEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'RejectRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ResolveFlagActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SubmitAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SubmitEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SuggestRevisionSetActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SuggestSourceActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'UpdateSourceSuggestionStatusActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | undefined }> } };
 
-export type ActivityFeedFragment = { __typename: 'ActivityInterfaceConnection', pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, edges: Array<{ __typename: 'ActivityInterfaceEdge', cursor: string, node?: { __typename: 'AcceptRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CommentActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CreateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CreateFeatureActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CreateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'DeprecateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'DeprecateFeatureActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'DeprecateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'FlagEntityActivity', id: number, verbiage: string, createdAt: any, flag: { __typename: 'Flag', id: number, name: string, link: string }, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ModerateAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ModerateEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'RejectRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ResolveFlagActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SubmitAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SubmitEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SuggestRevisionSetActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SuggestSourceActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'UpdateSourceSuggestionStatusActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | undefined }> };
+export type ActivityFeedFragment = { __typename: 'ActivityInterfaceConnection', pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, edges: Array<{ __typename: 'ActivityInterfaceEdge', cursor: string, node?: { __typename: 'AcceptRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CommentActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CreateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CreateFeatureActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'CreateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'DeprecateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'DeprecateFeatureActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'DeprecateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'FlagEntityActivity', id: number, verbiage: string, createdAt: any, flag: { __typename: 'Flag', id: number, name: string, link: string }, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ModerateAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ModerateEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'RejectRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'ResolveFlagActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SubmitAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SubmitEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SuggestRevisionSetActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'SuggestSourceActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | { __typename: 'UpdateSourceSuggestionStatusActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } } | undefined }> };
 
-type ActivityFeedNode_AcceptRevisionsActivity_Fragment = { __typename: 'AcceptRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_AcceptRevisionsActivity_Fragment = { __typename: 'AcceptRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_CommentActivity_Fragment = { __typename: 'CommentActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_CommentActivity_Fragment = { __typename: 'CommentActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_CreateComplexMolecularProfileActivity_Fragment = { __typename: 'CreateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_CreateComplexMolecularProfileActivity_Fragment = { __typename: 'CreateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_CreateFeatureActivity_Fragment = { __typename: 'CreateFeatureActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_CreateFeatureActivity_Fragment = { __typename: 'CreateFeatureActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_CreateVariantActivity_Fragment = { __typename: 'CreateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_CreateVariantActivity_Fragment = { __typename: 'CreateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_DeprecateComplexMolecularProfileActivity_Fragment = { __typename: 'DeprecateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_DeprecateComplexMolecularProfileActivity_Fragment = { __typename: 'DeprecateComplexMolecularProfileActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_DeprecateFeatureActivity_Fragment = { __typename: 'DeprecateFeatureActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_DeprecateFeatureActivity_Fragment = { __typename: 'DeprecateFeatureActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_DeprecateVariantActivity_Fragment = { __typename: 'DeprecateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_DeprecateVariantActivity_Fragment = { __typename: 'DeprecateVariantActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_FlagEntityActivity_Fragment = { __typename: 'FlagEntityActivity', id: number, verbiage: string, createdAt: any, flag: { __typename: 'Flag', id: number, name: string, link: string }, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_FlagEntityActivity_Fragment = { __typename: 'FlagEntityActivity', id: number, verbiage: string, createdAt: any, flag: { __typename: 'Flag', id: number, name: string, link: string }, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_ModerateAssertionActivity_Fragment = { __typename: 'ModerateAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_ModerateAssertionActivity_Fragment = { __typename: 'ModerateAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_ModerateEvidenceItemActivity_Fragment = { __typename: 'ModerateEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_ModerateEvidenceItemActivity_Fragment = { __typename: 'ModerateEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_RejectRevisionsActivity_Fragment = { __typename: 'RejectRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_RejectRevisionsActivity_Fragment = { __typename: 'RejectRevisionsActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_ResolveFlagActivity_Fragment = { __typename: 'ResolveFlagActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_ResolveFlagActivity_Fragment = { __typename: 'ResolveFlagActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_SubmitAssertionActivity_Fragment = { __typename: 'SubmitAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_SubmitAssertionActivity_Fragment = { __typename: 'SubmitAssertionActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_SubmitEvidenceItemActivity_Fragment = { __typename: 'SubmitEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_SubmitEvidenceItemActivity_Fragment = { __typename: 'SubmitEvidenceItemActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_SuggestRevisionSetActivity_Fragment = { __typename: 'SuggestRevisionSetActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_SuggestRevisionSetActivity_Fragment = { __typename: 'SuggestRevisionSetActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_SuggestSourceActivity_Fragment = { __typename: 'SuggestSourceActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_SuggestSourceActivity_Fragment = { __typename: 'SuggestSourceActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
-type ActivityFeedNode_UpdateSourceSuggestionStatusActivity_Fragment = { __typename: 'UpdateSourceSuggestionStatusActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
+type ActivityFeedNode_UpdateSourceSuggestionStatusActivity_Fragment = { __typename: 'UpdateSourceSuggestionStatusActivity', id: number, verbiage: string, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, user: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'Feature', name: string, id: number, link: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } };
 
 export type ActivityFeedNodeFragment = ActivityFeedNode_AcceptRevisionsActivity_Fragment | ActivityFeedNode_CommentActivity_Fragment | ActivityFeedNode_CreateComplexMolecularProfileActivity_Fragment | ActivityFeedNode_CreateFeatureActivity_Fragment | ActivityFeedNode_CreateVariantActivity_Fragment | ActivityFeedNode_DeprecateComplexMolecularProfileActivity_Fragment | ActivityFeedNode_DeprecateFeatureActivity_Fragment | ActivityFeedNode_DeprecateVariantActivity_Fragment | ActivityFeedNode_FlagEntityActivity_Fragment | ActivityFeedNode_ModerateAssertionActivity_Fragment | ActivityFeedNode_ModerateEvidenceItemActivity_Fragment | ActivityFeedNode_RejectRevisionsActivity_Fragment | ActivityFeedNode_ResolveFlagActivity_Fragment | ActivityFeedNode_SubmitAssertionActivity_Fragment | ActivityFeedNode_SubmitEvidenceItemActivity_Fragment | ActivityFeedNode_SuggestRevisionSetActivity_Fragment | ActivityFeedNode_SuggestSourceActivity_Fragment | ActivityFeedNode_UpdateSourceSuggestionStatusActivity_Fragment;
 
@@ -6809,11 +6870,11 @@ export type EventFeedQueryVariables = Exact<{
 }>;
 
 
-export type EventFeedQuery = { __typename: 'Query', events: { __typename: 'EventConnection', eventTypes?: Array<EventAction>, unfilteredCount: number, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, uniqueParticipants?: Array<{ __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined }>, participatingOrganizations?: Array<{ __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined }>, edges: Array<{ __typename: 'EventEdge', cursor: string, node?: { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', deprecated: boolean, id: number, link: string, name: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Factor', id: number, name: string, link: string } | { __typename: 'FactorVariant', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'GeneVariant', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined } | undefined }> } };
+export type EventFeedQuery = { __typename: 'Query', events: { __typename: 'EventConnection', eventTypes?: Array<EventAction>, unfilteredCount: number, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, uniqueParticipants?: Array<{ __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined }>, participatingOrganizations?: Array<{ __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined }>, edges: Array<{ __typename: 'EventEdge', cursor: string, node?: { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'Feature', deprecated: boolean, id: number, link: string, name: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Factor', id: number, name: string, link: string } | { __typename: 'FactorVariant', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'GeneVariant', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined } | undefined }> } };
 
-export type EventFeedFragment = { __typename: 'EventConnection', eventTypes?: Array<EventAction>, unfilteredCount: number, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, uniqueParticipants?: Array<{ __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined }>, participatingOrganizations?: Array<{ __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined }>, edges: Array<{ __typename: 'EventEdge', cursor: string, node?: { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', deprecated: boolean, id: number, link: string, name: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Factor', id: number, name: string, link: string } | { __typename: 'FactorVariant', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'GeneVariant', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined } | undefined }> };
+export type EventFeedFragment = { __typename: 'EventConnection', eventTypes?: Array<EventAction>, unfilteredCount: number, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, uniqueParticipants?: Array<{ __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined }>, participatingOrganizations?: Array<{ __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined }>, edges: Array<{ __typename: 'EventEdge', cursor: string, node?: { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'Feature', deprecated: boolean, id: number, link: string, name: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Factor', id: number, name: string, link: string } | { __typename: 'FactorVariant', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'GeneVariant', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined } | undefined }> };
 
-export type EventFeedNodeFragment = { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', deprecated: boolean, id: number, link: string, name: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Factor', id: number, name: string, link: string } | { __typename: 'FactorVariant', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'GeneVariant', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined };
+export type EventFeedNodeFragment = { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'Feature', deprecated: boolean, id: number, link: string, name: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Factor', id: number, name: string, link: string } | { __typename: 'FactorVariant', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'GeneVariant', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined };
 
 export type EvidencePopoverQueryVariables = Exact<{
   evidenceId: Scalars['Int'];
@@ -6910,9 +6971,9 @@ export type FlagPopoverQueryVariables = Exact<{
 }>;
 
 
-export type FlagPopoverQuery = { __typename: 'Query', flag?: { __typename: 'Flag', id: number, name: string, state: FlagState, createdAt: any, flaggingUser: { __typename: 'User', id: number, displayName: string, role: UserRole }, flaggable: { __typename: 'Assertion', id: number, link: string, name: string } | { __typename: 'BrowseFeature', id: number, link: string, name: string } | { __typename: 'EvidenceItem', id: number, link: string, name: string } | { __typename: 'Factor', id: number, link: string, name: string } | { __typename: 'FactorVariant', id: number, link: string, name: string } | { __typename: 'Feature', id: number, link: string, name: string } | { __typename: 'Gene', id: number, link: string, name: string } | { __typename: 'GeneVariant', id: number, link: string, name: string } | { __typename: 'MolecularProfile', id: number, link: string, name: string } | { __typename: 'Variant', deprecated: boolean, id: number, link: string, name: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', id: number, link: string, name: string }, openActivity: { __typename: 'FlagEntityActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } } | undefined };
+export type FlagPopoverQuery = { __typename: 'Query', flag?: { __typename: 'Flag', id: number, name: string, state: FlagState, createdAt: any, flaggingUser: { __typename: 'User', id: number, displayName: string, role: UserRole }, flaggable: { __typename: 'Assertion', id: number, link: string, name: string } | { __typename: 'BrowseFeature', id: number, link: string, name: string } | { __typename: 'EvidenceItem', id: number, link: string, name: string } | { __typename: 'Factor', id: number, link: string, name: string } | { __typename: 'FactorVariant', deprecated: boolean, id: number, link: string, name: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'Feature', id: number, link: string, name: string } | { __typename: 'Gene', id: number, link: string, name: string } | { __typename: 'GeneVariant', deprecated: boolean, id: number, link: string, name: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'MolecularProfile', id: number, link: string, name: string } | { __typename: 'Variant', deprecated: boolean, id: number, link: string, name: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', id: number, link: string, name: string }, openActivity: { __typename: 'FlagEntityActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } } | undefined };
 
-export type FlagPopoverFragment = { __typename: 'Flag', id: number, name: string, state: FlagState, createdAt: any, flaggingUser: { __typename: 'User', id: number, displayName: string, role: UserRole }, flaggable: { __typename: 'Assertion', id: number, link: string, name: string } | { __typename: 'BrowseFeature', id: number, link: string, name: string } | { __typename: 'EvidenceItem', id: number, link: string, name: string } | { __typename: 'Factor', id: number, link: string, name: string } | { __typename: 'FactorVariant', id: number, link: string, name: string } | { __typename: 'Feature', id: number, link: string, name: string } | { __typename: 'Gene', id: number, link: string, name: string } | { __typename: 'GeneVariant', id: number, link: string, name: string } | { __typename: 'MolecularProfile', id: number, link: string, name: string } | { __typename: 'Variant', deprecated: boolean, id: number, link: string, name: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', id: number, link: string, name: string }, openActivity: { __typename: 'FlagEntityActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } };
+export type FlagPopoverFragment = { __typename: 'Flag', id: number, name: string, state: FlagState, createdAt: any, flaggingUser: { __typename: 'User', id: number, displayName: string, role: UserRole }, flaggable: { __typename: 'Assertion', id: number, link: string, name: string } | { __typename: 'BrowseFeature', id: number, link: string, name: string } | { __typename: 'EvidenceItem', id: number, link: string, name: string } | { __typename: 'Factor', id: number, link: string, name: string } | { __typename: 'FactorVariant', deprecated: boolean, id: number, link: string, name: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'Feature', id: number, link: string, name: string } | { __typename: 'Gene', id: number, link: string, name: string } | { __typename: 'GeneVariant', deprecated: boolean, id: number, link: string, name: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'MolecularProfile', id: number, link: string, name: string } | { __typename: 'Variant', deprecated: boolean, id: number, link: string, name: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', id: number, link: string, name: string }, openActivity: { __typename: 'FlagEntityActivity', parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } };
 
 export type QuicksearchQueryVariables = Exact<{
   query: Scalars['String'];
@@ -7090,9 +7151,9 @@ export type RevisionPopoverQueryVariables = Exact<{
 }>;
 
 
-export type RevisionPopoverQuery = { __typename: 'Query', revision?: { __typename: 'Revision', id: number, name: string, link: string, status: RevisionStatus, createdAt: any, creationActivity?: { __typename: 'SuggestRevisionSetActivity', user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, subject: { __typename: 'Assertion', id: number, link: string, name: string } | { __typename: 'EvidenceItem', id: number, link: string, name: string } | { __typename: 'Factor', id: number, link: string, name: string } | { __typename: 'FactorVariant', id: number, link: string, name: string } | { __typename: 'Feature', id: number, link: string, name: string } | { __typename: 'Flag', id: number, link: string, name: string } | { __typename: 'Gene', id: number, link: string, name: string } | { __typename: 'GeneVariant', id: number, link: string, name: string } | { __typename: 'MolecularProfile', id: number, link: string, name: string } | { __typename: 'Revision', id: number, link: string, name: string } | { __typename: 'RevisionSet', id: number, link: string, name: string } | { __typename: 'Source', id: number, link: string, name: string } | { __typename: 'SourcePopover', id: number, link: string, name: string } | { __typename: 'SourceSuggestion', id: number, link: string, name: string } | { __typename: 'Variant', deprecated: boolean, id: number, link: string, name: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', id: number, link: string, name: string }, linkoutData: { __typename: 'LinkoutData', name: string } } | undefined };
+export type RevisionPopoverQuery = { __typename: 'Query', revision?: { __typename: 'Revision', id: number, name: string, link: string, status: RevisionStatus, createdAt: any, creationActivity?: { __typename: 'SuggestRevisionSetActivity', user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, subject: { __typename: 'Assertion', id: number, link: string, name: string } | { __typename: 'EvidenceItem', id: number, link: string, name: string } | { __typename: 'Factor', id: number, link: string, name: string } | { __typename: 'FactorVariant', deprecated: boolean, id: number, link: string, name: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'Feature', id: number, link: string, name: string } | { __typename: 'Flag', id: number, link: string, name: string } | { __typename: 'Gene', id: number, link: string, name: string } | { __typename: 'GeneVariant', deprecated: boolean, id: number, link: string, name: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'MolecularProfile', id: number, link: string, name: string } | { __typename: 'Revision', id: number, link: string, name: string } | { __typename: 'RevisionSet', id: number, link: string, name: string } | { __typename: 'Source', id: number, link: string, name: string } | { __typename: 'SourcePopover', id: number, link: string, name: string } | { __typename: 'SourceSuggestion', id: number, link: string, name: string } | { __typename: 'Variant', deprecated: boolean, id: number, link: string, name: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', id: number, link: string, name: string }, linkoutData: { __typename: 'LinkoutData', name: string } } | undefined };
 
-export type RevisionPopoverFragment = { __typename: 'Revision', id: number, name: string, link: string, status: RevisionStatus, createdAt: any, creationActivity?: { __typename: 'SuggestRevisionSetActivity', user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, subject: { __typename: 'Assertion', id: number, link: string, name: string } | { __typename: 'EvidenceItem', id: number, link: string, name: string } | { __typename: 'Factor', id: number, link: string, name: string } | { __typename: 'FactorVariant', id: number, link: string, name: string } | { __typename: 'Feature', id: number, link: string, name: string } | { __typename: 'Flag', id: number, link: string, name: string } | { __typename: 'Gene', id: number, link: string, name: string } | { __typename: 'GeneVariant', id: number, link: string, name: string } | { __typename: 'MolecularProfile', id: number, link: string, name: string } | { __typename: 'Revision', id: number, link: string, name: string } | { __typename: 'RevisionSet', id: number, link: string, name: string } | { __typename: 'Source', id: number, link: string, name: string } | { __typename: 'SourcePopover', id: number, link: string, name: string } | { __typename: 'SourceSuggestion', id: number, link: string, name: string } | { __typename: 'Variant', deprecated: boolean, id: number, link: string, name: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', id: number, link: string, name: string }, linkoutData: { __typename: 'LinkoutData', name: string } };
+export type RevisionPopoverFragment = { __typename: 'Revision', id: number, name: string, link: string, status: RevisionStatus, createdAt: any, creationActivity?: { __typename: 'SuggestRevisionSetActivity', user: { __typename: 'User', id: number, displayName: string, role: UserRole }, parsedNote: Array<{ __typename: 'CommentTagSegment', entityId: number, displayName: string, tagType: TaggableEntity, status?: EvidenceStatus | undefined, deprecated?: boolean | undefined, link: string, revisionSetId?: number | undefined, feature?: { __typename: 'LinkableFeature', id: number, name: string, link: string } | undefined } | { __typename: 'CommentTextSegment', text: string } | { __typename: 'User', id: number, displayName: string, role: UserRole }> } | undefined, subject: { __typename: 'Assertion', id: number, link: string, name: string } | { __typename: 'EvidenceItem', id: number, link: string, name: string } | { __typename: 'Factor', id: number, link: string, name: string } | { __typename: 'FactorVariant', deprecated: boolean, id: number, link: string, name: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'Feature', id: number, link: string, name: string } | { __typename: 'Flag', id: number, link: string, name: string } | { __typename: 'Gene', id: number, link: string, name: string } | { __typename: 'GeneVariant', deprecated: boolean, id: number, link: string, name: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'MolecularProfile', id: number, link: string, name: string } | { __typename: 'Revision', id: number, link: string, name: string } | { __typename: 'RevisionSet', id: number, link: string, name: string } | { __typename: 'Source', id: number, link: string, name: string } | { __typename: 'SourcePopover', id: number, link: string, name: string } | { __typename: 'SourceSuggestion', id: number, link: string, name: string } | { __typename: 'Variant', deprecated: boolean, id: number, link: string, name: string, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'VariantGroup', id: number, link: string, name: string }, linkoutData: { __typename: 'LinkoutData', name: string } };
 
 export type RevisionsQueryVariables = Exact<{
   subject?: InputMaybe<ModeratedInput>;
@@ -7672,6 +7733,22 @@ export type SuggestFactorRevisionMutationVariables = Exact<{
 
 export type SuggestFactorRevisionMutation = { __typename: 'Mutation', suggestFactorRevision?: { __typename: 'SuggestFactorRevisionPayload', clientMutationId?: string | undefined, results: Array<{ __typename: 'RevisionResult', newlyCreated: boolean, id: number, fieldName: string }> } | undefined };
 
+export type FactorVariantRevisableFieldsQueryVariables = Exact<{
+  variantId: Scalars['Int'];
+}>;
+
+
+export type FactorVariantRevisableFieldsQuery = { __typename: 'Query', variant?: { __typename: 'FactorVariant', id: number, name: string, variantAliases: Array<string>, ncitId?: string | undefined, feature: { __typename: 'Feature', id: number, name: string }, variantTypes: Array<{ __typename: 'VariantType', id: number, name: string, soid: string }> } | { __typename: 'GeneVariant', id: number } | { __typename: 'Variant', id: number } | undefined };
+
+export type RevisableFactorVariantFieldsFragment = { __typename: 'FactorVariant', name: string, variantAliases: Array<string>, ncitId?: string | undefined, feature: { __typename: 'Feature', id: number, name: string }, variantTypes: Array<{ __typename: 'VariantType', id: number, name: string, soid: string }> };
+
+export type SuggestFactorVariantRevisionMutationVariables = Exact<{
+  input: SuggestFactorVariantRevisionInput;
+}>;
+
+
+export type SuggestFactorVariantRevisionMutation = { __typename: 'Mutation', suggestFactorVariantRevision?: { __typename: 'SuggestFactorVariantRevisionPayload', clientMutationId?: string | undefined, variant: { __typename: 'FactorVariant', id: number }, results: Array<{ __typename: 'RevisionResult', id: number, fieldName: string, newlyCreated: boolean }> } | undefined };
+
 export type GeneRevisableFieldsQueryVariables = Exact<{
   featureId: Scalars['Int'];
 }>;
@@ -7704,7 +7781,7 @@ export type SuggestGeneVariantRevisionMutationVariables = Exact<{
 }>;
 
 
-export type SuggestGeneVariantRevisionMutation = { __typename: 'Mutation', suggestGeneVariantRevision?: { __typename: 'SuggestGeneVariantRevisionPayload', clientMutationId?: string | undefined, variant: { __typename: 'FactorVariant', id: number } | { __typename: 'GeneVariant', id: number } | { __typename: 'Variant', id: number }, results: Array<{ __typename: 'RevisionResult', id: number, fieldName: string, newlyCreated: boolean }> } | undefined };
+export type SuggestGeneVariantRevisionMutation = { __typename: 'Mutation', suggestGeneVariantRevision?: { __typename: 'SuggestGeneVariantRevisionPayload', clientMutationId?: string | undefined, variant: { __typename: 'GeneVariant', id: number }, results: Array<{ __typename: 'RevisionResult', id: number, fieldName: string, newlyCreated: boolean }> } | undefined };
 
 export type MolecularProfileRevisableFieldsQueryVariables = Exact<{
   molecularProfileId: Scalars['Int'];
@@ -8234,9 +8311,9 @@ export type MolecularProfileSummaryQueryVariables = Exact<{
 }>;
 
 
-export type MolecularProfileSummaryQuery = { __typename: 'Query', molecularProfile?: { __typename: 'MolecularProfile', id: number, name: string, description?: string | undefined, molecularProfileAliases: Array<string>, molecularProfileScore: number, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceType: SourceSource }>, variants: Array<{ __typename: 'FactorVariant', id: number, name: string, link: string, variantAliases: Array<string>, ncitId?: string | undefined, feature: { __typename: 'Feature', id: number, name: string, link: string }, molecularProfiles: { __typename: 'MolecularProfileConnection', totalCount: number, nodes: Array<{ __typename: 'MolecularProfile', id: number, link: string, name: string, deprecated: boolean }> }, variantTypes: Array<{ __typename: 'VariantType', id: number, link: string, soid: string, name: string }> } | { __typename: 'GeneVariant', id: number, name: string, link: string, variantAliases: Array<string>, alleleRegistryId?: string | undefined, openCravatUrl?: string | undefined, maneSelectTranscript?: string | undefined, hgvsDescriptions: Array<string>, clinvarIds: Array<string>, referenceBuild?: ReferenceBuild | undefined, ensemblVersion?: number | undefined, referenceBases?: string | undefined, variantBases?: string | undefined, feature: { __typename: 'Feature', id: number, name: string, link: string }, molecularProfiles: { __typename: 'MolecularProfileConnection', totalCount: number, nodes: Array<{ __typename: 'MolecularProfile', id: number, link: string, name: string, deprecated: boolean }> }, variantTypes: Array<{ __typename: 'VariantType', id: number, link: string, soid: string, name: string }>, primaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, secondaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, myVariantInfo?: { __typename: 'MyVariantInfo', myVariantInfoId: string, caddConsequence: Array<string>, caddDetail: Array<string>, caddScore?: number | undefined, caddPhred?: number | undefined, clinvarClinicalSignificance: Array<string>, clinvarHgvsCoding: Array<string>, clinvarHgvsGenomic: Array<string>, clinvarHgvsNonCoding: Array<string>, clinvarHgvsProtein: Array<string>, clinvarId?: number | undefined, clinvarOmim?: string | undefined, cosmicId?: string | undefined, dbnsfpInterproDomain: Array<string>, dbsnpRsid?: string | undefined, eglClass?: string | undefined, eglHgvs: Array<string>, eglProtein?: string | undefined, eglTranscript?: string | undefined, exacAlleleCount?: number | undefined, exacAlleleFrequency?: number | undefined, exacAlleleNumber?: number | undefined, fathmmMklPrediction?: string | undefined, fathmmMklScore?: number | undefined, fathmmPrediction: Array<string>, fathmmScore: Array<number>, fitconsScore?: number | undefined, gerp?: number | undefined, gnomadExomeAlleleCount?: number | undefined, gnomadExomeAlleleFrequency?: number | undefined, gnomadExomeAlleleNumber?: number | undefined, gnomadExomeFilter?: string | undefined, gnomadGenomeAlleleCount?: number | undefined, gnomadGenomeAlleleFrequency?: number | undefined, gnomadGenomeAlleleNumber?: number | undefined, gnomadGenomeFilter?: string | undefined, lrtPrediction?: string | undefined, lrtScore?: number | undefined, metalrPrediction?: string | undefined, metalrScore?: number | undefined, metasvmPrediction?: string | undefined, metasvmScore?: number | undefined, mutationassessorPrediction: Array<string>, mutationassessorScore: Array<number>, mutationtasterPrediction: Array<string>, mutationtasterScore: Array<number>, phastcons100way?: number | undefined, phastcons30way?: number | undefined, phyloP100way?: number | undefined, phyloP30way?: number | undefined, polyphen2HdivPrediction: Array<string>, polyphen2HdivScore: Array<number>, polyphen2HvarPrediction: Array<string>, polyphen2HvarScore: Array<number>, proveanPrediction: Array<string>, proveanScore: Array<number>, revelScore?: Array<number> | undefined, siftPrediction: Array<string>, siftScore: Array<number>, siphy?: number | undefined, snpeffSnpEffect: Array<string>, snpeffSnpImpact: Array<string> } | undefined } | { __typename: 'Variant', id: number, name: string, link: string, variantAliases: Array<string>, feature: { __typename: 'Feature', id: number, name: string, link: string }, molecularProfiles: { __typename: 'MolecularProfileConnection', totalCount: number, nodes: Array<{ __typename: 'MolecularProfile', id: number, link: string, name: string, deprecated: boolean }> }, variantTypes: Array<{ __typename: 'VariantType', id: number, link: string, soid: string, name: string }> }>, parsedName: Array<{ __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'MolecularProfileTextSegment', text: string } | { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean }>, complexMolecularProfileCreationActivity?: { __typename: 'CreateComplexMolecularProfileActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, variantDeprecationActivity?: { __typename: 'DeprecateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, complexMolecularProfileDeprecationActivity?: { __typename: 'DeprecateComplexMolecularProfileActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined } | undefined };
+export type MolecularProfileSummaryQuery = { __typename: 'Query', molecularProfile?: { __typename: 'MolecularProfile', id: number, name: string, description?: string | undefined, molecularProfileAliases: Array<string>, molecularProfileScore: number, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceType: SourceSource }>, variants: Array<{ __typename: 'FactorVariant', id: number, name: string, link: string, variantAliases: Array<string>, ncitId?: string | undefined, feature: { __typename: 'Feature', id: number, name: string, link: string }, molecularProfiles: { __typename: 'MolecularProfileConnection', totalCount: number, nodes: Array<{ __typename: 'MolecularProfile', id: number, link: string, name: string, deprecated: boolean }> }, variantTypes: Array<{ __typename: 'VariantType', id: number, link: string, soid: string, name: string }>, ncitDetails?: { __typename: 'NcitDetails', synonyms: Array<{ __typename: 'NcitSynonym', name: string, source: string }>, definitions: Array<{ __typename: 'NcitDefinition', definition: string, source: string }> } | undefined } | { __typename: 'GeneVariant', id: number, name: string, link: string, variantAliases: Array<string>, alleleRegistryId?: string | undefined, openCravatUrl?: string | undefined, maneSelectTranscript?: string | undefined, hgvsDescriptions: Array<string>, clinvarIds: Array<string>, referenceBuild?: ReferenceBuild | undefined, ensemblVersion?: number | undefined, referenceBases?: string | undefined, variantBases?: string | undefined, feature: { __typename: 'Feature', id: number, name: string, link: string }, molecularProfiles: { __typename: 'MolecularProfileConnection', totalCount: number, nodes: Array<{ __typename: 'MolecularProfile', id: number, link: string, name: string, deprecated: boolean }> }, variantTypes: Array<{ __typename: 'VariantType', id: number, link: string, soid: string, name: string }>, primaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, secondaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, myVariantInfo?: { __typename: 'MyVariantInfo', myVariantInfoId: string, caddConsequence: Array<string>, caddDetail: Array<string>, caddScore?: number | undefined, caddPhred?: number | undefined, clinvarClinicalSignificance: Array<string>, clinvarHgvsCoding: Array<string>, clinvarHgvsGenomic: Array<string>, clinvarHgvsNonCoding: Array<string>, clinvarHgvsProtein: Array<string>, clinvarId?: number | undefined, clinvarOmim?: string | undefined, cosmicId?: string | undefined, dbnsfpInterproDomain: Array<string>, dbsnpRsid?: string | undefined, eglClass?: string | undefined, eglHgvs: Array<string>, eglProtein?: string | undefined, eglTranscript?: string | undefined, exacAlleleCount?: number | undefined, exacAlleleFrequency?: number | undefined, exacAlleleNumber?: number | undefined, fathmmMklPrediction?: string | undefined, fathmmMklScore?: number | undefined, fathmmPrediction: Array<string>, fathmmScore: Array<number>, fitconsScore?: number | undefined, gerp?: number | undefined, gnomadExomeAlleleCount?: number | undefined, gnomadExomeAlleleFrequency?: number | undefined, gnomadExomeAlleleNumber?: number | undefined, gnomadExomeFilter?: string | undefined, gnomadGenomeAlleleCount?: number | undefined, gnomadGenomeAlleleFrequency?: number | undefined, gnomadGenomeAlleleNumber?: number | undefined, gnomadGenomeFilter?: string | undefined, lrtPrediction?: string | undefined, lrtScore?: number | undefined, metalrPrediction?: string | undefined, metalrScore?: number | undefined, metasvmPrediction?: string | undefined, metasvmScore?: number | undefined, mutationassessorPrediction: Array<string>, mutationassessorScore: Array<number>, mutationtasterPrediction: Array<string>, mutationtasterScore: Array<number>, phastcons100way?: number | undefined, phastcons30way?: number | undefined, phyloP100way?: number | undefined, phyloP30way?: number | undefined, polyphen2HdivPrediction: Array<string>, polyphen2HdivScore: Array<number>, polyphen2HvarPrediction: Array<string>, polyphen2HvarScore: Array<number>, proveanPrediction: Array<string>, proveanScore: Array<number>, revelScore?: Array<number> | undefined, siftPrediction: Array<string>, siftScore: Array<number>, siphy?: number | undefined, snpeffSnpEffect: Array<string>, snpeffSnpImpact: Array<string> } | undefined } | { __typename: 'Variant', id: number, name: string, link: string, variantAliases: Array<string>, feature: { __typename: 'Feature', id: number, name: string, link: string }, molecularProfiles: { __typename: 'MolecularProfileConnection', totalCount: number, nodes: Array<{ __typename: 'MolecularProfile', id: number, link: string, name: string, deprecated: boolean }> }, variantTypes: Array<{ __typename: 'VariantType', id: number, link: string, soid: string, name: string }> }>, parsedName: Array<{ __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'MolecularProfileTextSegment', text: string } | { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean }>, complexMolecularProfileCreationActivity?: { __typename: 'CreateComplexMolecularProfileActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, variantDeprecationActivity?: { __typename: 'DeprecateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, complexMolecularProfileDeprecationActivity?: { __typename: 'DeprecateComplexMolecularProfileActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined } | undefined };
 
-export type MolecularProfileSummaryFieldsFragment = { __typename: 'MolecularProfile', id: number, name: string, description?: string | undefined, molecularProfileAliases: Array<string>, molecularProfileScore: number, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceType: SourceSource }>, variants: Array<{ __typename: 'FactorVariant', id: number, name: string, link: string, variantAliases: Array<string>, ncitId?: string | undefined, feature: { __typename: 'Feature', id: number, name: string, link: string }, molecularProfiles: { __typename: 'MolecularProfileConnection', totalCount: number, nodes: Array<{ __typename: 'MolecularProfile', id: number, link: string, name: string, deprecated: boolean }> }, variantTypes: Array<{ __typename: 'VariantType', id: number, link: string, soid: string, name: string }> } | { __typename: 'GeneVariant', id: number, name: string, link: string, variantAliases: Array<string>, alleleRegistryId?: string | undefined, openCravatUrl?: string | undefined, maneSelectTranscript?: string | undefined, hgvsDescriptions: Array<string>, clinvarIds: Array<string>, referenceBuild?: ReferenceBuild | undefined, ensemblVersion?: number | undefined, referenceBases?: string | undefined, variantBases?: string | undefined, feature: { __typename: 'Feature', id: number, name: string, link: string }, molecularProfiles: { __typename: 'MolecularProfileConnection', totalCount: number, nodes: Array<{ __typename: 'MolecularProfile', id: number, link: string, name: string, deprecated: boolean }> }, variantTypes: Array<{ __typename: 'VariantType', id: number, link: string, soid: string, name: string }>, primaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, secondaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, myVariantInfo?: { __typename: 'MyVariantInfo', myVariantInfoId: string, caddConsequence: Array<string>, caddDetail: Array<string>, caddScore?: number | undefined, caddPhred?: number | undefined, clinvarClinicalSignificance: Array<string>, clinvarHgvsCoding: Array<string>, clinvarHgvsGenomic: Array<string>, clinvarHgvsNonCoding: Array<string>, clinvarHgvsProtein: Array<string>, clinvarId?: number | undefined, clinvarOmim?: string | undefined, cosmicId?: string | undefined, dbnsfpInterproDomain: Array<string>, dbsnpRsid?: string | undefined, eglClass?: string | undefined, eglHgvs: Array<string>, eglProtein?: string | undefined, eglTranscript?: string | undefined, exacAlleleCount?: number | undefined, exacAlleleFrequency?: number | undefined, exacAlleleNumber?: number | undefined, fathmmMklPrediction?: string | undefined, fathmmMklScore?: number | undefined, fathmmPrediction: Array<string>, fathmmScore: Array<number>, fitconsScore?: number | undefined, gerp?: number | undefined, gnomadExomeAlleleCount?: number | undefined, gnomadExomeAlleleFrequency?: number | undefined, gnomadExomeAlleleNumber?: number | undefined, gnomadExomeFilter?: string | undefined, gnomadGenomeAlleleCount?: number | undefined, gnomadGenomeAlleleFrequency?: number | undefined, gnomadGenomeAlleleNumber?: number | undefined, gnomadGenomeFilter?: string | undefined, lrtPrediction?: string | undefined, lrtScore?: number | undefined, metalrPrediction?: string | undefined, metalrScore?: number | undefined, metasvmPrediction?: string | undefined, metasvmScore?: number | undefined, mutationassessorPrediction: Array<string>, mutationassessorScore: Array<number>, mutationtasterPrediction: Array<string>, mutationtasterScore: Array<number>, phastcons100way?: number | undefined, phastcons30way?: number | undefined, phyloP100way?: number | undefined, phyloP30way?: number | undefined, polyphen2HdivPrediction: Array<string>, polyphen2HdivScore: Array<number>, polyphen2HvarPrediction: Array<string>, polyphen2HvarScore: Array<number>, proveanPrediction: Array<string>, proveanScore: Array<number>, revelScore?: Array<number> | undefined, siftPrediction: Array<string>, siftScore: Array<number>, siphy?: number | undefined, snpeffSnpEffect: Array<string>, snpeffSnpImpact: Array<string> } | undefined } | { __typename: 'Variant', id: number, name: string, link: string, variantAliases: Array<string>, feature: { __typename: 'Feature', id: number, name: string, link: string }, molecularProfiles: { __typename: 'MolecularProfileConnection', totalCount: number, nodes: Array<{ __typename: 'MolecularProfile', id: number, link: string, name: string, deprecated: boolean }> }, variantTypes: Array<{ __typename: 'VariantType', id: number, link: string, soid: string, name: string }> }>, parsedName: Array<{ __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'MolecularProfileTextSegment', text: string } | { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean }>, complexMolecularProfileCreationActivity?: { __typename: 'CreateComplexMolecularProfileActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, variantDeprecationActivity?: { __typename: 'DeprecateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, complexMolecularProfileDeprecationActivity?: { __typename: 'DeprecateComplexMolecularProfileActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined };
+export type MolecularProfileSummaryFieldsFragment = { __typename: 'MolecularProfile', id: number, name: string, description?: string | undefined, molecularProfileAliases: Array<string>, molecularProfileScore: number, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, link: string, sourceType: SourceSource }>, variants: Array<{ __typename: 'FactorVariant', id: number, name: string, link: string, variantAliases: Array<string>, ncitId?: string | undefined, feature: { __typename: 'Feature', id: number, name: string, link: string }, molecularProfiles: { __typename: 'MolecularProfileConnection', totalCount: number, nodes: Array<{ __typename: 'MolecularProfile', id: number, link: string, name: string, deprecated: boolean }> }, variantTypes: Array<{ __typename: 'VariantType', id: number, link: string, soid: string, name: string }>, ncitDetails?: { __typename: 'NcitDetails', synonyms: Array<{ __typename: 'NcitSynonym', name: string, source: string }>, definitions: Array<{ __typename: 'NcitDefinition', definition: string, source: string }> } | undefined } | { __typename: 'GeneVariant', id: number, name: string, link: string, variantAliases: Array<string>, alleleRegistryId?: string | undefined, openCravatUrl?: string | undefined, maneSelectTranscript?: string | undefined, hgvsDescriptions: Array<string>, clinvarIds: Array<string>, referenceBuild?: ReferenceBuild | undefined, ensemblVersion?: number | undefined, referenceBases?: string | undefined, variantBases?: string | undefined, feature: { __typename: 'Feature', id: number, name: string, link: string }, molecularProfiles: { __typename: 'MolecularProfileConnection', totalCount: number, nodes: Array<{ __typename: 'MolecularProfile', id: number, link: string, name: string, deprecated: boolean }> }, variantTypes: Array<{ __typename: 'VariantType', id: number, link: string, soid: string, name: string }>, primaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, secondaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, myVariantInfo?: { __typename: 'MyVariantInfo', myVariantInfoId: string, caddConsequence: Array<string>, caddDetail: Array<string>, caddScore?: number | undefined, caddPhred?: number | undefined, clinvarClinicalSignificance: Array<string>, clinvarHgvsCoding: Array<string>, clinvarHgvsGenomic: Array<string>, clinvarHgvsNonCoding: Array<string>, clinvarHgvsProtein: Array<string>, clinvarId?: number | undefined, clinvarOmim?: string | undefined, cosmicId?: string | undefined, dbnsfpInterproDomain: Array<string>, dbsnpRsid?: string | undefined, eglClass?: string | undefined, eglHgvs: Array<string>, eglProtein?: string | undefined, eglTranscript?: string | undefined, exacAlleleCount?: number | undefined, exacAlleleFrequency?: number | undefined, exacAlleleNumber?: number | undefined, fathmmMklPrediction?: string | undefined, fathmmMklScore?: number | undefined, fathmmPrediction: Array<string>, fathmmScore: Array<number>, fitconsScore?: number | undefined, gerp?: number | undefined, gnomadExomeAlleleCount?: number | undefined, gnomadExomeAlleleFrequency?: number | undefined, gnomadExomeAlleleNumber?: number | undefined, gnomadExomeFilter?: string | undefined, gnomadGenomeAlleleCount?: number | undefined, gnomadGenomeAlleleFrequency?: number | undefined, gnomadGenomeAlleleNumber?: number | undefined, gnomadGenomeFilter?: string | undefined, lrtPrediction?: string | undefined, lrtScore?: number | undefined, metalrPrediction?: string | undefined, metalrScore?: number | undefined, metasvmPrediction?: string | undefined, metasvmScore?: number | undefined, mutationassessorPrediction: Array<string>, mutationassessorScore: Array<number>, mutationtasterPrediction: Array<string>, mutationtasterScore: Array<number>, phastcons100way?: number | undefined, phastcons30way?: number | undefined, phyloP100way?: number | undefined, phyloP30way?: number | undefined, polyphen2HdivPrediction: Array<string>, polyphen2HdivScore: Array<number>, polyphen2HvarPrediction: Array<string>, polyphen2HvarScore: Array<number>, proveanPrediction: Array<string>, proveanScore: Array<number>, revelScore?: Array<number> | undefined, siftPrediction: Array<string>, siftScore: Array<number>, siphy?: number | undefined, snpeffSnpEffect: Array<string>, snpeffSnpImpact: Array<string> } | undefined } | { __typename: 'Variant', id: number, name: string, link: string, variantAliases: Array<string>, feature: { __typename: 'Feature', id: number, name: string, link: string }, molecularProfiles: { __typename: 'MolecularProfileConnection', totalCount: number, nodes: Array<{ __typename: 'MolecularProfile', id: number, link: string, name: string, deprecated: boolean }> }, variantTypes: Array<{ __typename: 'VariantType', id: number, link: string, soid: string, name: string }> }>, parsedName: Array<{ __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'MolecularProfileTextSegment', text: string } | { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean }>, complexMolecularProfileCreationActivity?: { __typename: 'CreateComplexMolecularProfileActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, variantDeprecationActivity?: { __typename: 'DeprecateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, complexMolecularProfileDeprecationActivity?: { __typename: 'DeprecateComplexMolecularProfileActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined };
 
 type MolecularProfileParsedName_Feature_Fragment = { __typename: 'Feature', id: number, name: string, link: string };
 
@@ -8246,7 +8323,7 @@ type MolecularProfileParsedName_Variant_Fragment = { __typename: 'Variant', id:
 
 export type MolecularProfileParsedNameFragment = MolecularProfileParsedName_Feature_Fragment | MolecularProfileParsedName_MolecularProfileTextSegment_Fragment | MolecularProfileParsedName_Variant_Fragment;
 
-type VariantMolecularProfileCardFields_FactorVariant_Fragment = { __typename: 'FactorVariant', id: number, name: string, link: string, variantAliases: Array<string>, ncitId?: string | undefined, feature: { __typename: 'Feature', id: number, name: string, link: string }, molecularProfiles: { __typename: 'MolecularProfileConnection', totalCount: number, nodes: Array<{ __typename: 'MolecularProfile', id: number, link: string, name: string, deprecated: boolean }> }, variantTypes: Array<{ __typename: 'VariantType', id: number, link: string, soid: string, name: string }> };
+type VariantMolecularProfileCardFields_FactorVariant_Fragment = { __typename: 'FactorVariant', id: number, name: string, link: string, variantAliases: Array<string>, ncitId?: string | undefined, feature: { __typename: 'Feature', id: number, name: string, link: string }, molecularProfiles: { __typename: 'MolecularProfileConnection', totalCount: number, nodes: Array<{ __typename: 'MolecularProfile', id: number, link: string, name: string, deprecated: boolean }> }, variantTypes: Array<{ __typename: 'VariantType', id: number, link: string, soid: string, name: string }>, ncitDetails?: { __typename: 'NcitDetails', synonyms: Array<{ __typename: 'NcitSynonym', name: string, source: string }>, definitions: Array<{ __typename: 'NcitDefinition', definition: string, source: string }> } | undefined };
 
 type VariantMolecularProfileCardFields_GeneVariant_Fragment = { __typename: 'GeneVariant', id: number, name: string, link: string, variantAliases: Array<string>, alleleRegistryId?: string | undefined, openCravatUrl?: string | undefined, maneSelectTranscript?: string | undefined, hgvsDescriptions: Array<string>, clinvarIds: Array<string>, referenceBuild?: ReferenceBuild | undefined, ensemblVersion?: number | undefined, referenceBases?: string | undefined, variantBases?: string | undefined, feature: { __typename: 'Feature', id: number, name: string, link: string }, molecularProfiles: { __typename: 'MolecularProfileConnection', totalCount: number, nodes: Array<{ __typename: 'MolecularProfile', id: number, link: string, name: string, deprecated: boolean }> }, variantTypes: Array<{ __typename: 'VariantType', id: number, link: string, soid: string, name: string }>, primaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, secondaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, myVariantInfo?: { __typename: 'MyVariantInfo', myVariantInfoId: string, caddConsequence: Array<string>, caddDetail: Array<string>, caddScore?: number | undefined, caddPhred?: number | undefined, clinvarClinicalSignificance: Array<string>, clinvarHgvsCoding: Array<string>, clinvarHgvsGenomic: Array<string>, clinvarHgvsNonCoding: Array<string>, clinvarHgvsProtein: Array<string>, clinvarId?: number | undefined, clinvarOmim?: string | undefined, cosmicId?: string | undefined, dbnsfpInterproDomain: Array<string>, dbsnpRsid?: string | undefined, eglClass?: string | undefined, eglHgvs: Array<string>, eglProtein?: string | undefined, eglTranscript?: string | undefined, exacAlleleCount?: number | undefined, exacAlleleFrequency?: number | undefined, exacAlleleNumber?: number | undefined, fathmmMklPrediction?: string | undefined, fathmmMklScore?: number | undefined, fathmmPrediction: Array<string>, fathmmScore: Array<number>, fitconsScore?: number | undefined, gerp?: number | undefined, gnomadExomeAlleleCount?: number | undefined, gnomadExomeAlleleFrequency?: number | undefined, gnomadExomeAlleleNumber?: number | undefined, gnomadExomeFilter?: string | undefined, gnomadGenomeAlleleCount?: number | undefined, gnomadGenomeAlleleFrequency?: number | undefined, gnomadGenomeAlleleNumber?: number | undefined, gnomadGenomeFilter?: string | undefined, lrtPrediction?: string | undefined, lrtScore?: number | undefined, metalrPrediction?: string | undefined, metalrScore?: number | undefined, metasvmPrediction?: string | undefined, metasvmScore?: number | undefined, mutationassessorPrediction: Array<string>, mutationassessorScore: Array<number>, mutationtasterPrediction: Array<string>, mutationtasterScore: Array<number>, phastcons100way?: number | undefined, phastcons30way?: number | undefined, phyloP100way?: number | undefined, phyloP30way?: number | undefined, polyphen2HdivPrediction: Array<string>, polyphen2HdivScore: Array<number>, polyphen2HvarPrediction: Array<string>, polyphen2HvarScore: Array<number>, proveanPrediction: Array<string>, proveanScore: Array<number>, revelScore?: Array<number> | undefined, siftPrediction: Array<string>, siftScore: Array<number>, siphy?: number | undefined, snpeffSnpEffect: Array<string>, snpeffSnpImpact: Array<string> } | undefined };
 
@@ -8359,7 +8436,7 @@ export type UserNotificationsQueryVariables = Exact<{
 }>;
 
 
-export type UserNotificationsQuery = { __typename: 'Query', notifications: { __typename: 'NotificationConnection', eventTypes: Array<EventAction>, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, notificationSubjects: Array<{ __typename: 'EventSubjectWithCount', occuranceCount: number, subject?: { __typename: 'Assertion', id: number, name: string } | { __typename: 'EvidenceItem', id: number, name: string } | { __typename: 'Factor', id: number, name: string } | { __typename: 'FactorVariant', id: number, name: string } | { __typename: 'Feature', id: number, name: string } | { __typename: 'Flag', id: number, name: string } | { __typename: 'Gene', id: number, name: string } | { __typename: 'GeneVariant', id: number, name: string } | { __typename: 'MolecularProfile', id: number, name: string } | { __typename: 'Revision', id: number, name: string } | { __typename: 'RevisionSet', id: number, name: string } | { __typename: 'Source', id: number, name: string } | { __typename: 'SourcePopover', id: number, name: string } | { __typename: 'SourceSuggestion', id: number, name: string } | { __typename: 'Variant', id: number, name: string } | { __typename: 'VariantGroup', id: number, name: string } | undefined }>, originatingUsers: Array<{ __typename: 'User', id: number, displayName: string }>, organizations: Array<{ __typename: 'Organization', id: number, name: string }>, edges: Array<{ __typename: 'NotificationEdge', node?: { __typename: 'Notification', id: number, type: NotificationReason, seen: boolean, event: { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', deprecated: boolean, id: number, link: string, name: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Factor', id: number, name: string, link: string } | { __typename: 'FactorVariant', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'GeneVariant', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined }, subscription?: { __typename: 'Subscription', id: number, subscribable: { __typename: 'Assertion', id: number, name: string } | { __typename: 'EvidenceItem', id: number, name: string } | { __typename: 'Factor', id: number, name: string } | { __typename: 'FactorVariant', id: number, name: string } | { __typename: 'Feature', id: number, name: string } | { __typename: 'Flag', id: number, name: string } | { __typename: 'Gene', id: number, name: string } | { __typename: 'GeneVariant', id: number, name: string } | { __typename: 'MolecularProfile', id: number, name: string } | { __typename: 'Revision', id: number, name: string } | { __typename: 'RevisionSet', id: number, name: string } | { __typename: 'Source', id: number, name: string } | { __typename: 'SourcePopover', id: number, name: string } | { __typename: 'SourceSuggestion', id: number, name: string } | { __typename: 'Variant', id: number, name: string } | { __typename: 'VariantGroup', id: number, name: string } } | undefined } | undefined }> } };
+export type UserNotificationsQuery = { __typename: 'Query', notifications: { __typename: 'NotificationConnection', eventTypes: Array<EventAction>, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean }, notificationSubjects: Array<{ __typename: 'EventSubjectWithCount', occuranceCount: number, subject?: { __typename: 'Assertion', id: number, name: string } | { __typename: 'EvidenceItem', id: number, name: string } | { __typename: 'Factor', id: number, name: string } | { __typename: 'FactorVariant', id: number, name: string } | { __typename: 'Feature', id: number, name: string } | { __typename: 'Flag', id: number, name: string } | { __typename: 'Gene', id: number, name: string } | { __typename: 'GeneVariant', id: number, name: string } | { __typename: 'MolecularProfile', id: number, name: string } | { __typename: 'Revision', id: number, name: string } | { __typename: 'RevisionSet', id: number, name: string } | { __typename: 'Source', id: number, name: string } | { __typename: 'SourcePopover', id: number, name: string } | { __typename: 'SourceSuggestion', id: number, name: string } | { __typename: 'Variant', id: number, name: string } | { __typename: 'VariantGroup', id: number, name: string } | undefined }>, originatingUsers: Array<{ __typename: 'User', id: number, displayName: string }>, organizations: Array<{ __typename: 'Organization', id: number, name: string }>, edges: Array<{ __typename: 'NotificationEdge', node?: { __typename: 'Notification', id: number, type: NotificationReason, seen: boolean, event: { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'Feature', deprecated: boolean, id: number, link: string, name: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Factor', id: number, name: string, link: string } | { __typename: 'FactorVariant', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'GeneVariant', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined }, subscription?: { __typename: 'Subscription', id: number, subscribable: { __typename: 'Assertion', id: number, name: string } | { __typename: 'EvidenceItem', id: number, name: string } | { __typename: 'Factor', id: number, name: string } | { __typename: 'FactorVariant', id: number, name: string } | { __typename: 'Feature', id: number, name: string } | { __typename: 'Flag', id: number, name: string } | { __typename: 'Gene', id: number, name: string } | { __typename: 'GeneVariant', id: number, name: string } | { __typename: 'MolecularProfile', id: number, name: string } | { __typename: 'Revision', id: number, name: string } | { __typename: 'RevisionSet', id: number, name: string } | { __typename: 'Source', id: number, name: string } | { __typename: 'SourcePopover', id: number, name: string } | { __typename: 'SourceSuggestion', id: number, name: string } | { __typename: 'Variant', id: number, name: string } | { __typename: 'VariantGroup', id: number, name: string } } | undefined } | undefined }> } };
 
 export type NotificationOrganizationFragment = { __typename: 'Organization', id: number, name: string };
 
@@ -8367,14 +8444,14 @@ export type NotificationOriginatingUsersFragment = { __typename: 'User', id: num
 
 export type NotificationFeedSubjectsFragment = { __typename: 'EventSubjectWithCount', occuranceCount: number, subject?: { __typename: 'Assertion', id: number, name: string } | { __typename: 'EvidenceItem', id: number, name: string } | { __typename: 'Factor', id: number, name: string } | { __typename: 'FactorVariant', id: number, name: string } | { __typename: 'Feature', id: number, name: string } | { __typename: 'Flag', id: number, name: string } | { __typename: 'Gene', id: number, name: string } | { __typename: 'GeneVariant', id: number, name: string } | { __typename: 'MolecularProfile', id: number, name: string } | { __typename: 'Revision', id: number, name: string } | { __typename: 'RevisionSet', id: number, name: string } | { __typename: 'Source', id: number, name: string } | { __typename: 'SourcePopover', id: number, name: string } | { __typename: 'SourceSuggestion', id: number, name: string } | { __typename: 'Variant', id: number, name: string } | { __typename: 'VariantGroup', id: number, name: string } | undefined };
 
-export type NotificationNodeFragment = { __typename: 'Notification', id: number, type: NotificationReason, seen: boolean, event: { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', deprecated: boolean, id: number, link: string, name: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Factor', id: number, name: string, link: string } | { __typename: 'FactorVariant', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'GeneVariant', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined }, subscription?: { __typename: 'Subscription', id: number, subscribable: { __typename: 'Assertion', id: number, name: string } | { __typename: 'EvidenceItem', id: number, name: string } | { __typename: 'Factor', id: number, name: string } | { __typename: 'FactorVariant', id: number, name: string } | { __typename: 'Feature', id: number, name: string } | { __typename: 'Flag', id: number, name: string } | { __typename: 'Gene', id: number, name: string } | { __typename: 'GeneVariant', id: number, name: string } | { __typename: 'MolecularProfile', id: number, name: string } | { __typename: 'Revision', id: number, name: string } | { __typename: 'RevisionSet', id: number, name: string } | { __typename: 'Source', id: number, name: string } | { __typename: 'SourcePopover', id: number, name: string } | { __typename: 'SourceSuggestion', id: number, name: string } | { __typename: 'Variant', id: number, name: string } | { __typename: 'VariantGroup', id: number, name: string } } | undefined };
+export type NotificationNodeFragment = { __typename: 'Notification', id: number, type: NotificationReason, seen: boolean, event: { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'Feature', deprecated: boolean, id: number, link: string, name: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Factor', id: number, name: string, link: string } | { __typename: 'FactorVariant', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'GeneVariant', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined }, subscription?: { __typename: 'Subscription', id: number, subscribable: { __typename: 'Assertion', id: number, name: string } | { __typename: 'EvidenceItem', id: number, name: string } | { __typename: 'Factor', id: number, name: string } | { __typename: 'FactorVariant', id: number, name: string } | { __typename: 'Feature', id: number, name: string } | { __typename: 'Flag', id: number, name: string } | { __typename: 'Gene', id: number, name: string } | { __typename: 'GeneVariant', id: number, name: string } | { __typename: 'MolecularProfile', id: number, name: string } | { __typename: 'Revision', id: number, name: string } | { __typename: 'RevisionSet', id: number, name: string } | { __typename: 'Source', id: number, name: string } | { __typename: 'SourcePopover', id: number, name: string } | { __typename: 'SourceSuggestion', id: number, name: string } | { __typename: 'Variant', id: number, name: string } | { __typename: 'VariantGroup', id: number, name: string } } | undefined };
 
 export type UpdateNotificationStatusMutationVariables = Exact<{
   input: UpdateNotificationStatusInput;
 }>;
 
 
-export type UpdateNotificationStatusMutation = { __typename: 'Mutation', updateNotificationStatus?: { __typename: 'UpdateNotificationStatusPayload', notifications: Array<{ __typename: 'Notification', id: number, type: NotificationReason, seen: boolean, event: { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', name: string, id: number, link: string } | { __typename: 'Feature', deprecated: boolean, id: number, link: string, name: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', name: string, id: number, link: string } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Factor', id: number, name: string, link: string } | { __typename: 'FactorVariant', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'GeneVariant', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined }, subscription?: { __typename: 'Subscription', id: number, subscribable: { __typename: 'Assertion', id: number, name: string } | { __typename: 'EvidenceItem', id: number, name: string } | { __typename: 'Factor', id: number, name: string } | { __typename: 'FactorVariant', id: number, name: string } | { __typename: 'Feature', id: number, name: string } | { __typename: 'Flag', id: number, name: string } | { __typename: 'Gene', id: number, name: string } | { __typename: 'GeneVariant', id: number, name: string } | { __typename: 'MolecularProfile', id: number, name: string } | { __typename: 'Revision', id: number, name: string } | { __typename: 'RevisionSet', id: number, name: string } | { __typename: 'Source', id: number, name: string } | { __typename: 'SourcePopover', id: number, name: string } | { __typename: 'SourceSuggestion', id: number, name: string } | { __typename: 'Variant', id: number, name: string } | { __typename: 'VariantGroup', id: number, name: string } } | undefined }> } | undefined };
+export type UpdateNotificationStatusMutation = { __typename: 'Mutation', updateNotificationStatus?: { __typename: 'UpdateNotificationStatusPayload', notifications: Array<{ __typename: 'Notification', id: number, type: NotificationReason, seen: boolean, event: { __typename: 'Event', id: number, action: EventAction, createdAt: any, organization?: { __typename: 'Organization', id: number, name: string, profileImagePath?: string | undefined } | undefined, originatingUser: { __typename: 'User', id: number, username: string, displayName: string, role: UserRole, profileImagePath?: string | undefined }, subject?: { __typename: 'Assertion', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'EvidenceItem', status: EvidenceStatus, name: string, id: number, link: string } | { __typename: 'Factor', name: string, id: number, link: string } | { __typename: 'FactorVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'Feature', deprecated: boolean, id: number, link: string, name: string } | { __typename: 'Flag', name: string, id: number, link: string } | { __typename: 'Gene', name: string, id: number, link: string } | { __typename: 'GeneVariant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'MolecularProfile', deprecated: boolean, name: string, id: number, link: string } | { __typename: 'Revision', revisionSetId: number, name: string, id: number, link: string } | { __typename: 'RevisionSet', name: string, id: number, link: string } | { __typename: 'Source', citation?: string | undefined, sourceType: SourceSource, name: string, id: number, link: string } | { __typename: 'SourcePopover', name: string, id: number, link: string } | { __typename: 'SourceSuggestion', name: string, id: number, link: string } | { __typename: 'Variant', deprecated: boolean, name: string, id: number, link: string, feature: { __typename: 'Feature', id: number, link: string, name: string } } | { __typename: 'VariantGroup', name: string, id: number, link: string } | undefined, originatingObject?: { __typename: 'Assertion', id: number, name: string, link: string } | { __typename: 'Comment', id: number, name: string, link: string } | { __typename: 'EvidenceItem', id: number, name: string, link: string } | { __typename: 'Factor', id: number, name: string, link: string } | { __typename: 'FactorVariant', id: number, name: string, link: string } | { __typename: 'Feature', id: number, name: string, link: string } | { __typename: 'Flag', id: number, name: string, link: string } | { __typename: 'Gene', id: number, name: string, link: string } | { __typename: 'GeneVariant', id: number, name: string, link: string } | { __typename: 'MolecularProfile', id: number, name: string, link: string } | { __typename: 'Revision', id: number, revisionSetId: number, name: string, link: string } | { __typename: 'SourceSuggestion', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined }, subscription?: { __typename: 'Subscription', id: number, subscribable: { __typename: 'Assertion', id: number, name: string } | { __typename: 'EvidenceItem', id: number, name: string } | { __typename: 'Factor', id: number, name: string } | { __typename: 'FactorVariant', id: number, name: string } | { __typename: 'Feature', id: number, name: string } | { __typename: 'Flag', id: number, name: string } | { __typename: 'Gene', id: number, name: string } | { __typename: 'GeneVariant', id: number, name: string } | { __typename: 'MolecularProfile', id: number, name: string } | { __typename: 'Revision', id: number, name: string } | { __typename: 'RevisionSet', id: number, name: string } | { __typename: 'Source', id: number, name: string } | { __typename: 'SourcePopover', id: number, name: string } | { __typename: 'SourceSuggestion', id: number, name: string } | { __typename: 'Variant', id: number, name: string } | { __typename: 'VariantGroup', id: number, name: string } } | undefined }> } | undefined };
 
 export type UnsubscribeMutationVariables = Exact<{
   input: UnsubscribeInput;
@@ -8437,9 +8514,9 @@ export type VariantSummaryQueryVariables = Exact<{
 }>;
 
 
-export type VariantSummaryQuery = { __typename: 'Query', variant?: { __typename: 'FactorVariant', id: number, name: string, variantAliases: Array<string>, ncitId?: string | undefined, feature: { __typename: 'Feature', id: number, name: string, link: string }, variantTypes: Array<{ __typename: 'VariantType', id: number, link: string, soid: string, name: string }>, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, lastSubmittedRevisionEvent?: { __typename: 'Event', originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, lastAcceptedRevisionEvent?: { __typename: 'Event', originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, creationActivity?: { __typename: 'CreateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, deprecationActivity?: { __typename: 'DeprecateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined } | { __typename: 'GeneVariant', id: number, name: string, variantAliases: Array<string>, alleleRegistryId?: string | undefined, openCravatUrl?: string | undefined, maneSelectTranscript?: string | undefined, hgvsDescriptions: Array<string>, clinvarIds: Array<string>, referenceBuild?: ReferenceBuild | undefined, ensemblVersion?: number | undefined, referenceBases?: string | undefined, variantBases?: string | undefined, feature: { __typename: 'Feature', id: number, name: string, link: string }, variantTypes: Array<{ __typename: 'VariantType', id: number, link: string, soid: string, name: string }>, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, lastSubmittedRevisionEvent?: { __typename: 'Event', originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, lastAcceptedRevisionEvent?: { __typename: 'Event', originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, creationActivity?: { __typename: 'CreateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, deprecationActivity?: { __typename: 'DeprecateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, primaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, secondaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, myVariantInfo?: { __typename: 'MyVariantInfo', myVariantInfoId: string, caddConsequence: Array<string>, caddDetail: Array<string>, caddScore?: number | undefined, caddPhred?: number | undefined, clinvarClinicalSignificance: Array<string>, clinvarHgvsCoding: Array<string>, clinvarHgvsGenomic: Array<string>, clinvarHgvsNonCoding: Array<string>, clinvarHgvsProtein: Array<string>, clinvarId?: number | undefined, clinvarOmim?: string | undefined, cosmicId?: string | undefined, dbnsfpInterproDomain: Array<string>, dbsnpRsid?: string | undefined, eglClass?: string | undefined, eglHgvs: Array<string>, eglProtein?: string | undefined, eglTranscript?: string | undefined, exacAlleleCount?: number | undefined, exacAlleleFrequency?: number | undefined, exacAlleleNumber?: number | undefined, fathmmMklPrediction?: string | undefined, fathmmMklScore?: number | undefined, fathmmPrediction: Array<string>, fathmmScore: Array<number>, fitconsScore?: number | undefined, gerp?: number | undefined, gnomadExomeAlleleCount?: number | undefined, gnomadExomeAlleleFrequency?: number | undefined, gnomadExomeAlleleNumber?: number | undefined, gnomadExomeFilter?: string | undefined, gnomadGenomeAlleleCount?: number | undefined, gnomadGenomeAlleleFrequency?: number | undefined, gnomadGenomeAlleleNumber?: number | undefined, gnomadGenomeFilter?: string | undefined, lrtPrediction?: string | undefined, lrtScore?: number | undefined, metalrPrediction?: string | undefined, metalrScore?: number | undefined, metasvmPrediction?: string | undefined, metasvmScore?: number | undefined, mutationassessorPrediction: Array<string>, mutationassessorScore: Array<number>, mutationtasterPrediction: Array<string>, mutationtasterScore: Array<number>, phastcons100way?: number | undefined, phastcons30way?: number | undefined, phyloP100way?: number | undefined, phyloP30way?: number | undefined, polyphen2HdivPrediction: Array<string>, polyphen2HdivScore: Array<number>, polyphen2HvarPrediction: Array<string>, polyphen2HvarScore: Array<number>, proveanPrediction: Array<string>, proveanScore: Array<number>, revelScore?: Array<number> | undefined, siftPrediction: Array<string>, siftScore: Array<number>, siphy?: number | undefined, snpeffSnpEffect: Array<string>, snpeffSnpImpact: Array<string> } | undefined } | { __typename: 'Variant', id: number, name: string, variantAliases: Array<string>, feature: { __typename: 'Feature', id: number, name: string, link: string }, variantTypes: Array<{ __typename: 'VariantType', id: number, link: string, soid: string, name: string }>, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, lastSubmittedRevisionEvent?: { __typename: 'Event', originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, lastAcceptedRevisionEvent?: { __typename: 'Event', originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, creationActivity?: { __typename: 'CreateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, deprecationActivity?: { __typename: 'DeprecateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined } | undefined };
+export type VariantSummaryQuery = { __typename: 'Query', variant?: { __typename: 'FactorVariant', id: number, name: string, variantAliases: Array<string>, ncitId?: string | undefined, feature: { __typename: 'Feature', id: number, name: string, link: string }, variantTypes: Array<{ __typename: 'VariantType', id: number, link: string, soid: string, name: string }>, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, lastSubmittedRevisionEvent?: { __typename: 'Event', originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, lastAcceptedRevisionEvent?: { __typename: 'Event', originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, creationActivity?: { __typename: 'CreateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, deprecationActivity?: { __typename: 'DeprecateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, ncitDetails?: { __typename: 'NcitDetails', synonyms: Array<{ __typename: 'NcitSynonym', name: string, source: string }>, definitions: Array<{ __typename: 'NcitDefinition', definition: string, source: string }> } | undefined } | { __typename: 'GeneVariant', id: number, name: string, variantAliases: Array<string>, alleleRegistryId?: string | undefined, openCravatUrl?: string | undefined, maneSelectTranscript?: string | undefined, hgvsDescriptions: Array<string>, clinvarIds: Array<string>, referenceBuild?: ReferenceBuild | undefined, ensemblVersion?: number | undefined, referenceBases?: string | undefined, variantBases?: string | undefined, feature: { __typename: 'Feature', id: number, name: string, link: string }, variantTypes: Array<{ __typename: 'VariantType', id: number, link: string, soid: string, name: string }>, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, lastSubmittedRevisionEvent?: { __typename: 'Event', originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, lastAcceptedRevisionEvent?: { __typename: 'Event', originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, creationActivity?: { __typename: 'CreateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, deprecationActivity?: { __typename: 'DeprecateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, primaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, secondaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, myVariantInfo?: { __typename: 'MyVariantInfo', myVariantInfoId: string, caddConsequence: Array<string>, caddDetail: Array<string>, caddScore?: number | undefined, caddPhred?: number | undefined, clinvarClinicalSignificance: Array<string>, clinvarHgvsCoding: Array<string>, clinvarHgvsGenomic: Array<string>, clinvarHgvsNonCoding: Array<string>, clinvarHgvsProtein: Array<string>, clinvarId?: number | undefined, clinvarOmim?: string | undefined, cosmicId?: string | undefined, dbnsfpInterproDomain: Array<string>, dbsnpRsid?: string | undefined, eglClass?: string | undefined, eglHgvs: Array<string>, eglProtein?: string | undefined, eglTranscript?: string | undefined, exacAlleleCount?: number | undefined, exacAlleleFrequency?: number | undefined, exacAlleleNumber?: number | undefined, fathmmMklPrediction?: string | undefined, fathmmMklScore?: number | undefined, fathmmPrediction: Array<string>, fathmmScore: Array<number>, fitconsScore?: number | undefined, gerp?: number | undefined, gnomadExomeAlleleCount?: number | undefined, gnomadExomeAlleleFrequency?: number | undefined, gnomadExomeAlleleNumber?: number | undefined, gnomadExomeFilter?: string | undefined, gnomadGenomeAlleleCount?: number | undefined, gnomadGenomeAlleleFrequency?: number | undefined, gnomadGenomeAlleleNumber?: number | undefined, gnomadGenomeFilter?: string | undefined, lrtPrediction?: string | undefined, lrtScore?: number | undefined, metalrPrediction?: string | undefined, metalrScore?: number | undefined, metasvmPrediction?: string | undefined, metasvmScore?: number | undefined, mutationassessorPrediction: Array<string>, mutationassessorScore: Array<number>, mutationtasterPrediction: Array<string>, mutationtasterScore: Array<number>, phastcons100way?: number | undefined, phastcons30way?: number | undefined, phyloP100way?: number | undefined, phyloP30way?: number | undefined, polyphen2HdivPrediction: Array<string>, polyphen2HdivScore: Array<number>, polyphen2HvarPrediction: Array<string>, polyphen2HvarScore: Array<number>, proveanPrediction: Array<string>, proveanScore: Array<number>, revelScore?: Array<number> | undefined, siftPrediction: Array<string>, siftScore: Array<number>, siphy?: number | undefined, snpeffSnpEffect: Array<string>, snpeffSnpImpact: Array<string> } | undefined } | { __typename: 'Variant', id: number, name: string, variantAliases: Array<string>, feature: { __typename: 'Feature', id: number, name: string, link: string }, variantTypes: Array<{ __typename: 'VariantType', id: number, link: string, soid: string, name: string }>, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, lastSubmittedRevisionEvent?: { __typename: 'Event', originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, lastAcceptedRevisionEvent?: { __typename: 'Event', originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, creationActivity?: { __typename: 'CreateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, deprecationActivity?: { __typename: 'DeprecateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined } | undefined };
 
-type VariantSummaryFields_FactorVariant_Fragment = { __typename: 'FactorVariant', id: number, name: string, variantAliases: Array<string>, ncitId?: string | undefined, feature: { __typename: 'Feature', id: number, name: string, link: string }, variantTypes: Array<{ __typename: 'VariantType', id: number, link: string, soid: string, name: string }>, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, lastSubmittedRevisionEvent?: { __typename: 'Event', originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, lastAcceptedRevisionEvent?: { __typename: 'Event', originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, creationActivity?: { __typename: 'CreateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, deprecationActivity?: { __typename: 'DeprecateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined };
+type VariantSummaryFields_FactorVariant_Fragment = { __typename: 'FactorVariant', id: number, name: string, variantAliases: Array<string>, ncitId?: string | undefined, feature: { __typename: 'Feature', id: number, name: string, link: string }, variantTypes: Array<{ __typename: 'VariantType', id: number, link: string, soid: string, name: string }>, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, lastSubmittedRevisionEvent?: { __typename: 'Event', originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, lastAcceptedRevisionEvent?: { __typename: 'Event', originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, creationActivity?: { __typename: 'CreateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, deprecationActivity?: { __typename: 'DeprecateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, ncitDetails?: { __typename: 'NcitDetails', synonyms: Array<{ __typename: 'NcitSynonym', name: string, source: string }>, definitions: Array<{ __typename: 'NcitDefinition', definition: string, source: string }> } | undefined };
 
 type VariantSummaryFields_GeneVariant_Fragment = { __typename: 'GeneVariant', id: number, name: string, variantAliases: Array<string>, alleleRegistryId?: string | undefined, openCravatUrl?: string | undefined, maneSelectTranscript?: string | undefined, hgvsDescriptions: Array<string>, clinvarIds: Array<string>, referenceBuild?: ReferenceBuild | undefined, ensemblVersion?: number | undefined, referenceBases?: string | undefined, variantBases?: string | undefined, feature: { __typename: 'Feature', id: number, name: string, link: string }, variantTypes: Array<{ __typename: 'VariantType', id: number, link: string, soid: string, name: string }>, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number }, lastSubmittedRevisionEvent?: { __typename: 'Event', originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, lastAcceptedRevisionEvent?: { __typename: 'Event', originatingUser: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, creationActivity?: { __typename: 'CreateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, deprecationActivity?: { __typename: 'DeprecateVariantActivity', createdAt: any, user: { __typename: 'User', id: number, displayName: string, role: UserRole, profileImagePath?: string | undefined } } | undefined, primaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, secondaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, myVariantInfo?: { __typename: 'MyVariantInfo', myVariantInfoId: string, caddConsequence: Array<string>, caddDetail: Array<string>, caddScore?: number | undefined, caddPhred?: number | undefined, clinvarClinicalSignificance: Array<string>, clinvarHgvsCoding: Array<string>, clinvarHgvsGenomic: Array<string>, clinvarHgvsNonCoding: Array<string>, clinvarHgvsProtein: Array<string>, clinvarId?: number | undefined, clinvarOmim?: string | undefined, cosmicId?: string | undefined, dbnsfpInterproDomain: Array<string>, dbsnpRsid?: string | undefined, eglClass?: string | undefined, eglHgvs: Array<string>, eglProtein?: string | undefined, eglTranscript?: string | undefined, exacAlleleCount?: number | undefined, exacAlleleFrequency?: number | undefined, exacAlleleNumber?: number | undefined, fathmmMklPrediction?: string | undefined, fathmmMklScore?: number | undefined, fathmmPrediction: Array<string>, fathmmScore: Array<number>, fitconsScore?: number | undefined, gerp?: number | undefined, gnomadExomeAlleleCount?: number | undefined, gnomadExomeAlleleFrequency?: number | undefined, gnomadExomeAlleleNumber?: number | undefined, gnomadExomeFilter?: string | undefined, gnomadGenomeAlleleCount?: number | undefined, gnomadGenomeAlleleFrequency?: number | undefined, gnomadGenomeAlleleNumber?: number | undefined, gnomadGenomeFilter?: string | undefined, lrtPrediction?: string | undefined, lrtScore?: number | undefined, metalrPrediction?: string | undefined, metalrScore?: number | undefined, metasvmPrediction?: string | undefined, metasvmScore?: number | undefined, mutationassessorPrediction: Array<string>, mutationassessorScore: Array<number>, mutationtasterPrediction: Array<string>, mutationtasterScore: Array<number>, phastcons100way?: number | undefined, phastcons30way?: number | undefined, phyloP100way?: number | undefined, phyloP30way?: number | undefined, polyphen2HdivPrediction: Array<string>, polyphen2HdivScore: Array<number>, polyphen2HvarPrediction: Array<string>, polyphen2HvarScore: Array<number>, proveanPrediction: Array<string>, proveanScore: Array<number>, revelScore?: Array<number> | undefined, siftPrediction: Array<string>, siftScore: Array<number>, siphy?: number | undefined, snpeffSnpEffect: Array<string>, snpeffSnpImpact: Array<string> } | undefined };
 
@@ -8447,7 +8524,7 @@ type VariantSummaryFields_Variant_Fragment = { __typename: 'Variant', id: number
 
 export type VariantSummaryFieldsFragment = VariantSummaryFields_FactorVariant_Fragment | VariantSummaryFields_GeneVariant_Fragment | VariantSummaryFields_Variant_Fragment;
 
-export type FactorVariantSummaryFieldsFragment = { __typename: 'FactorVariant', ncitId?: string | undefined };
+export type FactorVariantSummaryFieldsFragment = { __typename: 'FactorVariant', ncitId?: string | undefined, ncitDetails?: { __typename: 'NcitDetails', synonyms: Array<{ __typename: 'NcitSynonym', name: string, source: string }>, definitions: Array<{ __typename: 'NcitDefinition', definition: string, source: string }> } | undefined };
 
 export type GeneVariantSummaryFieldsFragment = { __typename: 'GeneVariant', alleleRegistryId?: string | undefined, openCravatUrl?: string | undefined, maneSelectTranscript?: string | undefined, hgvsDescriptions: Array<string>, clinvarIds: Array<string>, referenceBuild?: ReferenceBuild | undefined, ensemblVersion?: number | undefined, referenceBases?: string | undefined, variantBases?: string | undefined, primaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, secondaryCoordinates?: { __typename: 'Coordinate', representativeTranscript?: string | undefined, chromosome?: string | undefined, start?: number | undefined, stop?: number | undefined } | undefined, myVariantInfo?: { __typename: 'MyVariantInfo', myVariantInfoId: string, caddConsequence: Array<string>, caddDetail: Array<string>, caddScore?: number | undefined, caddPhred?: number | undefined, clinvarClinicalSignificance: Array<string>, clinvarHgvsCoding: Array<string>, clinvarHgvsGenomic: Array<string>, clinvarHgvsNonCoding: Array<string>, clinvarHgvsProtein: Array<string>, clinvarId?: number | undefined, clinvarOmim?: string | undefined, cosmicId?: string | undefined, dbnsfpInterproDomain: Array<string>, dbsnpRsid?: string | undefined, eglClass?: string | undefined, eglHgvs: Array<string>, eglProtein?: string | undefined, eglTranscript?: string | undefined, exacAlleleCount?: number | undefined, exacAlleleFrequency?: number | undefined, exacAlleleNumber?: number | undefined, fathmmMklPrediction?: string | undefined, fathmmMklScore?: number | undefined, fathmmPrediction: Array<string>, fathmmScore: Array<number>, fitconsScore?: number | undefined, gerp?: number | undefined, gnomadExomeAlleleCount?: number | undefined, gnomadExomeAlleleFrequency?: number | undefined, gnomadExomeAlleleNumber?: number | undefined, gnomadExomeFilter?: string | undefined, gnomadGenomeAlleleCount?: number | undefined, gnomadGenomeAlleleFrequency?: number | undefined, gnomadGenomeAlleleNumber?: number | undefined, gnomadGenomeFilter?: string | undefined, lrtPrediction?: string | undefined, lrtScore?: number | undefined, metalrPrediction?: string | undefined, metalrScore?: number | undefined, metasvmPrediction?: string | undefined, metasvmScore?: number | undefined, mutationassessorPrediction: Array<string>, mutationassessorScore: Array<number>, mutationtasterPrediction: Array<string>, mutationtasterScore: Array<number>, phastcons100way?: number | undefined, phastcons30way?: number | undefined, phyloP100way?: number | undefined, phyloP30way?: number | undefined, polyphen2HdivPrediction: Array<string>, polyphen2HdivScore: Array<number>, polyphen2HvarPrediction: Array<string>, polyphen2HvarScore: Array<number>, proveanPrediction: Array<string>, proveanScore: Array<number>, revelScore?: Array<number> | undefined, siftPrediction: Array<string>, siftScore: Array<number>, siphy?: number | undefined, snpeffSnpEffect: Array<string>, snpeffSnpImpact: Array<string> } | undefined };
 
@@ -8493,7 +8570,7 @@ export const ActivityFeedNodeFragmentDoc = gql`
     ... on Revision {
       revisionSetId
     }
-    ... on Variant {
+    ... on VariantInterface {
       deprecated
       feature {
         id
@@ -8798,7 +8875,7 @@ export const EventFeedNodeFragmentDoc = gql`
     ... on Revision {
       revisionSetId
     }
-    ... on Variant {
+    ... on VariantInterface {
       deprecated
       feature {
         id
@@ -9072,7 +9149,7 @@ export const FlagPopoverFragmentDoc = gql`
     id
     link
     name
-    ... on Variant {
+    ... on VariantInterface {
       deprecated
       feature {
         id
@@ -9249,7 +9326,7 @@ export const RevisionPopoverFragmentDoc = gql`
     id
     link
     name
-    ... on Variant {
+    ... on VariantInterface {
       deprecated
       feature {
         id
@@ -9879,6 +9956,22 @@ export const RevisableFactorFieldsFragmentDoc = gql`
   }
 }
     `;
+export const RevisableFactorVariantFieldsFragmentDoc = gql`
+    fragment RevisableFactorVariantFields on FactorVariant {
+  name
+  feature {
+    id
+    name
+  }
+  variantAliases
+  variantTypes {
+    id
+    name
+    soid
+  }
+  ncitId
+}
+    `;
 export const RevisableGeneFieldsFragmentDoc = gql`
     fragment RevisableGeneFields on Feature {
   id
@@ -10750,8 +10843,11 @@ export const GeneVariantSummaryFieldsFragmentDoc = gql`
 export const FactorVariantSummaryFieldsFragmentDoc = gql`
     fragment FactorVariantSummaryFields on FactorVariant {
   ncitId
+  ncitDetails {
+    ...NcitDetails
+  }
 }
-    `;
+    ${NcitDetailsFragmentDoc}`;
 export const VariantMolecularProfileCardFieldsFragmentDoc = gql`
     fragment VariantMolecularProfileCardFields on VariantInterface {
   id
@@ -13884,6 +13980,53 @@ export const SuggestFactorRevisionDocument = gql`
   export class SuggestFactorRevisionGQL extends Apollo.Mutation<SuggestFactorRevisionMutation, SuggestFactorRevisionMutationVariables> {
     document = SuggestFactorRevisionDocument;
     
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
+export const FactorVariantRevisableFieldsDocument = gql`
+    query FactorVariantRevisableFields($variantId: Int!) {
+  variant(id: $variantId) {
+    id
+    ... on FactorVariant {
+      ...RevisableFactorVariantFields
+    }
+  }
+}
+    ${RevisableFactorVariantFieldsFragmentDoc}`;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class FactorVariantRevisableFieldsGQL extends Apollo.Query<FactorVariantRevisableFieldsQuery, FactorVariantRevisableFieldsQueryVariables> {
+    document = FactorVariantRevisableFieldsDocument;
+    
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
+export const SuggestFactorVariantRevisionDocument = gql`
+    mutation SuggestFactorVariantRevision($input: SuggestFactorVariantRevisionInput!) {
+  suggestFactorVariantRevision(input: $input) {
+    clientMutationId
+    variant {
+      id
+    }
+    results {
+      id
+      fieldName
+      newlyCreated
+    }
+  }
+}
+    `;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class SuggestFactorVariantRevisionGQL extends Apollo.Mutation<SuggestFactorVariantRevisionMutation, SuggestFactorVariantRevisionMutationVariables> {
+    document = SuggestFactorVariantRevisionDocument;
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
diff --git a/client/src/app/generated/server.model.graphql b/client/src/app/generated/server.model.graphql
index b1a0f2445..657e9fa7b 100644
--- a/client/src/app/generated/server.model.graphql
+++ b/client/src/app/generated/server.model.graphql
@@ -3418,6 +3418,7 @@ type FactorVariant implements Commentable & EventOriginObject & EventSubject & F
     last: Int
   ): MolecularProfileConnection!
   name: String!
+  ncitDetails: NcitDetails
   ncitId: String
 
   """
@@ -3475,6 +3476,36 @@ type FactorVariant implements Commentable & EventOriginObject & EventSubject & F
   variantTypes: [VariantType!]!
 }
 
+"""
+Fields on a FactorVariant that curators may propose revisions to.
+"""
+input FactorVariantFields {
+  """
+  List of aliases or alternate names for the Variant.
+  """
+  aliases: [String!]!
+
+  """
+  The ID of the Feature this Variant corresponds to.
+  """
+  featureId: Int!
+
+  """
+  The Variant's name.
+  """
+  name: String!
+
+  """
+  NCI Thesaurus concept ID for this Factor
+  """
+  ncitId: NullableStringInput!
+
+  """
+  List of IDs for the variant types for this Variant
+  """
+  variantTypeIds: [Int!]!
+}
+
 type FdaCode {
   code: String!
   description: String!
@@ -5827,6 +5858,16 @@ type Mutation {
     input: SuggestFactorRevisionInput!
   ): SuggestFactorRevisionPayload
 
+  """
+  Suggest a Revision to a Variant entity.
+  """
+  suggestFactorVariantRevision(
+    """
+    Parameters for SuggestFactorVariantRevision
+    """
+    input: SuggestFactorVariantRevisionInput!
+  ): SuggestFactorVariantRevisionPayload
+
   """
   Suggest a Revision to a Feature entity of instance type "Gene".
   """
@@ -9253,6 +9294,64 @@ type SuggestFactorRevisionPayload {
   results: [RevisionResult!]!
 }
 
+"""
+Autogenerated input type of SuggestFactorVariantRevision
+"""
+input SuggestFactorVariantRevisionInput {
+  """
+  A unique identifier for the client performing the mutation.
+  """
+  clientMutationId: String
+
+  """
+  Text describing the reason for the change. Will be attached to the Revision as a comment.
+  """
+  comment: String
+
+  """
+  The desired state of the Variant's editable fields if the change were applied.
+  If no change is desired for a particular field, pass in the current value of that field.
+  """
+  fields: FactorVariantFields!
+
+  """
+  The ID of the Variant to suggest a Revision to.
+  """
+  id: Int!
+
+  """
+  The ID of the organization to credit the user's contributions to.
+  If the user belongs to a single organization or no organizations, this field is not required.
+  This field is required if the user belongs to more than one organization.
+  The user must belong to the organization provided.
+  """
+  organizationId: Int
+}
+
+"""
+Autogenerated return type of SuggestFactorVariantRevision.
+"""
+type SuggestFactorVariantRevisionPayload {
+  """
+  A unique identifier for the client performing the mutation.
+  """
+  clientMutationId: String
+
+  """
+  A list of Revisions generated as a result of this suggestion.
+  If an existing Revision exactly matches the proposed one, it will be returned instead.
+  This is indicated via the 'newlyCreated' Boolean.
+  Revisions are stored on a per-field basis.
+  The changesetId can be used to group Revisions proposed at the same time.
+  """
+  results: [RevisionResult!]!
+
+  """
+  The Variant the user has proposed a Revision to.
+  """
+  variant: FactorVariant!
+}
+
 """
 Autogenerated input type of SuggestGeneRevision
 """
@@ -9366,7 +9465,7 @@ type SuggestGeneVariantRevisionPayload {
   """
   The Variant the user has proposed a Revision to.
   """
-  variant: VariantInterface!
+  variant: GeneVariant!
 }
 
 """
diff --git a/client/src/app/generated/server.schema.json b/client/src/app/generated/server.schema.json
index 04d624e08..3110f3f20 100644
--- a/client/src/app/generated/server.schema.json
+++ b/client/src/app/generated/server.schema.json
@@ -8903,6 +8903,11 @@
               "name": "FactorVariant",
               "ofType": null
             },
+            {
+              "kind": "OBJECT",
+              "name": "FactorVariant",
+              "ofType": null
+            },
             {
               "kind": "OBJECT",
               "name": "Feature",
@@ -8923,6 +8928,11 @@
               "name": "GeneVariant",
               "ofType": null
             },
+            {
+              "kind": "OBJECT",
+              "name": "GeneVariant",
+              "ofType": null
+            },
             {
               "kind": "OBJECT",
               "name": "MolecularProfile",
@@ -8948,6 +8958,11 @@
               "name": "Variant",
               "ofType": null
             },
+            {
+              "kind": "OBJECT",
+              "name": "Variant",
+              "ofType": null
+            },
             {
               "kind": "OBJECT",
               "name": "VariantGroup",
@@ -12798,6 +12813,11 @@
               "name": "FactorVariant",
               "ofType": null
             },
+            {
+              "kind": "OBJECT",
+              "name": "FactorVariant",
+              "ofType": null
+            },
             {
               "kind": "OBJECT",
               "name": "Feature",
@@ -12818,6 +12838,11 @@
               "name": "GeneVariant",
               "ofType": null
             },
+            {
+              "kind": "OBJECT",
+              "name": "GeneVariant",
+              "ofType": null
+            },
             {
               "kind": "OBJECT",
               "name": "MolecularProfile",
@@ -12833,6 +12858,11 @@
               "name": "SourceSuggestion",
               "ofType": null
             },
+            {
+              "kind": "OBJECT",
+              "name": "Variant",
+              "ofType": null
+            },
             {
               "kind": "OBJECT",
               "name": "Variant",
@@ -13031,6 +13061,11 @@
               "name": "FactorVariant",
               "ofType": null
             },
+            {
+              "kind": "OBJECT",
+              "name": "FactorVariant",
+              "ofType": null
+            },
             {
               "kind": "OBJECT",
               "name": "Feature",
@@ -13051,6 +13086,11 @@
               "name": "GeneVariant",
               "ofType": null
             },
+            {
+              "kind": "OBJECT",
+              "name": "GeneVariant",
+              "ofType": null
+            },
             {
               "kind": "OBJECT",
               "name": "MolecularProfile",
@@ -13086,6 +13126,11 @@
               "name": "Variant",
               "ofType": null
             },
+            {
+              "kind": "OBJECT",
+              "name": "Variant",
+              "ofType": null
+            },
             {
               "kind": "OBJECT",
               "name": "VariantGroup",
@@ -16669,6 +16714,18 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "ncitDetails",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "NcitDetails",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "ncitId",
               "description": null,
@@ -16928,6 +16985,113 @@
           "enumValues": null,
           "possibleTypes": null
         },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "FactorVariantFields",
+          "description": "Fields on a FactorVariant that curators may propose revisions to.",
+          "fields": null,
+          "inputFields": [
+            {
+              "name": "name",
+              "description": "The Variant's name.",
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "aliases",
+              "description": "List of aliases or alternate names for the Variant.",
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "SCALAR",
+                      "name": "String",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "variantTypeIds",
+              "description": "List of IDs for the variant types for this Variant",
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "SCALAR",
+                      "name": "Int",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "featureId",
+              "description": "The ID of the Feature this Variant corresponds to.",
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "ncitId",
+              "description": "NCI Thesaurus concept ID for this Factor",
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "INPUT_OBJECT",
+                  "name": "NullableStringInput",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
         {
           "kind": "OBJECT",
           "name": "FdaCode",
@@ -19220,6 +19384,11 @@
               "name": "FactorVariant",
               "ofType": null
             },
+            {
+              "kind": "OBJECT",
+              "name": "FactorVariant",
+              "ofType": null
+            },
             {
               "kind": "OBJECT",
               "name": "Feature",
@@ -19235,6 +19404,11 @@
               "name": "GeneVariant",
               "ofType": null
             },
+            {
+              "kind": "OBJECT",
+              "name": "GeneVariant",
+              "ofType": null
+            },
             {
               "kind": "OBJECT",
               "name": "MolecularProfile",
@@ -19245,6 +19419,11 @@
               "name": "Variant",
               "ofType": null
             },
+            {
+              "kind": "OBJECT",
+              "name": "Variant",
+              "ofType": null
+            },
             {
               "kind": "OBJECT",
               "name": "VariantGroup",
@@ -25492,6 +25671,11 @@
               "name": "FactorVariant",
               "ofType": null
             },
+            {
+              "kind": "OBJECT",
+              "name": "FactorVariant",
+              "ofType": null
+            },
             {
               "kind": "OBJECT",
               "name": "Feature",
@@ -25507,6 +25691,16 @@
               "name": "GeneVariant",
               "ofType": null
             },
+            {
+              "kind": "OBJECT",
+              "name": "GeneVariant",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "Variant",
+              "ofType": null
+            },
             {
               "kind": "OBJECT",
               "name": "Variant",
@@ -26800,6 +26994,35 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "suggestFactorVariantRevision",
+              "description": "Suggest a Revision to a Variant entity.",
+              "args": [
+                {
+                  "name": "input",
+                  "description": "Parameters for SuggestFactorVariantRevision",
+                  "type": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "INPUT_OBJECT",
+                      "name": "SuggestFactorVariantRevisionInput",
+                      "ofType": null
+                    }
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                }
+              ],
+              "type": {
+                "kind": "OBJECT",
+                "name": "SuggestFactorVariantRevisionPayload",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "suggestGeneRevision",
               "description": "Suggest a Revision to a Feature entity of instance type \"Gene\".",
@@ -42367,6 +42590,148 @@
           "enumValues": null,
           "possibleTypes": null
         },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "SuggestFactorVariantRevisionInput",
+          "description": "Autogenerated input type of SuggestFactorVariantRevision",
+          "fields": null,
+          "inputFields": [
+            {
+              "name": "clientMutationId",
+              "description": "A unique identifier for the client performing the mutation.",
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "organizationId",
+              "description": "The ID of the organization to credit the user's contributions to.\nIf the user belongs to a single organization or no organizations, this field is not required.\nThis field is required if the user belongs to more than one organization.\nThe user must belong to the organization provided.",
+              "type": {
+                "kind": "SCALAR",
+                "name": "Int",
+                "ofType": null
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "id",
+              "description": "The ID of the Variant to suggest a Revision to.",
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "fields",
+              "description": "The desired state of the Variant's editable fields if the change were applied.\nIf no change is desired for a particular field, pass in the current value of that field.",
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "INPUT_OBJECT",
+                  "name": "FactorVariantFields",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "comment",
+              "description": "Text describing the reason for the change. Will be attached to the Revision as a comment.",
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "SuggestFactorVariantRevisionPayload",
+          "description": "Autogenerated return type of SuggestFactorVariantRevision.",
+          "fields": [
+            {
+              "name": "clientMutationId",
+              "description": "A unique identifier for the client performing the mutation.",
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "results",
+              "description": "A list of Revisions generated as a result of this suggestion.\nIf an existing Revision exactly matches the proposed one, it will be returned instead.\nThis is indicated via the 'newlyCreated' Boolean.\nRevisions are stored on a per-field basis.\nThe changesetId can be used to group Revisions proposed at the same time.",
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "RevisionResult",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "variant",
+              "description": "The Variant the user has proposed a Revision to.",
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "FactorVariant",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
         {
           "kind": "INPUT_OBJECT",
           "name": "SuggestGeneRevisionInput",
@@ -42641,8 +43006,8 @@
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "INTERFACE",
-                  "name": "VariantInterface",
+                  "kind": "OBJECT",
+                  "name": "GeneVariant",
                   "ofType": null
                 }
               },
@@ -49560,6 +49925,11 @@
               "name": "FactorVariant",
               "ofType": null
             },
+            {
+              "kind": "OBJECT",
+              "name": "FactorVariant",
+              "ofType": null
+            },
             {
               "kind": "OBJECT",
               "name": "Feature",
@@ -49575,6 +49945,11 @@
               "name": "GeneVariant",
               "ofType": null
             },
+            {
+              "kind": "OBJECT",
+              "name": "GeneVariant",
+              "ofType": null
+            },
             {
               "kind": "OBJECT",
               "name": "MolecularProfile",
@@ -49585,6 +49960,11 @@
               "name": "Variant",
               "ofType": null
             },
+            {
+              "kind": "OBJECT",
+              "name": "Variant",
+              "ofType": null
+            },
             {
               "kind": "OBJECT",
               "name": "VariantGroup",
diff --git a/client/src/app/views/molecular-profiles/molecular-profiles-detail/molecular-profiles-summary/molecular-profiles-summary.module.ts b/client/src/app/views/molecular-profiles/molecular-profiles-detail/molecular-profiles-summary/molecular-profiles-summary.module.ts
index 6a3515dc7..1a4e28cd6 100644
--- a/client/src/app/views/molecular-profiles/molecular-profiles-detail/molecular-profiles-summary/molecular-profiles-summary.module.ts
+++ b/client/src/app/views/molecular-profiles/molecular-profiles-detail/molecular-profiles-summary/molecular-profiles-summary.module.ts
@@ -21,6 +21,7 @@ import { MolecularProfilesSummaryPage } from './molecular-profiles-summary.page'
 import { CvcMolecularProfileTagNameModule } from '@app/components/molecular-profiles/molecular-profile-tag-name/molecular-profile-tag-name.module'
 import { CvcEmptyValueModule } from '@app/forms/components/empty-value/empty-value.module'
 import { CvcMolecularProfileGeneVariantCardModule } from '@app/components/molecular-profiles/molecular-profile-gene-variant-card/molecular-profile-gene-variant-card.module'
+import { CvcMolecularProfileFactorVariantCardComponent } from '@app/components/molecular-profiles/molecular-profile-factor-variant-card/molecular-profile-factor-variant-card.component'
 
 @NgModule({
   declarations: [MolecularProfilesSummaryPage],
@@ -47,6 +48,7 @@ import { CvcMolecularProfileGeneVariantCardModule } from '@app/components/molecu
     CvcEmptyRevisableModule,
     CvcMolecularProfileTagNameModule,
     CvcMolecularProfileGeneVariantCardModule,
+    CvcMolecularProfileFactorVariantCardComponent,
   ],
   exports: [MolecularProfilesSummaryPage],
 })
diff --git a/client/src/app/views/molecular-profiles/molecular-profiles-detail/molecular-profiles-summary/molecular-profiles-summary.page.html b/client/src/app/views/molecular-profiles/molecular-profiles-detail/molecular-profiles-summary/molecular-profiles-summary.page.html
index 686416169..31f55fc13 100644
--- a/client/src/app/views/molecular-profiles/molecular-profiles-detail/molecular-profiles-summary/molecular-profiles-summary.page.html
+++ b/client/src/app/views/molecular-profiles/molecular-profiles-detail/molecular-profiles-summary/molecular-profiles-summary.page.html
@@ -133,10 +133,17 @@
             *ngFor="let v of mp.variants">
             <!-- prettier-ignore -->
             @switch(v.__typename) {
+            <!-- prettier-ignore -->
             @case('GeneVariant') {
             <cvc-mp-gene-variant-card
               [variant]="v"
               [currentMolecularProfileId]="mp.id"></cvc-mp-gene-variant-card>
+            }
+            <!-- prettier-ignore -->
+            @case('FactorVariant') {
+            <cvc-mp-factor-variant-card
+              [variant]="v"
+              [currentMolecularProfileId]="mp.id"></cvc-mp-factor-variant-card>
             } }
           </nz-col>
         </nz-row>
diff --git a/client/src/app/views/variants/variants-detail/variants-summary/variants-summary.module.ts b/client/src/app/views/variants/variants-detail/variants-summary/variants-summary.module.ts
index 9ab27e282..4ec5f3fdc 100644
--- a/client/src/app/views/variants/variants-detail/variants-summary/variants-summary.module.ts
+++ b/client/src/app/views/variants/variants-detail/variants-summary/variants-summary.module.ts
@@ -1,10 +1,18 @@
 import { NgModule } from '@angular/core'
 import { VariantsSummaryPage } from './variants-summary.page'
 import { CvcGeneVariantSummaryComponent } from '@app/components/variants/gene-variant-summary/gene-variant-summary.page'
+import { CvcFactorVariantSummaryComponent } from '@app/components/variants/factor-variant-summary/factor-variant-summary.page'
+import { PushPipe } from '@ngrx/component'
+import { CommonModule } from '@angular/common'
 
 @NgModule({
   declarations: [VariantsSummaryPage],
-  imports: [CvcGeneVariantSummaryComponent],
+  imports: [
+    CommonModule,
+    PushPipe,
+    CvcGeneVariantSummaryComponent,
+    CvcFactorVariantSummaryComponent,
+  ],
   exports: [VariantsSummaryPage],
 })
 export class VariantsSummaryModule {}
diff --git a/client/src/app/views/variants/variants-detail/variants-summary/variants-summary.page.html b/client/src/app/views/variants/variants-detail/variants-summary/variants-summary.page.html
index b403368ad..1aa17af84 100644
--- a/client/src/app/views/variants/variants-detail/variants-summary/variants-summary.page.html
+++ b/client/src/app/views/variants/variants-detail/variants-summary/variants-summary.page.html
@@ -1,7 +1,11 @@
-<ng-container *ngIf="variant$ | ngrxPush as variant">
+<!-- prettier-ignore -->
+<ng-container *ngIf="(variant$ | ngrxPush) as variant">
   <!-- prettier-ignore -->
   @switch(variant.__typename) {
     @case('GeneVariant') {
   <cvc-gene-variant-summary [variant]="variant"></cvc-gene-variant-summary>
-  } @case('FactorVariant') { TBD } }
+  <!-- prettier-ignore -->
+  } @case('FactorVariant') {
+  <cvc-factor-variant-summary [variant]="variant"></cvc-factor-variant-summary>
+  } }
 </ng-container>
diff --git a/client/src/app/views/variants/variants-detail/variants-summary/variants-summary.query.gql b/client/src/app/views/variants/variants-detail/variants-summary/variants-summary.query.gql
index 83134a492..deecef86a 100644
--- a/client/src/app/views/variants/variants-detail/variants-summary/variants-summary.query.gql
+++ b/client/src/app/views/variants/variants-detail/variants-summary/variants-summary.query.gql
@@ -74,6 +74,9 @@ fragment VariantSummaryFields on VariantInterface {
 
 fragment FactorVariantSummaryFields on FactorVariant {
   ncitId
+  ncitDetails {
+    ... NcitDetails
+  }
 }
 
 fragment GeneVariantSummaryFields on GeneVariant {
diff --git a/client/src/app/views/variants/variants-revise/variants-suggest/variants-suggest.module.ts b/client/src/app/views/variants/variants-revise/variants-suggest/variants-suggest.module.ts
index d7bd8700b..4e4839432 100644
--- a/client/src/app/views/variants/variants-revise/variants-suggest/variants-suggest.module.ts
+++ b/client/src/app/views/variants/variants-revise/variants-suggest/variants-suggest.module.ts
@@ -2,9 +2,14 @@ import { NgModule } from '@angular/core'
 import { CommonModule } from '@angular/common'
 import { VariantsSuggestPage } from './variants-suggest.page'
 import { CvcGeneVariantReviseFormModule } from '@app/forms/config/gene-variant-revise/gene-variant-revise.form.module'
+import { CvcFactorVariantReviseFormModule } from '@app/forms/config/factor-variant-revise/factor-variant-revise.form.module'
 
 @NgModule({
   declarations: [VariantsSuggestPage],
-  imports: [CommonModule, CvcGeneVariantReviseFormModule],
+  imports: [
+    CommonModule,
+    CvcGeneVariantReviseFormModule,
+    CvcFactorVariantReviseFormModule,
+  ],
 })
 export class VariantsSuggestModule {}
diff --git a/client/src/app/views/variants/variants-revise/variants-suggest/variants-suggest.page.html b/client/src/app/views/variants/variants-revise/variants-suggest/variants-suggest.page.html
index b0cd3318f..dc1ba0c46 100644
--- a/client/src/app/views/variants/variants-revise/variants-suggest/variants-suggest.page.html
+++ b/client/src/app/views/variants/variants-revise/variants-suggest/variants-suggest.page.html
@@ -2,6 +2,9 @@
   @switch(variantType) { @case("GeneVariant") {
   <cvc-gene-variant-revise-form [variantId]="variantId">
   </cvc-gene-variant-revise-form>
-  } @case("FactorVariant") { TBD } }
+  } @case("FactorVariant") {
+  <cvc-factor-variant-revise-form [variantId]="variantId">
+  </cvc-factor-variant-revise-form>
+  } }
 </ng-container>
 <ng-template #loadingVariant>Loading Variant...</ng-template>
diff --git a/server/app/graphql/mutations/suggest_factor_variant_revision.rb b/server/app/graphql/mutations/suggest_factor_variant_revision.rb
new file mode 100644
index 000000000..360e01b13
--- /dev/null
+++ b/server/app/graphql/mutations/suggest_factor_variant_revision.rb
@@ -0,0 +1,94 @@
+class Mutations::SuggestFactorVariantRevision < Mutations::MutationWithOrg
+  description 'Suggest a Revision to a Variant entity.'
+  argument :id, Int, required: true,
+    description: 'The ID of the Variant to suggest a Revision to.'
+
+  argument :fields, Types::Revisions::FactorVariantFields, required: true,
+    description: <<~DOC.strip
+      The desired state of the Variant's editable fields if the change were applied.
+      If no change is desired for a particular field, pass in the current value of that field.
+    DOC
+
+  argument :comment, String, required: false,
+    validates: { length: { minimum: 10 } },
+    description: 'Text describing the reason for the change. Will be attached to the Revision as a comment.'
+
+  field :variant, Types::Variants::FactorVariantType, null: false,
+    description: 'The Variant the user has proposed a Revision to.'
+
+  field :results, [Types::Revisions::RevisionResult], null: false,
+    description: <<~DOC.strip
+      A list of Revisions generated as a result of this suggestion.
+      If an existing Revision exactly matches the proposed one, it will be returned instead.
+      This is indicated via the 'newlyCreated' Boolean.
+      Revisions are stored on a per-field basis.
+      The changesetId can be used to group Revisions proposed at the same time.
+    DOC
+
+  attr_reader :variant
+
+  def ready?(organization_id: nil, id:, fields:, **kwargs)
+    validate_user_logged_in
+    validate_user_org(organization_id)
+
+    variant = Variant.find_by(id: id)
+    if variant.nil?
+      raise GraphQL::ExecutionError, "Variant with id #{id} doesn't exist."
+    end
+
+    if !variant.is_a?(Variants::GeneVariant)
+      raise GraphQL::ExecutionError, "Variant with id #{id} is a #{variant.type} and you called the GeneVariant mutation."
+    end
+
+    @variant = variant
+
+    feature = Feature.find_by(id: fields.feature_id)
+    if feature.nil?
+      raise GraphQL::ExecutionError, "Provided feature id: #{fields.feature_id} is not found."
+    else
+      unless variant.is_a?(feature.compatible_variant_type)
+        raise GraphQL::ExecutionError, "Provided feature type: #{feature.class} is not compatible with variant type variant.class."
+      end
+    end
+
+    existing_variant_type_ids = VariantType.where(id: fields.variant_type_ids).pluck(:id)
+    if existing_variant_type_ids.size != fields.variant_type_ids.size
+      raise GraphQL::ExecutionError, "Provided variant type ids: #{fields.variant_type_ids.join(', ')} but only #{existing_variant_type_ids.join(', ')} exist."
+    end
+
+    return true
+  end
+
+  def authorized?(organization_id: nil, **kwargs)
+    validate_user_acting_as_org(user: context[:current_user], organization_id: organization_id)
+    return true
+  end
+
+  def resolve(fields:, id:, organization_id: nil, comment: nil)
+    updated_variant = InputAdaptors::FactorVariantInputAdaptor.new(variant_input_object: fields).perform
+    updated_variant.single_variant_molecular_profile_id = variant.single_variant_molecular_profile_id
+
+    cmd = Activities::SuggestRevisionSet.new(
+      existing_obj: variant,
+      updated_obj: updated_variant,
+      originating_user: context[:current_user],
+      organization_id: organization_id,
+      note: comment
+    )
+    res = cmd.perform
+
+    if res.succeeded?
+      {
+        variant: variant,
+        results: res.revision_results
+      }
+    else
+      raise GraphQL::ExecutionError, res.errors.join(', ')
+    end
+  end
+end
+
+
+
+
+
diff --git a/server/app/graphql/mutations/suggest_gene_variant_revision.rb b/server/app/graphql/mutations/suggest_gene_variant_revision.rb
index 1d0ce8443..b51e26b7e 100644
--- a/server/app/graphql/mutations/suggest_gene_variant_revision.rb
+++ b/server/app/graphql/mutations/suggest_gene_variant_revision.rb
@@ -13,7 +13,7 @@ class Mutations::SuggestGeneVariantRevision < Mutations::MutationWithOrg
     validates: { length: { minimum: 10 } },
     description: 'Text describing the reason for the change. Will be attached to the Revision as a comment.'
 
-  field :variant, Types::Interfaces::VariantInterface, null: false,
+  field :variant, Types::Variants::GeneVariantType, null: false,
     description: 'The Variant the user has proposed a Revision to.'
 
   field :results, [Types::Revisions::RevisionResult], null: false,
@@ -42,8 +42,13 @@ def ready?(organization_id: nil, id:, fields:, **kwargs)
 
     @variant = variant
 
-    if !Feature.find_by(id: fields.feature_id)
+    feature = Feature.find_by(id: fields.feature_id)
+    if feature.nil?
       raise GraphQL::ExecutionError, "Provided feature id: #{fields.feature_id} is not found."
+    else
+      unless variant.is_a?(feature.compatible_variant_type)
+        raise GraphQL::ExecutionError, "Provided feature type: #{feature.class} is not compatible with variant type variant.class."
+      end
     end
 
     existing_variant_type_ids = VariantType.where(id: fields.variant_type_ids).pluck(:id)
@@ -60,7 +65,7 @@ def authorized?(organization_id: nil, **kwargs)
   end
 
   def resolve(fields:, id:, organization_id: nil, comment: nil)
-    updated_variant = InputAdaptors::VariantInputAdaptor.new(variant_input_object: fields).perform
+    updated_variant = InputAdaptors::GeneVariantInputAdaptor.new(variant_input_object: fields).perform
     updated_variant.single_variant_molecular_profile_id = variant.single_variant_molecular_profile_id
 
     cmd = Activities::SuggestRevisionSet.new(
diff --git a/server/app/graphql/resolvers/comments.rb b/server/app/graphql/resolvers/comments.rb
index 5e4b12766..30362db4b 100644
--- a/server/app/graphql/resolvers/comments.rb
+++ b/server/app/graphql/resolvers/comments.rb
@@ -1,32 +1,34 @@
 require 'search_object'
 require 'search_object/plugin/graphql'
 
-class Resolvers::Comments < GraphQL::Schema::Resolver
-  include SearchObject.module(:graphql)
+module Resolvers
+  class Comments < GraphQL::Schema::Resolver
+    include SearchObject.module(:graphql)
 
-  type Types::Entities::CommentType.connection_type, null: false
+    type Types::Entities::CommentType.connection_type, null: false
 
-  description 'List and filter comments.'
+    description 'List and filter comments.'
 
-  scope { object.comments.order('comments.created_at DESC') }
+    scope { object.comments.order('comments.created_at DESC') }
 
-  option(:originating_user_id, type: Int, description: 'Limit to comments by a certain user') do |scope, value|
-    scope.where(user_id: value)
-  end
+    option(:originating_user_id, type: Int, description: 'Limit to comments by a certain user') do |scope, value|
+      scope.where(user_id: value)
+    end
 
-  option(:sort_by, type: Types::DateSortType, description: 'Sort order for the comments. Defaults to most recent.') do |scope, value|
-    scope.reorder("comments.#{value.column} #{value.direction}")
-  end
+    option(:sort_by, type: Types::DateSortType, description: 'Sort order for the comments. Defaults to most recent.') do |scope, value|
+      scope.reorder("comments.#{value.column} #{value.direction}")
+    end
 
-  option(:mentioned_user_id, type: Int, description: 'Limit to comments that mention a certain user') do |scope, value|
-    scope.joins(:user_mentions).where(user_mentions: { user_id: value })
-  end
+    option(:mentioned_user_id, type: Int, description: 'Limit to comments that mention a certain user') do |scope, value|
+      scope.joins(:user_mentions).where(user_mentions: { user_id: value })
+    end
 
-  option(:mentioned_role, type: Types::Entities::UserRoleType, description: 'Limit to comments that mention a certain user role') do |scope, value|
-    scope.joins(:role_mentions).where(role_mentions: { role: User.roles[value] })
-  end
+    option(:mentioned_role, type: Types::Entities::UserRoleType, description: 'Limit to comments that mention a certain user role') do |scope, value|
+      scope.joins(:role_mentions).where(role_mentions: { role: User.roles[value] })
+    end
 
-  option(:mentioned_entity, type: Types::Commentable::TaggableEntityInputType, description: 'Limit to comments that mention a certain entity') do |scope, value|
-    scope.joins(:entity_mentions).where(entity_mentions: { entity: value })
+    option(:mentioned_entity, type: Types::Commentable::TaggableEntityInputType, description: 'Limit to comments that mention a certain entity') do |scope, value|
+      scope.joins(:entity_mentions).where(entity_mentions: { entity: value })
+    end
   end
 end
diff --git a/server/app/graphql/resolvers/top_level_comments.rb b/server/app/graphql/resolvers/top_level_comments.rb
index 3a1e07de1..88771a351 100644
--- a/server/app/graphql/resolvers/top_level_comments.rb
+++ b/server/app/graphql/resolvers/top_level_comments.rb
@@ -1,36 +1,38 @@
 require 'search_object'
 require 'search_object/plugin/graphql'
 
-class Resolvers::TopLevelComments < GraphQL::Schema::Resolver
-  include SearchObject.module(:graphql)
+module Resolvers
+  class TopLevelComments < GraphQL::Schema::Resolver
+    include SearchObject.module(:graphql)
 
-  type Types::Entities::CommentType.connection_type, null: false
+    type Types::Entities::CommentType.connection_type, null: false
 
-  description 'List and filter comments.'
+    description 'List and filter comments.'
 
-  scope { Comment.order('comments.created_at DESC') }
+    scope { Comment.order('comments.created_at DESC') }
 
-  option(:originating_user_id, type: Int, description: 'Limit to comments by a certain user') do |scope, value|
-    scope.where(user_id: value)
-  end
+    option(:originating_user_id, type: Int, description: 'Limit to comments by a certain user') do |scope, value|
+      scope.where(user_id: value)
+    end
 
-  option(:sort_by, type: Types::DateSortType, description: 'Sort order for the comments. Defaults to most recent.') do |scope, value|
-    scope.reorder("comments.#{value.column} #{value.direction}")
-  end
+    option(:sort_by, type: Types::DateSortType, description: 'Sort order for the comments. Defaults to most recent.') do |scope, value|
+      scope.reorder("comments.#{value.column} #{value.direction}")
+    end
 
-  option(:subject, type: Types::Commentable::CommentableInput, description: 'Limit to comments on a certain subject.') do |scope, value|
-    scope.where(commentable: value)
-  end
+    option(:subject, type: Types::Commentable::CommentableInput, description: 'Limit to comments on a certain subject.') do |scope, value|
+      scope.where(commentable: value)
+    end
 
-  option(:mentioned_user_id, type: Int, description: 'Limit to comments that mention a certain user') do |scope, value|
-    scope.joins(:user_mentions).where(user_mentions: { user_id: value })
-  end
+    option(:mentioned_user_id, type: Int, description: 'Limit to comments that mention a certain user') do |scope, value|
+      scope.joins(:user_mentions).where(user_mentions: { user_id: value })
+    end
 
-  option(:mentioned_role, type: Types::Entities::UserRoleType, description: 'Limit to comments that mention a certain user role') do |scope, value|
-    scope.joins(:role_mentions).where(role_mentions: { role: User.roles[value] })
-  end
+    option(:mentioned_role, type: Types::Entities::UserRoleType, description: 'Limit to comments that mention a certain user role') do |scope, value|
+      scope.joins(:role_mentions).where(role_mentions: { role: User.roles[value] })
+    end
 
-  option(:mentioned_entity, type: Types::Commentable::TaggableEntityInputType, description: 'Limit to comments that mention a certain entity') do |scope, value|
-    scope.joins(:entity_mentions).where(entity_mentions: { entity: value })
+    option(:mentioned_entity, type: Types::Commentable::TaggableEntityInputType, description: 'Limit to comments that mention a certain entity') do |scope, value|
+      scope.joins(:entity_mentions).where(entity_mentions: { entity: value })
+    end
   end
 end
diff --git a/server/app/graphql/types/entities/variant_type.rb b/server/app/graphql/types/entities/variant_type.rb
index bc486ee37..0f68cf2c9 100644
--- a/server/app/graphql/types/entities/variant_type.rb
+++ b/server/app/graphql/types/entities/variant_type.rb
@@ -1,5 +1,11 @@
 module Types::Entities
   class VariantType < Types::BaseObject
     implements Types::Interfaces::VariantInterface
+    implements Types::Interfaces::Commentable
+    implements Types::Interfaces::Flaggable
+    implements Types::Interfaces::WithRevisions
+    implements Types::Interfaces::EventSubject
+    implements Types::Interfaces::EventOriginObject
+    implements Types::Interfaces::MolecularProfileComponent
   end
 end
diff --git a/server/app/graphql/types/interfaces/commentable.rb b/server/app/graphql/types/interfaces/commentable.rb
index e23c4d63b..3c498d4d8 100644
--- a/server/app/graphql/types/interfaces/commentable.rb
+++ b/server/app/graphql/types/interfaces/commentable.rb
@@ -23,8 +23,10 @@ def resolve_type(object, context)
           Types::Revisions::RevisionType
         when Source
           Types::Entities::SourceType
-        when Variant
-          Types::Interfaces::VariantInterface
+        when Variants::GeneVariant
+          Types::Variants::GeneVariantType
+        when Variants::FactorVariant
+          Types::Variants::FactorVariantType
         when VariantGroup
           Types::Entities::VariantGroupType
         when Source
diff --git a/server/app/graphql/types/interfaces/event_origin_object.rb b/server/app/graphql/types/interfaces/event_origin_object.rb
index 2b181fb72..692f4ddf2 100644
--- a/server/app/graphql/types/interfaces/event_origin_object.rb
+++ b/server/app/graphql/types/interfaces/event_origin_object.rb
@@ -36,8 +36,10 @@ def resolve_type(object, context)
           Types::Entities::EvidenceItemType
         when SourceSuggestion
           Types::Entities::SourceSuggestionType
-        when Variant
-          Types::Interfaces::VariantInterface
+        when Variants::GeneVariant
+          Types::Variants::GeneVariantType
+        when Variants::FactorVariant
+          Types::Variants::FactorVariantType
         when MolecularProfile
           Types::Entities::MolecularProfileType
         when Feature
diff --git a/server/app/graphql/types/interfaces/event_subject.rb b/server/app/graphql/types/interfaces/event_subject.rb
index 13d41d9c8..0d5d10fb8 100644
--- a/server/app/graphql/types/interfaces/event_subject.rb
+++ b/server/app/graphql/types/interfaces/event_subject.rb
@@ -15,8 +15,10 @@ def resolve_type(object, context)
         case object
         when Feature
           Types::Entities::FeatureType
-        when Variant
-          Types::Interfaces::VariantInterface
+        when Variants::GeneVariant
+          Types::Variants::GeneVariantType
+        when Variants::FactorVariant
+          Types::Variants::FactorVariantType
         when EvidenceItem
           Types::Entities::EvidenceItemType
         when Assertion
diff --git a/server/app/graphql/types/interfaces/flaggable.rb b/server/app/graphql/types/interfaces/flaggable.rb
index b37585502..6eaa79392 100644
--- a/server/app/graphql/types/interfaces/flaggable.rb
+++ b/server/app/graphql/types/interfaces/flaggable.rb
@@ -16,8 +16,10 @@ def resolve_type(object, context)
         case object
         when Feature
           Types::Entities::FeatureType
-        when Variant
-          Types::Interfaces::VariantInterface
+        when Variants::GeneVariant
+          Types::Variants::GeneVariantType
+        when Variants::FactorVariant
+          Types::Variants::FactorVariantType
         when EvidenceItem
           Types::Entities::EvidenceItemType
         when Assertion
diff --git a/server/app/graphql/types/interfaces/molecular_profile_component.rb b/server/app/graphql/types/interfaces/molecular_profile_component.rb
index 64701e599..db42f6490 100644
--- a/server/app/graphql/types/interfaces/molecular_profile_component.rb
+++ b/server/app/graphql/types/interfaces/molecular_profile_component.rb
@@ -18,6 +18,12 @@ def name
       end
     end
 
+    #orphan_types(
+      #Types::Variants::GeneVariantType,
+      #Types::Variants::FactorVariantType,
+      #Types::Interfaces::VariantInterface
+    #)
+
     definition_methods do
       def resolve_type(object, context)
         case object
diff --git a/server/app/graphql/types/interfaces/variant_interface.rb b/server/app/graphql/types/interfaces/variant_interface.rb
index f2c7819cc..678d04bef 100644
--- a/server/app/graphql/types/interfaces/variant_interface.rb
+++ b/server/app/graphql/types/interfaces/variant_interface.rb
@@ -54,10 +54,10 @@ def variant_aliases
       end
     end
 
-    orphan_types(
-      Types::Variants::FactorVariantType,
-      Types::Variants::GeneVariantType,
-    )
+    #orphan_types(
+      #Types::Variants::FactorVariantType,
+      #Types::Variants::GeneVariantType,
+    #)
 
     definition_methods do
       def resolve_type(object, context)
diff --git a/server/app/graphql/types/mutation_type.rb b/server/app/graphql/types/mutation_type.rb
index 93cd123ab..47558bb10 100644
--- a/server/app/graphql/types/mutation_type.rb
+++ b/server/app/graphql/types/mutation_type.rb
@@ -7,6 +7,7 @@ class MutationType < Types::BaseObject
     field :suggest_gene_revision, mutation: Mutations::SuggestGeneRevision
     field :suggest_factor_revision, mutation: Mutations::SuggestFactorRevision
     field :suggest_gene_variant_revision, mutation: Mutations::SuggestGeneVariantRevision
+    field :suggest_factor_variant_revision, mutation: Mutations::SuggestFactorVariantRevision
     field :suggest_molecular_profile_revision, mutation: Mutations::SuggestMolecularProfileRevision
     field :suggest_evidence_item_revision, mutation: Mutations::SuggestEvidenceItemRevision
     field :suggest_assertion_revision, mutation: Mutations::SuggestAssertionRevision
diff --git a/server/app/graphql/types/query_type.rb b/server/app/graphql/types/query_type.rb
index 9a821e760..2f39ac56d 100644
--- a/server/app/graphql/types/query_type.rb
+++ b/server/app/graphql/types/query_type.rb
@@ -21,6 +21,7 @@ class QueryType < Types::BaseObject
     field :browseDiseases, resolver: Resolvers::BrowseDiseases
     field :browseMolecularProfiles, resolver: Resolvers::BrowseMolecularProfiles
     field :events, resolver: Resolvers::TopLevelEvents
+    field :comments, resolver: Resolvers::TopLevelComments
     field :phenotypes, resolver: Resolvers::Phenotypes
     field :source_suggestions, resolver: Resolvers::BrowseSourceSuggestions
     field :notifications, resolver: Resolvers::Notifications do
@@ -160,7 +161,6 @@ def authorized?(object, args, context)
       argument :permalink_id, String, required: true
     end
 
-    field :comments, resolver: Resolvers::TopLevelComments
     field :preview_comment_text, [Types::Commentable::CommentBodySegment], null: false do
       argument :comment_text, String, required: true
     end
diff --git a/server/app/graphql/types/revisions/factor_variant_fields.rb b/server/app/graphql/types/revisions/factor_variant_fields.rb
new file mode 100644
index 000000000..a8d8afdb3
--- /dev/null
+++ b/server/app/graphql/types/revisions/factor_variant_fields.rb
@@ -0,0 +1,16 @@
+module Types::Revisions
+  class FactorVariantFields < Types::BaseInputObject
+    description 'Fields on a FactorVariant that curators may propose revisions to.'
+    argument :name, String, required: true,
+      description: "The Variant's name."
+    argument :aliases, [String], required: true,
+      description: 'List of aliases or alternate names for the Variant.'
+    argument :variant_type_ids, [Int], required: true,
+      description: 'List of IDs for the variant types for this Variant'
+    argument :feature_id, Int, required: true,
+      description: 'The ID of the Feature this Variant corresponds to.'
+    argument :ncit_id, Types::NullableValueInputType.for(GraphQL::Types::String), required: true,
+      description: "NCI Thesaurus concept ID for this Factor"
+  end
+end
+
diff --git a/server/app/graphql/types/variants/factor_variant_type.rb b/server/app/graphql/types/variants/factor_variant_type.rb
index 7d2e1bf0f..77d3dcec4 100644
--- a/server/app/graphql/types/variants/factor_variant_type.rb
+++ b/server/app/graphql/types/variants/factor_variant_type.rb
@@ -1,7 +1,11 @@
 module Types::Variants
-  class FactorVariantType < Types::BaseObject
-    implements Types::Interfaces::VariantInterface
+  class FactorVariantType < Types::Entities::VariantType
 
     field :ncit_id, String, null: true
+    field :ncit_details, Types::Entities::NcitDetailsType, null: true
+
+    def ncit_details
+      NcitDetails.new(object).response
+    end
   end
 end
diff --git a/server/app/graphql/types/variants/gene_variant_type.rb b/server/app/graphql/types/variants/gene_variant_type.rb
index 3f65cf7e4..ebe1645cc 100644
--- a/server/app/graphql/types/variants/gene_variant_type.rb
+++ b/server/app/graphql/types/variants/gene_variant_type.rb
@@ -1,6 +1,5 @@
 module Types::Variants
-  class GeneVariantType < Types::BaseObject
-    implements Types::Interfaces::VariantInterface
+  class GeneVariantType < Types::Entities::VariantType
 
     field :reference_build, Types::ReferenceBuildType, null: true
     field :ensembl_version, Int, null: true
diff --git a/server/app/models/input_adaptors/factor_variant_input_adaptor.rb b/server/app/models/input_adaptors/factor_variant_input_adaptor.rb
new file mode 100644
index 000000000..dabd69c44
--- /dev/null
+++ b/server/app/models/input_adaptors/factor_variant_input_adaptor.rb
@@ -0,0 +1,25 @@
+#Conversion from a GraphQL FactorVariantFields input object to FactorVariant model type
+class InputAdaptors::FactorVariantInputAdaptor
+  attr_reader :input
+
+  def initialize(variant_input_object: )
+    @input = variant_input_object
+  end
+
+  def perform
+    Variant.new(
+      feature_id: input.feature_id,
+      name: input.name,
+      variant_type_ids: input.variant_type_ids,
+      variant_alias_ids: get_alias_ids(),
+      ncit_id: input.ncit_id
+    )
+  end
+
+  private
+  def get_alias_ids
+    input.aliases.map do |a|
+      VariantAlias.get_or_create_by_name(a).id
+    end
+  end
+end
diff --git a/server/app/models/input_adaptors/variant_input_adaptor.rb b/server/app/models/input_adaptors/gene_variant_input_adaptor.rb
similarity index 97%
rename from server/app/models/input_adaptors/variant_input_adaptor.rb
rename to server/app/models/input_adaptors/gene_variant_input_adaptor.rb
index 2fbe47bc1..0ce1d9fb5 100644
--- a/server/app/models/input_adaptors/variant_input_adaptor.rb
+++ b/server/app/models/input_adaptors/gene_variant_input_adaptor.rb
@@ -1,5 +1,5 @@
 #Conversion from a GraphQL VariantFields input object to Variant model type
-class InputAdaptors::VariantInputAdaptor
+class InputAdaptors::GeneVariantInputAdaptor
   attr_reader :input
 
   def initialize(variant_input_object: )
diff --git a/server/app/models/variant.rb b/server/app/models/variant.rb
index 02d929353..4d7e36242 100644
--- a/server/app/models/variant.rb
+++ b/server/app/models/variant.rb
@@ -133,7 +133,7 @@ def unique_name_in_context
 
   def feature_type_matches_variant_type
     unless self.is_a?(feature.compatible_variant_type)
-      errors.add(:feature_id, "#{type} is not compatible with #{feature_instance.feature_instance_type.demodulize} Features")
+      errors.add(:feature_id, "#{type} is not compatible with #{feature.feature_instance_type.demodulize} Features")
     end
   end
 
diff --git a/server/app/models/variants/factor_variant.rb b/server/app/models/variants/factor_variant.rb
index c13e28755..6ad7761f8 100644
--- a/server/app/models/variants/factor_variant.rb
+++ b/server/app/models/variants/factor_variant.rb
@@ -4,7 +4,8 @@ def editable_fields
       [
         :feature_id,
         :name,
-        :ncit_id
+        :ncit_id,
+        :variant_type_ids,
       ]
     end
 

From 66fec60fc1b72ec06b40652a73554b46444cd867 Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Fri, 22 Mar 2024 10:45:54 -0500
Subject: [PATCH 104/125] allow filtering by variant category in browse views

---
 .../variants-table.component.html             | 30 ++++++
 .../variants-table.component.ts               | 21 ++--
 .../variants-table/variants-table.module.ts   |  4 +
 .../variants-table/variants-table.query.gql   |  3 +
 .../src/app/generated/civic.apollo-helpers.ts |  3 +-
 client/src/app/generated/civic.apollo.ts      | 19 +++-
 client/src/app/generated/server.model.graphql |  8 ++
 client/src/app/generated/server.schema.json   | 63 ++++++++++++
 .../src/app/graphql/graphql.type-policies.ts  |  1 +
 .../app/graphql/resolvers/browse_variants.rb  |  8 ++
 .../graphql/resolvers/top_level_variants.rb   |  8 ++
 .../browse_tables/browse_variant_type.rb      |  1 +
 .../app/graphql/types/variant_categories.rb   |  6 ++
 ...variant_browse_table_rows_to_version_15.rb |  8 ++
 server/db/schema.rb                           | 99 ++++++++++---------
 .../views/variant_browse_table_rows_v15.sql   | 47 +++++++++
 16 files changed, 269 insertions(+), 60 deletions(-)
 create mode 100644 server/app/graphql/types/variant_categories.rb
 create mode 100644 server/db/migrate/20240322145804_update_variant_browse_table_rows_to_version_15.rb
 create mode 100644 server/db/views/variant_browse_table_rows_v15.sql

diff --git a/client/src/app/components/variants/variants-table/variants-table.component.html b/client/src/app/components/variants/variants-table/variants-table.component.html
index 52b1f9131..9749c4eb6 100644
--- a/client/src/app/components/variants/variants-table/variants-table.component.html
+++ b/client/src/app/components/variants/variants-table/variants-table.component.html
@@ -53,6 +53,11 @@
           [nzSortFn]="true">
           Variant
         </th>
+        <th
+          nzLeft
+          nzWidth="70px">
+          Category
+        </th>
         <th
           nzWidth="100px"
           [nzColumnKey]="sortColumns.FeatureName"
@@ -78,6 +83,24 @@
               filterChange$.next()
             "></cvc-clearable-input-filter>
         </th>
+        <th nzLeft>
+          <nz-select
+            nzAllowClear
+            nzSize="small"
+            [nzDropdownMatchSelectWidth]="false"
+            nzPlaceHolder="All"
+            (ngModelChange)="filterChange$.next()"
+            [(ngModel)]="variantCategoryInput">
+            <nz-option
+              [nzValue]="variantCategories.Gene"
+              nzLabel="Gene">
+            </nz-option>
+            <nz-option
+              [nzValue]="variantCategories.Factor"
+              nzLabel="Factor">
+            </nz-option>
+          </nz-select>
+        </th>
         <th>
           <cvc-clearable-input-filter
             [(inputModel)]="featureNameInput"
@@ -125,6 +148,13 @@
               [variant]="variant"
               [truncateLongName]="true"></cvc-variant-tag>
           </td>
+          <td nzLeft>
+            <span
+              nz-typography
+              nzType="secondary">
+              {{ variant.category }}
+            </span>
+          </td>
           <td>
             <cvc-feature-tag
               [feature]="{
diff --git a/client/src/app/components/variants/variants-table/variants-table.component.ts b/client/src/app/components/variants/variants-table/variants-table.component.ts
index c595bd4d5..819f1c1ea 100644
--- a/client/src/app/components/variants/variants-table/variants-table.component.ts
+++ b/client/src/app/components/variants/variants-table/variants-table.component.ts
@@ -21,6 +21,7 @@ import {
   Maybe,
   PageInfo,
   VariantsSortColumns,
+  VariantCategories,
 } from '@app/generated/civic.apollo'
 import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy'
 import { QueryRef } from 'apollo-angular'
@@ -32,7 +33,6 @@ import {
   filter,
   map,
   skip,
-  take,
   takeWhile,
   withLatestFrom,
 } from 'rxjs/operators'
@@ -95,8 +95,11 @@ export class CvcVariantsTableComponent implements OnInit {
   therapyNameInput: Maybe<string>
   variantAliasInput: Maybe<string>
   variantTypeNameInput: Maybe<string>
+  variantCategoryInput: Maybe<VariantCategories>
   hasNoVariantTypeInput: boolean = false
 
+  variantCategories = VariantCategories
+
   private initialQueryArgs?: BrowseVariantsQueryVariables
 
   sortColumns = VariantsSortColumns
@@ -115,6 +118,7 @@ export class CvcVariantsTableComponent implements OnInit {
       variantTypeId: this.variantTypeId,
       variantGroupId: this.variantGroupId,
       hasNoVariantType: this.hasNoVariantTypeInput,
+      variantCategory: this.variantCategoryInput,
     }
 
     this.queryRef = this.gql.watch(this.initialQueryArgs)
@@ -210,8 +214,11 @@ export class CvcVariantsTableComponent implements OnInit {
           ? this.variantAliasInput
           : undefined,
         featureName: this.featureNameInput,
-        variantTypeName: this.variantTypeNameInput ? this.variantTypeNameInput : undefined,
-        hasNoVariantType: this.hasNoVariantTypeInput
+        variantTypeName: this.variantTypeNameInput
+          ? this.variantTypeNameInput
+          : undefined,
+        hasNoVariantType: this.hasNoVariantTypeInput,
+        variantCategory: this.variantCategoryInput,
       })
       .then(() => this.scrollIndex$.next(0))
 
@@ -219,13 +226,15 @@ export class CvcVariantsTableComponent implements OnInit {
   }
 
   // virtual scroll helpers
-  trackByIndex(_: number, data: Maybe<BrowseVariantsFieldsFragment>): Maybe<number> {
-    return data?.id;
+  trackByIndex(
+    _: number,
+    data: Maybe<BrowseVariantsFieldsFragment>
+  ): Maybe<number> {
+    return data?.id
   }
 
   onHasNoVariantTypeInputChange(value: boolean[]) {
     this.hasNoVariantTypeInput = value[0]
     this.filterChange$.next()
   }
-
 }
diff --git a/client/src/app/components/variants/variants-table/variants-table.module.ts b/client/src/app/components/variants/variants-table/variants-table.module.ts
index 5b010beac..672a1f116 100644
--- a/client/src/app/components/variants/variants-table/variants-table.module.ts
+++ b/client/src/app/components/variants/variants-table/variants-table.module.ts
@@ -20,6 +20,8 @@ import { NzToolTipModule } from 'ng-zorro-antd/tooltip'
 import { NzTypographyModule } from 'ng-zorro-antd/typography'
 import { CvcVariantTagModule } from '../variant-tag/variant-tag.module'
 import { CvcVariantsTableComponent } from './variants-table.component'
+import { NzSelectModule } from 'ng-zorro-antd/select'
+import { FormsModule } from '@angular/forms'
 
 @NgModule({
   declarations: [CvcVariantsTableComponent],
@@ -27,6 +29,7 @@ import { CvcVariantsTableComponent } from './variants-table.component'
     CommonModule,
     LetDirective,
     PushPipe,
+    FormsModule,
 
     NzButtonModule,
     NzCardModule,
@@ -35,6 +38,7 @@ import { CvcVariantsTableComponent } from './variants-table.component'
     NzTagModule,
     NzToolTipModule,
     NzTypographyModule,
+    NzSelectModule,
 
     CvcAutoHeightCardModule,
     CvcAutoHeightTableModule,
diff --git a/client/src/app/components/variants/variants-table/variants-table.query.gql b/client/src/app/components/variants/variants-table/variants-table.query.gql
index 8917d8cd5..8ee06a060 100644
--- a/client/src/app/components/variants/variants-table/variants-table.query.gql
+++ b/client/src/app/components/variants/variants-table/variants-table.query.gql
@@ -8,6 +8,7 @@ query BrowseVariants(
   $variantGroupId: Int
   $variantTypeName: String
   $hasNoVariantType: Boolean
+  $variantCategory: VariantCategories
   $sortBy: VariantsSort
   $first: Int
   $last: Int
@@ -24,6 +25,7 @@ query BrowseVariants(
     variantGroupId: $variantGroupId
     variantTypeName: $variantTypeName
     hasNoVariantType: $hasNoVariantType
+    category: $variantCategory
     sortBy: $sortBy
     first: $first
     last: $last
@@ -56,6 +58,7 @@ fragment BrowseVariantsFields on BrowseVariant {
   featureId
   featureName
   featureLink
+  category
   diseases {
     id
     name
diff --git a/client/src/app/generated/civic.apollo-helpers.ts b/client/src/app/generated/civic.apollo-helpers.ts
index e809a96fb..457a3aa10 100644
--- a/client/src/app/generated/civic.apollo-helpers.ts
+++ b/client/src/app/generated/civic.apollo-helpers.ts
@@ -338,9 +338,10 @@ export type BrowseTherapyEdgeFieldPolicy = {
 	cursor?: FieldPolicy<any> | FieldReadFunction<any>,
 	node?: FieldPolicy<any> | FieldReadFunction<any>
 };
-export type BrowseVariantKeySpecifier = ('aliases' | 'diseases' | 'featureId' | 'featureLink' | 'featureName' | 'id' | 'link' | 'name' | 'therapies' | 'variantTypes' | BrowseVariantKeySpecifier)[];
+export type BrowseVariantKeySpecifier = ('aliases' | 'category' | 'diseases' | 'featureId' | 'featureLink' | 'featureName' | 'id' | 'link' | 'name' | 'therapies' | 'variantTypes' | BrowseVariantKeySpecifier)[];
 export type BrowseVariantFieldPolicy = {
 	aliases?: FieldPolicy<any> | FieldReadFunction<any>,
+	category?: FieldPolicy<any> | FieldReadFunction<any>,
 	diseases?: FieldPolicy<any> | FieldReadFunction<any>,
 	featureId?: FieldPolicy<any> | FieldReadFunction<any>,
 	featureLink?: FieldPolicy<any> | FieldReadFunction<any>,
diff --git a/client/src/app/generated/civic.apollo.ts b/client/src/app/generated/civic.apollo.ts
index 73f0ef2e2..3554e1a5d 100644
--- a/client/src/app/generated/civic.apollo.ts
+++ b/client/src/app/generated/civic.apollo.ts
@@ -806,6 +806,7 @@ export type BrowseTherapyEdge = {
 export type BrowseVariant = {
   __typename: 'BrowseVariant';
   aliases: Array<VariantAlias>;
+  category: VariantCategories;
   diseases: Array<Disease>;
   featureId: Scalars['Int'];
   featureLink: Scalars['String'];
@@ -4287,6 +4288,7 @@ export type QueryBrowseVariantGroupsArgs = {
 export type QueryBrowseVariantsArgs = {
   after?: InputMaybe<Scalars['String']>;
   before?: InputMaybe<Scalars['String']>;
+  category?: InputMaybe<VariantCategories>;
   diseaseName?: InputMaybe<Scalars['String']>;
   featureName?: InputMaybe<Scalars['String']>;
   first?: InputMaybe<Scalars['Int']>;
@@ -4763,6 +4765,7 @@ export type QueryVariantsArgs = {
   after?: InputMaybe<Scalars['String']>;
   alleleRegistryId?: InputMaybe<Scalars['String']>;
   before?: InputMaybe<Scalars['String']>;
+  category?: InputMaybe<VariantCategories>;
   featureId?: InputMaybe<Scalars['Int']>;
   first?: InputMaybe<Scalars['Int']>;
   hasNoVariantType?: InputMaybe<Scalars['Boolean']>;
@@ -6265,6 +6268,11 @@ export type VariantAlias = {
   name: Scalars['String'];
 };
 
+export enum VariantCategories {
+  Factor = 'FACTOR',
+  Gene = 'GENE'
+}
+
 /** Representation of a Variant's membership in a Molecular Profile. */
 export type VariantComponent = {
   /** When set to true, this means the NOT operator will be applied to the Variant in the Molecluar Profile. */
@@ -7486,6 +7494,7 @@ export type BrowseVariantsQueryVariables = Exact<{
   variantGroupId?: InputMaybe<Scalars['Int']>;
   variantTypeName?: InputMaybe<Scalars['String']>;
   hasNoVariantType?: InputMaybe<Scalars['Boolean']>;
+  variantCategory?: InputMaybe<VariantCategories>;
   sortBy?: InputMaybe<VariantsSort>;
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
@@ -7494,9 +7503,9 @@ export type BrowseVariantsQueryVariables = Exact<{
 }>;
 
 
-export type BrowseVariantsQuery = { __typename: 'Query', browseVariants: { __typename: 'BrowseVariantConnection', totalCount: number, filteredCount: number, pageCount: number, lastUpdated: any, pageInfo: { __typename: 'PageInfo', endCursor?: string | undefined, hasNextPage: boolean, startCursor?: string | undefined, hasPreviousPage: boolean }, edges: Array<{ __typename: 'BrowseVariantEdge', cursor: string, node?: { __typename: 'BrowseVariant', id: number, name: string, link: string, featureId: number, featureName: string, featureLink: string, diseases: Array<{ __typename: 'Disease', id: number, name: string, link: string }>, therapies: Array<{ __typename: 'Therapy', id: number, name: string, link: string }>, aliases: Array<{ __typename: 'VariantAlias', name: string }>, variantTypes: Array<{ __typename: 'LinkableVariantType', id: number, name: string, link: string }> } | undefined }> } };
+export type BrowseVariantsQuery = { __typename: 'Query', browseVariants: { __typename: 'BrowseVariantConnection', totalCount: number, filteredCount: number, pageCount: number, lastUpdated: any, pageInfo: { __typename: 'PageInfo', endCursor?: string | undefined, hasNextPage: boolean, startCursor?: string | undefined, hasPreviousPage: boolean }, edges: Array<{ __typename: 'BrowseVariantEdge', cursor: string, node?: { __typename: 'BrowseVariant', id: number, name: string, link: string, featureId: number, featureName: string, featureLink: string, category: VariantCategories, diseases: Array<{ __typename: 'Disease', id: number, name: string, link: string }>, therapies: Array<{ __typename: 'Therapy', id: number, name: string, link: string }>, aliases: Array<{ __typename: 'VariantAlias', name: string }>, variantTypes: Array<{ __typename: 'LinkableVariantType', id: number, name: string, link: string }> } | undefined }> } };
 
-export type BrowseVariantsFieldsFragment = { __typename: 'BrowseVariant', id: number, name: string, link: string, featureId: number, featureName: string, featureLink: string, diseases: Array<{ __typename: 'Disease', id: number, name: string, link: string }>, therapies: Array<{ __typename: 'Therapy', id: number, name: string, link: string }>, aliases: Array<{ __typename: 'VariantAlias', name: string }>, variantTypes: Array<{ __typename: 'LinkableVariantType', id: number, name: string, link: string }> };
+export type BrowseVariantsFieldsFragment = { __typename: 'BrowseVariant', id: number, name: string, link: string, featureId: number, featureName: string, featureLink: string, category: VariantCategories, diseases: Array<{ __typename: 'Disease', id: number, name: string, link: string }>, therapies: Array<{ __typename: 'Therapy', id: number, name: string, link: string }>, aliases: Array<{ __typename: 'VariantAlias', name: string }>, variantTypes: Array<{ __typename: 'LinkableVariantType', id: number, name: string, link: string }> };
 
 export type ViewerBaseQueryVariables = Exact<{ [key: string]: never; }>;
 
@@ -8147,7 +8156,7 @@ export type VariantManagerQueryVariables = Exact<{
 }>;
 
 
-export type VariantManagerQuery = { __typename: 'Query', browseVariants: { __typename: 'BrowseVariantConnection', totalCount: number, filteredCount: number, pageCount: number, pageInfo: { __typename: 'PageInfo', endCursor?: string | undefined, hasNextPage: boolean, startCursor?: string | undefined, hasPreviousPage: boolean }, edges: Array<{ __typename: 'BrowseVariantEdge', cursor: string, node?: { __typename: 'BrowseVariant', id: number, name: string, link: string, featureId: number, featureName: string, featureLink: string, diseases: Array<{ __typename: 'Disease', id: number, name: string, link: string }>, therapies: Array<{ __typename: 'Therapy', id: number, name: string, link: string }>, aliases: Array<{ __typename: 'VariantAlias', name: string }>, variantTypes: Array<{ __typename: 'LinkableVariantType', id: number, name: string, link: string }> } | undefined }> } };
+export type VariantManagerQuery = { __typename: 'Query', browseVariants: { __typename: 'BrowseVariantConnection', totalCount: number, filteredCount: number, pageCount: number, pageInfo: { __typename: 'PageInfo', endCursor?: string | undefined, hasNextPage: boolean, startCursor?: string | undefined, hasPreviousPage: boolean }, edges: Array<{ __typename: 'BrowseVariantEdge', cursor: string, node?: { __typename: 'BrowseVariant', id: number, name: string, link: string, featureId: number, featureName: string, featureLink: string, category: VariantCategories, diseases: Array<{ __typename: 'Disease', id: number, name: string, link: string }>, therapies: Array<{ __typename: 'Therapy', id: number, name: string, link: string }>, aliases: Array<{ __typename: 'VariantAlias', name: string }>, variantTypes: Array<{ __typename: 'LinkableVariantType', id: number, name: string, link: string }> } | undefined }> } };
 
 export type VariantManagerFieldsFragment = { __typename: 'BrowseVariant', id: number, name: string, link: string, featureId: number, featureName: string, featureLink: string, diseases: Array<{ __typename: 'Disease', id: number, name: string, link: string }>, therapies: Array<{ __typename: 'Therapy', id: number, name: string, link: string }>, aliases: Array<{ __typename: 'VariantAlias', name: string }> };
 
@@ -9745,6 +9754,7 @@ export const BrowseVariantsFieldsFragmentDoc = gql`
   featureId
   featureName
   featureLink
+  category
   diseases {
     id
     name
@@ -13250,7 +13260,7 @@ export const VariantTypesForFeatureDocument = gql`
     }
   }
 export const BrowseVariantsDocument = gql`
-    query BrowseVariants($variantName: String, $featureName: String, $diseaseName: String, $therapyName: String, $variantAlias: String, $variantTypeId: Int, $variantGroupId: Int, $variantTypeName: String, $hasNoVariantType: Boolean, $sortBy: VariantsSort, $first: Int, $last: Int, $before: String, $after: String) {
+    query BrowseVariants($variantName: String, $featureName: String, $diseaseName: String, $therapyName: String, $variantAlias: String, $variantTypeId: Int, $variantGroupId: Int, $variantTypeName: String, $hasNoVariantType: Boolean, $variantCategory: VariantCategories, $sortBy: VariantsSort, $first: Int, $last: Int, $before: String, $after: String) {
   browseVariants(
     variantName: $variantName
     featureName: $featureName
@@ -13261,6 +13271,7 @@ export const BrowseVariantsDocument = gql`
     variantGroupId: $variantGroupId
     variantTypeName: $variantTypeName
     hasNoVariantType: $hasNoVariantType
+    category: $variantCategory
     sortBy: $sortBy
     first: $first
     last: $last
diff --git a/client/src/app/generated/server.model.graphql b/client/src/app/generated/server.model.graphql
index 657e9fa7b..193dbcd93 100644
--- a/client/src/app/generated/server.model.graphql
+++ b/client/src/app/generated/server.model.graphql
@@ -1326,6 +1326,7 @@ type BrowseTherapyEdge {
 
 type BrowseVariant {
   aliases: [VariantAlias!]!
+  category: VariantCategories!
   diseases: [Disease!]!
   featureId: Int!
   featureLink: String!
@@ -6950,6 +6951,7 @@ type Query {
     Returns the elements in the list that come before the specified cursor.
     """
     before: String
+    category: VariantCategories
     diseaseName: String
     featureName: String
 
@@ -8008,6 +8010,7 @@ type Query {
     Returns the elements in the list that come before the specified cursor.
     """
     before: String
+    category: VariantCategories
 
     """
     Feature that the variants are associated with.
@@ -10401,6 +10404,11 @@ type VariantAlias {
   name: String!
 }
 
+enum VariantCategories {
+  FACTOR
+  GENE
+}
+
 """
 Representation of a Variant's membership in a Molecular Profile.
 """
diff --git a/client/src/app/generated/server.schema.json b/client/src/app/generated/server.schema.json
index 3110f3f20..92fcef24b 100644
--- a/client/src/app/generated/server.schema.json
+++ b/client/src/app/generated/server.schema.json
@@ -6282,6 +6282,22 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "category",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "ENUM",
+                  "name": "VariantCategories",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "diseases",
               "description": null,
@@ -32660,6 +32676,18 @@
                   "isDeprecated": false,
                   "deprecationReason": null
                 },
+                {
+                  "name": "category",
+                  "description": null,
+                  "type": {
+                    "kind": "ENUM",
+                    "name": "VariantCategories",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
                 {
                   "name": "sortBy",
                   "description": null,
@@ -36729,6 +36757,18 @@
                   "isDeprecated": false,
                   "deprecationReason": null
                 },
+                {
+                  "name": "category",
+                  "description": null,
+                  "type": {
+                    "kind": "ENUM",
+                    "name": "VariantCategories",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
                 {
                   "name": "after",
                   "description": "Returns the elements in the list that come after the specified cursor.",
@@ -47138,6 +47178,29 @@
           "enumValues": null,
           "possibleTypes": null
         },
+        {
+          "kind": "ENUM",
+          "name": "VariantCategories",
+          "description": null,
+          "fields": null,
+          "inputFields": null,
+          "interfaces": null,
+          "enumValues": [
+            {
+              "name": "GENE",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "FACTOR",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "possibleTypes": null
+        },
         {
           "kind": "INPUT_OBJECT",
           "name": "VariantComponent",
diff --git a/client/src/app/graphql/graphql.type-policies.ts b/client/src/app/graphql/graphql.type-policies.ts
index dcee47563..8a5572f00 100644
--- a/client/src/app/graphql/graphql.type-policies.ts
+++ b/client/src/app/graphql/graphql.type-policies.ts
@@ -28,6 +28,7 @@ export const CvcTypePolicies: TypePolicies = {
         'therapayName',
         'variantTypeId',
         'variantGroupId',
+        'variantCategory',
       ]),
       browseMolecularProfiles: relayStylePagination([
         'variantName',
diff --git a/server/app/graphql/resolvers/browse_variants.rb b/server/app/graphql/resolvers/browse_variants.rb
index 8af6281ec..08c4f481c 100644
--- a/server/app/graphql/resolvers/browse_variants.rb
+++ b/server/app/graphql/resolvers/browse_variants.rb
@@ -27,6 +27,14 @@ class Resolvers::BrowseVariants < GraphQL::Schema::Resolver
     end
   end
 
+  option(:category, type: Types::VariantCategories) do |scope, value|
+    if value
+      scope.where(category: value)
+    else
+      scope
+    end
+  end
+
   option :sort_by, type: Types::BrowseTables::VariantsSortType do |scope, value|
     case value.column
     when "variantName"
diff --git a/server/app/graphql/resolvers/top_level_variants.rb b/server/app/graphql/resolvers/top_level_variants.rb
index d89d08ee1..d0cba86f9 100644
--- a/server/app/graphql/resolvers/top_level_variants.rb
+++ b/server/app/graphql/resolvers/top_level_variants.rb
@@ -48,4 +48,12 @@ class Resolvers::TopLevelVariants < GraphQL::Schema::Resolver
       scope.reorder("variants.stop #{value.direction} NULLS LAST")
     end
   end
+
+  option(:category, type: Types::VariantCategories) do |scope, value|
+    if value
+      scope.where(category: value)
+    else
+      scope
+    end
+  end
 end
diff --git a/server/app/graphql/types/browse_tables/browse_variant_type.rb b/server/app/graphql/types/browse_tables/browse_variant_type.rb
index 10bba3650..a1903313d 100644
--- a/server/app/graphql/types/browse_tables/browse_variant_type.rb
+++ b/server/app/graphql/types/browse_tables/browse_variant_type.rb
@@ -18,6 +18,7 @@ class BrowseVariantType < Types::BaseObject
     field :therapies, [Types::Entities::TherapyType], null: false
     field :aliases, [Types::Entities::VariantAliasType], null: false
     field :variant_types, [Types::BrowseTables::LinkableVariantTypeType], null: false
+    field :category, Types::VariantCategories, null: false
 
     def link
       Rails.application.routes.url_helpers.url_for("/variants/#{object.id}")
diff --git a/server/app/graphql/types/variant_categories.rb b/server/app/graphql/types/variant_categories.rb
new file mode 100644
index 000000000..d0da9378f
--- /dev/null
+++ b/server/app/graphql/types/variant_categories.rb
@@ -0,0 +1,6 @@
+module Types
+  class VariantCategories < Types::BaseEnum
+    value 'GENE', value: 'Variants::GeneVariant'
+    value 'FACTOR', value: 'Variants::FactorVariant'
+  end
+end
diff --git a/server/db/migrate/20240322145804_update_variant_browse_table_rows_to_version_15.rb b/server/db/migrate/20240322145804_update_variant_browse_table_rows_to_version_15.rb
new file mode 100644
index 000000000..d7fa8a881
--- /dev/null
+++ b/server/db/migrate/20240322145804_update_variant_browse_table_rows_to_version_15.rb
@@ -0,0 +1,8 @@
+class UpdateVariantBrowseTableRowsToVersion15 < ActiveRecord::Migration[7.1]
+  def change
+    update_view :variant_browse_table_rows,
+      version: 15,
+      revert_to_version: 14,
+      materialized: true
+  end
+end
diff --git a/server/db/schema.rb b/server/db/schema.rb
index d0a1b1dab..e5131831a 100644
--- a/server/db/schema.rb
+++ b/server/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.1].define(version: 2024_03_14_185837) do
+ActiveRecord::Schema[7.1].define(version: 2024_03_22_145804) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -1187,54 +1187,6 @@
   SQL
   add_index "disease_browse_table_rows", ["id"], name: "index_disease_browse_table_rows_on_id", unique: true
 
-  create_view "variant_browse_table_rows", materialized: true, sql_definition: <<-SQL
-      SELECT outer_variants.id,
-      outer_variants.name,
-      features.id AS feature_id,
-      features.name AS feature_name,
-      array_agg(DISTINCT variant_aliases.name ORDER BY variant_aliases.name) AS alias_names,
-      array_agg(DISTINCT variant_types.id) AS variant_type_ids,
-      json_agg(DISTINCT jsonb_build_object('name', variant_types.display_name, 'id', variant_types.id)) FILTER (WHERE (variant_types.* IS NOT NULL)) AS variant_types,
-      count(DISTINCT variant_types.id) AS variant_type_count,
-      count(DISTINCT evidence_items.id) FILTER (WHERE (evidence_items.id IS NOT NULL)) AS evidence_item_count,
-      json_agg(DISTINCT jsonb_build_object('name', diseases.name, 'id', diseases.id, 'total', disease_count.total)) FILTER (WHERE (diseases.name IS NOT NULL)) AS diseases,
-      json_agg(DISTINCT jsonb_build_object('name', therapies.name, 'id', therapies.id, 'total', therapy_count.total)) FILTER (WHERE (therapies.name IS NOT NULL)) AS therapies,
-      count(DISTINCT assertions.id) AS assertion_count
-     FROM ((((((((((((((variants outer_variants
-       LEFT JOIN variant_aliases_variants ON ((variant_aliases_variants.variant_id = outer_variants.id)))
-       LEFT JOIN variant_aliases ON ((variant_aliases.id = variant_aliases_variants.variant_alias_id)))
-       JOIN molecular_profiles_variants ON ((molecular_profiles_variants.variant_id = outer_variants.id)))
-       JOIN molecular_profiles ON ((molecular_profiles.id = molecular_profiles_variants.molecular_profile_id)))
-       LEFT JOIN evidence_items ON ((evidence_items.molecular_profile_id = molecular_profiles.id)))
-       JOIN features ON ((features.id = outer_variants.feature_id)))
-       LEFT JOIN diseases ON ((diseases.id = evidence_items.disease_id)))
-       LEFT JOIN evidence_items_therapies ON ((evidence_items_therapies.evidence_item_id = evidence_items.id)))
-       LEFT JOIN therapies ON ((therapies.id = evidence_items_therapies.therapy_id)))
-       LEFT JOIN assertions ON ((assertions.molecular_profile_id = molecular_profiles.id)))
-       LEFT JOIN variant_types_variants ON ((variant_types_variants.variant_id = outer_variants.id)))
-       LEFT JOIN variant_types ON ((variant_types_variants.variant_type_id = variant_types.id)))
-       LEFT JOIN LATERAL ( SELECT therapies_1.id AS therapy_id,
-              count(DISTINCT evidence_items_1.id) FILTER (WHERE (evidence_items_1.id IS NOT NULL)) AS total
-             FROM ((((evidence_items evidence_items_1
-               JOIN evidence_items_therapies evidence_items_therapies_1 ON ((evidence_items_therapies_1.evidence_item_id = evidence_items_1.id)))
-               JOIN therapies therapies_1 ON ((therapies_1.id = evidence_items_therapies_1.therapy_id)))
-               JOIN molecular_profiles molecular_profiles_1 ON ((molecular_profiles_1.id = evidence_items_1.molecular_profile_id)))
-               JOIN molecular_profiles_variants molecular_profiles_variants_1 ON ((molecular_profiles_variants_1.molecular_profile_id = molecular_profiles_1.id)))
-            WHERE (molecular_profiles_variants_1.variant_id = outer_variants.id)
-            GROUP BY therapies_1.id) therapy_count ON ((therapies.id = therapy_count.therapy_id)))
-       LEFT JOIN LATERAL ( SELECT diseases_1.id AS disease_id,
-              count(DISTINCT evidence_items_1.id) FILTER (WHERE (evidence_items_1.id IS NOT NULL)) AS total
-             FROM (((evidence_items evidence_items_1
-               JOIN diseases diseases_1 ON ((diseases_1.id = evidence_items_1.disease_id)))
-               JOIN molecular_profiles molecular_profiles_1 ON ((molecular_profiles_1.id = evidence_items_1.molecular_profile_id)))
-               JOIN molecular_profiles_variants molecular_profiles_variants_1 ON ((molecular_profiles_variants_1.molecular_profile_id = molecular_profiles_1.id)))
-            WHERE (molecular_profiles_variants_1.variant_id = outer_variants.id)
-            GROUP BY diseases_1.id) disease_count ON ((diseases.id = disease_count.disease_id)))
-    WHERE ((((evidence_items.status)::text <> 'rejected'::text) OR (evidence_items.status IS NULL)) AND (outer_variants.deprecated = false))
-    GROUP BY outer_variants.id, outer_variants.name, features.id, features.name;
-  SQL
-  add_index "variant_browse_table_rows", ["id"], name: "index_variant_browse_table_rows_on_id", unique: true
-
   create_view "molecular_profile_browse_table_rows", materialized: true, sql_definition: <<-SQL
       SELECT outer_mps.id,
       outer_mps.name,
@@ -1343,4 +1295,53 @@
   SQL
   add_index "variant_group_browse_table_rows", ["id"], name: "index_variant_group_browse_table_rows_on_id", unique: true
 
+  create_view "variant_browse_table_rows", materialized: true, sql_definition: <<-SQL
+      SELECT outer_variants.id,
+      outer_variants.name,
+      outer_variants.type AS category,
+      features.id AS feature_id,
+      features.name AS feature_name,
+      array_agg(DISTINCT variant_aliases.name ORDER BY variant_aliases.name) AS alias_names,
+      array_agg(DISTINCT variant_types.id) AS variant_type_ids,
+      json_agg(DISTINCT jsonb_build_object('name', variant_types.display_name, 'id', variant_types.id)) FILTER (WHERE (variant_types.* IS NOT NULL)) AS variant_types,
+      count(DISTINCT variant_types.id) AS variant_type_count,
+      count(DISTINCT evidence_items.id) FILTER (WHERE (evidence_items.id IS NOT NULL)) AS evidence_item_count,
+      json_agg(DISTINCT jsonb_build_object('name', diseases.name, 'id', diseases.id, 'total', disease_count.total)) FILTER (WHERE (diseases.name IS NOT NULL)) AS diseases,
+      json_agg(DISTINCT jsonb_build_object('name', therapies.name, 'id', therapies.id, 'total', therapy_count.total)) FILTER (WHERE (therapies.name IS NOT NULL)) AS therapies,
+      count(DISTINCT assertions.id) AS assertion_count
+     FROM ((((((((((((((variants outer_variants
+       LEFT JOIN variant_aliases_variants ON ((variant_aliases_variants.variant_id = outer_variants.id)))
+       LEFT JOIN variant_aliases ON ((variant_aliases.id = variant_aliases_variants.variant_alias_id)))
+       JOIN molecular_profiles_variants ON ((molecular_profiles_variants.variant_id = outer_variants.id)))
+       JOIN molecular_profiles ON ((molecular_profiles.id = molecular_profiles_variants.molecular_profile_id)))
+       LEFT JOIN evidence_items ON ((evidence_items.molecular_profile_id = molecular_profiles.id)))
+       JOIN features ON ((features.id = outer_variants.feature_id)))
+       LEFT JOIN diseases ON ((diseases.id = evidence_items.disease_id)))
+       LEFT JOIN evidence_items_therapies ON ((evidence_items_therapies.evidence_item_id = evidence_items.id)))
+       LEFT JOIN therapies ON ((therapies.id = evidence_items_therapies.therapy_id)))
+       LEFT JOIN assertions ON ((assertions.molecular_profile_id = molecular_profiles.id)))
+       LEFT JOIN variant_types_variants ON ((variant_types_variants.variant_id = outer_variants.id)))
+       LEFT JOIN variant_types ON ((variant_types_variants.variant_type_id = variant_types.id)))
+       LEFT JOIN LATERAL ( SELECT therapies_1.id AS therapy_id,
+              count(DISTINCT evidence_items_1.id) FILTER (WHERE (evidence_items_1.id IS NOT NULL)) AS total
+             FROM ((((evidence_items evidence_items_1
+               JOIN evidence_items_therapies evidence_items_therapies_1 ON ((evidence_items_therapies_1.evidence_item_id = evidence_items_1.id)))
+               JOIN therapies therapies_1 ON ((therapies_1.id = evidence_items_therapies_1.therapy_id)))
+               JOIN molecular_profiles molecular_profiles_1 ON ((molecular_profiles_1.id = evidence_items_1.molecular_profile_id)))
+               JOIN molecular_profiles_variants molecular_profiles_variants_1 ON ((molecular_profiles_variants_1.molecular_profile_id = molecular_profiles_1.id)))
+            WHERE (molecular_profiles_variants_1.variant_id = outer_variants.id)
+            GROUP BY therapies_1.id) therapy_count ON ((therapies.id = therapy_count.therapy_id)))
+       LEFT JOIN LATERAL ( SELECT diseases_1.id AS disease_id,
+              count(DISTINCT evidence_items_1.id) FILTER (WHERE (evidence_items_1.id IS NOT NULL)) AS total
+             FROM (((evidence_items evidence_items_1
+               JOIN diseases diseases_1 ON ((diseases_1.id = evidence_items_1.disease_id)))
+               JOIN molecular_profiles molecular_profiles_1 ON ((molecular_profiles_1.id = evidence_items_1.molecular_profile_id)))
+               JOIN molecular_profiles_variants molecular_profiles_variants_1 ON ((molecular_profiles_variants_1.molecular_profile_id = molecular_profiles_1.id)))
+            WHERE (molecular_profiles_variants_1.variant_id = outer_variants.id)
+            GROUP BY diseases_1.id) disease_count ON ((diseases.id = disease_count.disease_id)))
+    WHERE ((((evidence_items.status)::text <> 'rejected'::text) OR (evidence_items.status IS NULL)) AND (outer_variants.deprecated = false))
+    GROUP BY outer_variants.id, outer_variants.name, features.id, features.name;
+  SQL
+  add_index "variant_browse_table_rows", ["id"], name: "index_variant_browse_table_rows_on_id", unique: true
+
 end
diff --git a/server/db/views/variant_browse_table_rows_v15.sql b/server/db/views/variant_browse_table_rows_v15.sql
new file mode 100644
index 000000000..5e0c24a1f
--- /dev/null
+++ b/server/db/views/variant_browse_table_rows_v15.sql
@@ -0,0 +1,47 @@
+SELECT outer_variants.id,
+  outer_variants.name,
+  outer_variants.type as category,
+  features.id as feature_id,
+  features.name as feature_name,
+  array_agg(distinct(variant_aliases.name) order by variant_aliases.name) as alias_names,
+  array_agg(DISTINCT(variant_types.id)) as variant_type_ids,
+  json_agg(distinct jsonb_build_object('name', variant_types.display_name, 'id', variant_types.id)) FILTER (where variant_types IS NOT NULL) as variant_types,
+  COUNT(DISTINCT(variant_types.id)) as variant_type_count,
+  COUNT(DISTINCT(evidence_items.id)) FILTER (WHERE evidence_items.id IS NOT NULL) as evidence_item_count,
+  json_agg(distinct jsonb_build_object('name', diseases.name, 'id', diseases.id, 'total', disease_count.total))  FILTER (WHERE diseases.name IS NOT NULL) as diseases,
+  json_agg(distinct jsonb_build_object('name', therapies.name, 'id', therapies.id, 'total', therapy_count.total))  FILTER (WHERE therapies.name IS NOT NULL) as therapies,
+  COUNT(DISTINCT(assertions.id)) as assertion_count
+FROM variants outer_variants
+LEFT OUTER JOIN variant_aliases_variants ON variant_aliases_variants.variant_id = outer_variants.id
+LEFT OUTER JOIN variant_aliases ON variant_aliases.id = variant_aliases_variants.variant_alias_id
+INNER JOIN molecular_profiles_variants on molecular_profiles_variants.variant_id = outer_variants.id
+INNER JOIN molecular_profiles on molecular_profiles.id = molecular_profiles_variants.molecular_profile_id
+LEFT OUTER JOIN evidence_items ON evidence_items.molecular_profile_id = molecular_profiles.id
+INNER JOIN features ON features.id = outer_variants.feature_id
+LEFT OUTER JOIN diseases ON diseases.id = evidence_items.disease_id
+LEFT OUTER JOIN evidence_items_therapies ON evidence_items_therapies.evidence_item_id = evidence_items.id
+LEFT OUTER JOIN therapies ON therapies.id = evidence_items_therapies.therapy_id
+LEFT OUTER JOIN assertions ON assertions.molecular_profile_id = molecular_profiles.id
+LEFT OUTER JOIN variant_types_variants ON variant_types_variants.variant_id = outer_variants.id
+LEFT OUTER JOIN variant_types ON variant_types_variants.variant_type_id = variant_types.id
+LEFT JOIN LATERAL (SELECT therapies.id as therapy_id, COUNT(DISTINCT(evidence_items.id)) FILTER (WHERE evidence_items.id IS NOT NULL) as total
+  FROM evidence_items
+  INNER JOIN evidence_items_therapies ON evidence_items_therapies.evidence_item_id = evidence_items.id
+  INNER JOIN therapies ON therapies.id = evidence_items_therapies.therapy_id
+  INNER JOIN molecular_profiles on molecular_profiles.id = evidence_items.molecular_profile_id
+  INNER JOIN molecular_profiles_variants on molecular_profiles_variants.molecular_profile_id = molecular_profiles.id
+  WHERE molecular_profiles_variants.variant_id = outer_variants.id
+  GROUP BY therapies.id
+) therapy_count on therapies.id = therapy_count.therapy_id
+
+LEFT JOIN LATERAL (SELECT diseases.id as disease_id, COUNT(DISTINCT(evidence_items.id)) FILTER (WHERE evidence_items.id IS NOT NULL) as total
+  FROM evidence_items
+  INNER JOIN diseases ON diseases.id = evidence_items.disease_id
+  INNER JOIN molecular_profiles on molecular_profiles.id = evidence_items.molecular_profile_id
+  INNER JOIN molecular_profiles_variants on molecular_profiles_variants.molecular_profile_id = molecular_profiles.id
+  WHERE molecular_profiles_variants.variant_id = outer_variants.id
+  GROUP BY diseases.id
+) disease_count on diseases.id = disease_count.disease_id
+WHERE (evidence_items.status != 'rejected' OR evidence_items.status IS NULL)
+AND outer_variants.deprecated = FALSE
+GROUP BY outer_variants.id, outer_variants.name, features.id, features.name

From 97b3d88fd7a442011d154ec69d094eff0d37b37f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 24 Mar 2024 01:30:28 +0000
Subject: [PATCH 105/125] Bump webpack-dev-middleware from 5.3.3 to 5.3.4 in
 /server

Bumps [webpack-dev-middleware](https://github.com/webpack/webpack-dev-middleware) from 5.3.3 to 5.3.4.
- [Release notes](https://github.com/webpack/webpack-dev-middleware/releases)
- [Changelog](https://github.com/webpack/webpack-dev-middleware/blob/v5.3.4/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-dev-middleware/compare/v5.3.3...v5.3.4)

---
updated-dependencies:
- dependency-name: webpack-dev-middleware
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 server/yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/yarn.lock b/server/yarn.lock
index 8ac0c9f5d..5307dc3ba 100644
--- a/server/yarn.lock
+++ b/server/yarn.lock
@@ -3626,9 +3626,9 @@ webpack-cli@^4.8.0:
     webpack-merge "^5.7.3"
 
 webpack-dev-middleware@^5.3.1:
-  version "5.3.3"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz#efae67c2793908e7311f1d9b06f2a08dcc97e51f"
-  integrity sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==
+  version "5.3.4"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz#eb7b39281cbce10e104eb2b8bf2b63fce49a3517"
+  integrity sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==
   dependencies:
     colorette "^2.0.10"
     memfs "^3.4.3"

From 3163d3dd31a0764960fd62a86920d6bd5cf9ae74 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Mar 2024 20:11:05 +0000
Subject: [PATCH 106/125] Bump rdoc from 6.6.2 to 6.6.3.1 in /server

Bumps [rdoc](https://github.com/ruby/rdoc) from 6.6.2 to 6.6.3.1.
- [Release notes](https://github.com/ruby/rdoc/releases)
- [Changelog](https://github.com/ruby/rdoc/blob/master/History.rdoc)
- [Commits](https://github.com/ruby/rdoc/compare/v6.6.2...v6.6.3.1)

---
updated-dependencies:
- dependency-name: rdoc
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 server/Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/Gemfile.lock b/server/Gemfile.lock
index ab23679e4..11eacb2e8 100644
--- a/server/Gemfile.lock
+++ b/server/Gemfile.lock
@@ -383,7 +383,7 @@ GEM
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rbs (2.8.4)
-    rdoc (6.6.2)
+    rdoc (6.6.3.1)
       psych (>= 4.0.0)
     redis-client (0.21.0)
       connection_pool

From 004f8afebe34074cb0775f024b7758f99339554f Mon Sep 17 00:00:00 2001
From: Adam Coffman <acoffman@wustl.edu>
Date: Tue, 26 Mar 2024 09:36:07 -0500
Subject: [PATCH 107/125] Remove matrix execution for backend tests

---
 .github/workflows/tests.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 671baad40..5a8c5f111 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -9,9 +9,6 @@ jobs:
   backend_tests:
     name: Backend Tests
     runs-on: 'ubuntu-latest'
-    strategy:
-      matrix:
-        ruby: ['3.3']
     services:
         postgres:
           image: postgres:13
@@ -30,7 +27,7 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
-          ruby-version: ${{ matrix.ruby }}
+          ruby-version: '3.3'
           working-directory: ./server
 
       - name: Setup DB

From 1d722393fe72c1c824c97265e50c4e963b2cc5cc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Mar 2024 14:36:50 +0000
Subject: [PATCH 108/125] Bump express from 4.18.2 to 4.19.2 in /server

Bumps [express](https://github.com/expressjs/express) from 4.18.2 to 4.19.2.
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/master/History.md)
- [Commits](https://github.com/expressjs/express/compare/4.18.2...4.19.2)

---
updated-dependencies:
- dependency-name: express
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 server/yarn.lock | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/server/yarn.lock b/server/yarn.lock
index 8ac0c9f5d..5e5de822d 100644
--- a/server/yarn.lock
+++ b/server/yarn.lock
@@ -1626,13 +1626,13 @@ binary-extensions@^2.0.0:
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
   integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
 
-body-parser@1.20.1:
-  version "1.20.1"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.1.tgz#b1812a8912c195cd371a3ee5e66faa2338a5c668"
-  integrity sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==
+body-parser@1.20.2:
+  version "1.20.2"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.2.tgz#6feb0e21c4724d06de7ff38da36dad4f57a747fd"
+  integrity sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==
   dependencies:
     bytes "3.1.2"
-    content-type "~1.0.4"
+    content-type "~1.0.5"
     debug "2.6.9"
     depd "2.0.0"
     destroy "1.2.0"
@@ -1640,7 +1640,7 @@ body-parser@1.20.1:
     iconv-lite "0.4.24"
     on-finished "2.4.1"
     qs "6.11.0"
-    raw-body "2.5.1"
+    raw-body "2.5.2"
     type-is "~1.6.18"
     unpipe "1.0.0"
 
@@ -1860,7 +1860,7 @@ content-disposition@0.5.4:
   dependencies:
     safe-buffer "5.2.1"
 
-content-type@~1.0.4:
+content-type@~1.0.4, content-type@~1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918"
   integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==
@@ -1875,10 +1875,10 @@ cookie-signature@1.0.6:
   resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
   integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==
 
-cookie@0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b"
-  integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==
+cookie@0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.6.0.tgz#2798b04b071b0ecbff0dbb62a505a8efa4e19051"
+  integrity sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==
 
 core-js-compat@^3.31.0, core-js-compat@^3.34.0:
   version "3.36.0"
@@ -2103,16 +2103,16 @@ execa@^5.0.0:
     strip-final-newline "^2.0.0"
 
 express@^4.17.3:
-  version "4.18.2"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.18.2.tgz#3fabe08296e930c796c19e3c516979386ba9fd59"
-  integrity sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==
+  version "4.19.2"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.19.2.tgz#e25437827a3aa7f2a827bc8171bbbb664a356465"
+  integrity sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==
   dependencies:
     accepts "~1.3.8"
     array-flatten "1.1.1"
-    body-parser "1.20.1"
+    body-parser "1.20.2"
     content-disposition "0.5.4"
     content-type "~1.0.4"
-    cookie "0.5.0"
+    cookie "0.6.0"
     cookie-signature "1.0.6"
     debug "2.6.9"
     depd "2.0.0"
@@ -3037,10 +3037,10 @@ range-parser@^1.2.1, range-parser@~1.2.1:
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
   integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
 
-raw-body@2.5.1:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.1.tgz#fe1b1628b181b700215e5fd42389f98b71392857"
-  integrity sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==
+raw-body@2.5.2:
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.2.tgz#99febd83b90e08975087e8f1f9419a149366b68a"
+  integrity sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==
   dependencies:
     bytes "3.1.2"
     http-errors "2.0.0"

From 1ab7d3d535edaa41bf79d999f96e6b432ca90dff Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Mar 2024 14:36:52 +0000
Subject: [PATCH 109/125] Bump express from 4.18.2 to 4.19.2 in /client

Bumps [express](https://github.com/expressjs/express) from 4.18.2 to 4.19.2.
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/master/History.md)
- [Commits](https://github.com/expressjs/express/compare/4.18.2...4.19.2)

---
updated-dependencies:
- dependency-name: express
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 client/yarn.lock | 47 +++++++++++++++++++++--------------------------
 1 file changed, 21 insertions(+), 26 deletions(-)

diff --git a/client/yarn.lock b/client/yarn.lock
index 3b9605ba6..573005d86 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -4049,13 +4049,13 @@ bl@^4.0.3, bl@^4.1.0:
     inherits "^2.0.4"
     readable-stream "^3.4.0"
 
-body-parser@1.20.1:
-  version "1.20.1"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.1.tgz#b1812a8912c195cd371a3ee5e66faa2338a5c668"
-  integrity sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==
+body-parser@1.20.2:
+  version "1.20.2"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.2.tgz#6feb0e21c4724d06de7ff38da36dad4f57a747fd"
+  integrity sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==
   dependencies:
     bytes "3.1.2"
-    content-type "~1.0.4"
+    content-type "~1.0.5"
     debug "2.6.9"
     depd "2.0.0"
     destroy "1.2.0"
@@ -4063,7 +4063,7 @@ body-parser@1.20.1:
     iconv-lite "0.4.24"
     on-finished "2.4.1"
     qs "6.11.0"
-    raw-body "2.5.1"
+    raw-body "2.5.2"
     type-is "~1.6.18"
     unpipe "1.0.0"
 
@@ -4671,6 +4671,11 @@ content-type@~1.0.4:
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
   integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
 
+content-type@~1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918"
+  integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==
+
 convert-source-map@^1.5.1, convert-source-map@^1.7.0:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f"
@@ -4686,10 +4691,10 @@ cookie-signature@1.0.6:
   resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
   integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==
 
-cookie@0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b"
-  integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==
+cookie@0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.6.0.tgz#2798b04b071b0ecbff0dbb62a505a8efa4e19051"
+  integrity sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==
 
 cookie@~0.4.1:
   version "0.4.2"
@@ -5545,16 +5550,16 @@ exponential-backoff@^3.1.1:
   integrity sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==
 
 express@^4.17.3:
-  version "4.18.2"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.18.2.tgz#3fabe08296e930c796c19e3c516979386ba9fd59"
-  integrity sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==
+  version "4.19.2"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.19.2.tgz#e25437827a3aa7f2a827bc8171bbbb664a356465"
+  integrity sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==
   dependencies:
     accepts "~1.3.8"
     array-flatten "1.1.1"
-    body-parser "1.20.1"
+    body-parser "1.20.2"
     content-disposition "0.5.4"
     content-type "~1.0.4"
-    cookie "0.5.0"
+    cookie "0.6.0"
     cookie-signature "1.0.6"
     debug "2.6.9"
     depd "2.0.0"
@@ -8454,17 +8459,7 @@ range-parser@^1.2.1, range-parser@~1.2.0, range-parser@~1.2.1:
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
   integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
 
-raw-body@2.5.1:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.1.tgz#fe1b1628b181b700215e5fd42389f98b71392857"
-  integrity sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==
-  dependencies:
-    bytes "3.1.2"
-    http-errors "2.0.0"
-    iconv-lite "0.4.24"
-    unpipe "1.0.0"
-
-raw-body@^2.3.2:
+raw-body@2.5.2, raw-body@^2.3.2:
   version "2.5.2"
   resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.2.tgz#99febd83b90e08975087e8f1f9419a149366b68a"
   integrity sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==

From 3740ffee281b265afc911a1826a7fa6cd9353724 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Mar 2024 14:36:58 +0000
Subject: [PATCH 110/125] Bump postcss from 8.4.21 to 8.4.31 in /client

Bumps [postcss](https://github.com/postcss/postcss) from 8.4.21 to 8.4.31.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.4.21...8.4.31)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 client/yarn.lock | 38 ++++++++++----------------------------
 1 file changed, 10 insertions(+), 28 deletions(-)

diff --git a/client/yarn.lock b/client/yarn.lock
index 3b9605ba6..dc296c9d7 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -7538,11 +7538,6 @@ mute-stream@1.0.0:
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-1.0.0.tgz#e31bd9fe62f0aed23520aa4324ea6671531e013e"
   integrity sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA==
 
-nanoid@^3.3.4:
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab"
-  integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==
-
 nanoid@^3.3.6:
   version "3.3.6"
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c"
@@ -8306,32 +8301,14 @@ postcss@8.4.31:
     picocolors "^1.0.0"
     source-map-js "^1.0.2"
 
-postcss@^8.2.14:
-  version "8.4.21"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.21.tgz#c639b719a57efc3187b13a1d765675485f4134f4"
-  integrity sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==
-  dependencies:
-    nanoid "^3.3.4"
-    picocolors "^1.0.0"
-    source-map-js "^1.0.2"
-
-postcss@^8.4.21, postcss@^8.4.23:
-  version "8.4.26"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.26.tgz#1bc62ab19f8e1e5463d98cf74af39702a00a9e94"
-  integrity sha512-jrXHFF8iTloAenySjM/ob3gSj7pCu0Ji49hnjqzsgSRa50hkWCKD0HQ+gMNJkW38jBI68MpAAg7ZWwHwX8NMMw==
-  dependencies:
-    nanoid "^3.3.6"
-    picocolors "^1.0.0"
-    source-map-js "^1.0.2"
-
-postcss@^8.4.27:
-  version "8.4.33"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.33.tgz#1378e859c9f69bf6f638b990a0212f43e2aaa742"
-  integrity sha512-Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg==
+postcss@^8.2.14, postcss@^8.4.21, postcss@^8.4.23, postcss@^8.4.27:
+  version "8.4.38"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.38.tgz#b387d533baf2054288e337066d81c6bee9db9e0e"
+  integrity sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==
   dependencies:
     nanoid "^3.3.7"
     picocolors "^1.0.0"
-    source-map-js "^1.0.2"
+    source-map-js "^1.2.0"
 
 prettier@^1.19.1:
   version "1.19.1"
@@ -9229,6 +9206,11 @@ socks@^2.7.1:
   resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
   integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
 
+source-map-js@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.0.tgz#16b809c162517b5b8c3e7dcd315a2a5c2612b2af"
+  integrity sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==
+
 source-map-loader@4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-4.0.1.tgz#72f00d05f5d1f90f80974eda781cbd7107c125f2"

From 64124b8bba5fe5adb2ed441b7c897ba6c84252d1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Mar 2024 14:37:47 +0000
Subject: [PATCH 111/125] Bump semver from 6.3.0 to 6.3.1 in /server

Bumps [semver](https://github.com/npm/node-semver) from 6.3.0 to 6.3.1.
- [Release notes](https://github.com/npm/node-semver/releases)
- [Changelog](https://github.com/npm/node-semver/blob/v6.3.1/CHANGELOG.md)
- [Commits](https://github.com/npm/node-semver/compare/v6.3.0...v6.3.1)

---
updated-dependencies:
- dependency-name: semver
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 server/yarn.lock | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/server/yarn.lock b/server/yarn.lock
index 5307dc3ba..e805aa132 100644
--- a/server/yarn.lock
+++ b/server/yarn.lock
@@ -3243,12 +3243,7 @@ selfsigned@^2.1.1:
     "@types/node-forge" "^1.3.0"
     node-forge "^1"
 
-semver@^6.0.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
-  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
-
-semver@^6.3.1:
+semver@^6.0.0, semver@^6.3.1:
   version "6.3.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==

From 09b372046e6b25685ba8ad96bbedab442585d20e Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Tue, 26 Mar 2024 15:30:27 -0500
Subject: [PATCH 112/125] small refactoring

---
 .../features-table.component.html             |   2 +-
 .../factor-variant-summary.page.html          | 309 +++++------
 .../factor-variant-summary.page.ts            |   2 +
 .../gene-variant-summary.page.html            | 518 +++++++++---------
 .../variants-table.component.html             |   4 +-
 .../variant-revise.form.config.ts             | 366 -------------
 server/app/models/variant.rb                  |  16 +
 server/app/models/variants/factor_variant.rb  |   5 +-
 server/app/models/variants/gene_variant.rb    |   6 +-
 9 files changed, 441 insertions(+), 787 deletions(-)
 delete mode 100644 client/src/app/forms/config/factor-variant-revise/variant-revise.form.config.ts

diff --git a/client/src/app/components/features/features-table/features-table.component.html b/client/src/app/components/features/features-table/features-table.component.html
index 06c90fa0e..6fd6fe6d1 100644
--- a/client/src/app/components/features/features-table/features-table.component.html
+++ b/client/src/app/components/features/features-table/features-table.component.html
@@ -189,7 +189,7 @@
               nz-typography
               nz
               nzType="secondary">
-              {{ feature.featureInstanceType }}
+              {{ feature.featureInstanceType | titlecase }}
             </span>
           </td>
           <td nzLeft>
diff --git a/client/src/app/components/variants/factor-variant-summary/factor-variant-summary.page.html b/client/src/app/components/variants/factor-variant-summary/factor-variant-summary.page.html
index a11ff520a..b32a38641 100644
--- a/client/src/app/components/variants/factor-variant-summary/factor-variant-summary.page.html
+++ b/client/src/app/components/variants/factor-variant-summary/factor-variant-summary.page.html
@@ -1,162 +1,165 @@
-@if(variant.__typename == "FactorVariant") {
-<!-- variant description, details, myvariantinfo row -->
-<nz-row [nzGutter]="[8, 16]">
-  <!-- LEFT COL -->
-  <nz-col [nzSpan]="12">
-    <!-- left col layout row -->
-    <nz-row [nzGutter]="[8, 8]">
-      <!-- variant attributes block -->
-      <nz-col nzSpan="24">
-        <nz-descriptions
-          nzLayout="horizontal"
-          nzSize="small"
-          [nzColumn]="1"
-          nzBordered="true">
-          <!-- aliases -->
-          <nz-descriptions-item nzTitle="Aliases">
-            <ng-container
-              *ngIf="variant.variantAliases.length > 0; else noAliases">
-              <cvc-tag-list>
-                <nz-tag *ngFor="let alias of variant.variantAliases">{{
-                  alias
-                }}</nz-tag>
-              </cvc-tag-list>
-            </ng-container>
-            <ng-template #noAliases>
-              <span
-                nz-typography
-                nzType="secondary"
-                >None specified</span
-              >
-            </ng-template>
-          </nz-descriptions-item>
+@if (variant.__typename == 'FactorVariant') {
+  <!-- variant description, details, myvariantinfo row -->
+  <nz-row [nzGutter]="[8, 16]">
+    <!-- LEFT COL -->
+    <nz-col [nzSpan]="12">
+      <!-- left col layout row -->
+      <nz-row [nzGutter]="[8, 8]">
+        <!-- variant attributes block -->
+        <nz-col nzSpan="24">
+          <nz-descriptions
+            nzLayout="horizontal"
+            nzSize="small"
+            [nzColumn]="1"
+            nzBordered="true">
+            <!-- aliases -->
+            <nz-descriptions-item nzTitle="Aliases">
+              <ng-container
+                *ngIf="variant.variantAliases.length > 0; else noAliases">
+                <cvc-tag-list>
+                  <nz-tag *ngFor="let alias of variant.variantAliases">{{
+                    alias
+                  }}</nz-tag>
+                </cvc-tag-list>
+              </ng-container>
+              <ng-template #noAliases>
+                <span
+                  nz-typography
+                  nzType="secondary"
+                  >None specified</span
+                >
+              </ng-template>
+            </nz-descriptions-item>
 
-          <!-- variant type(s) -->
-          <nz-descriptions-item
-            [nzTitle]="
-              variant.variantTypes.length > 1 ? 'Variant Types' : 'Variant Type'
-            ">
-            <ng-container *ngIf="variant.variantTypes.length > 0; else noTypes">
-              <cvc-tag-list>
-                <cvc-variant-type-tag
-                  [variantType]="type"
-                  *ngFor="
-                    let type of variant.variantTypes
-                  "></cvc-variant-type-tag>
-              </cvc-tag-list>
-            </ng-container>
-            <ng-template #noTypes>
-              <span
-                nz-typography
-                nzType="secondary"
-                >None specified</span
-              >
-            </ng-template>
-          </nz-descriptions-item>
-        </nz-descriptions>
-      </nz-col>
-      <ng-container *ngIf="variant.ncitId; else noNcit">
-        <nz-col [nzSpan]="24">
-          <cvc-ncit-details
-            [ncitDetails]="variant.ncitDetails"></cvc-ncit-details>
+            <!-- variant type(s) -->
+            <nz-descriptions-item
+              [nzTitle]="
+                variant.variantTypes.length > 1
+                  ? 'Variant Types'
+                  : 'Variant Type'
+              ">
+              <ng-container
+                *ngIf="variant.variantTypes.length > 0; else noTypes">
+                <cvc-tag-list>
+                  <cvc-variant-type-tag
+                    [variantType]="type"
+                    *ngFor="
+                      let type of variant.variantTypes
+                    "></cvc-variant-type-tag>
+                </cvc-tag-list>
+              </ng-container>
+              <ng-template #noTypes>
+                <span
+                  nz-typography
+                  nzType="secondary"
+                  >None specified</span
+                >
+              </ng-template>
+            </nz-descriptions-item>
+          </nz-descriptions>
         </nz-col>
-      </ng-container>
-      <ng-template #noNcit>
+        <ng-template #noNcit>
+          <nz-col [nzSpan]="24">
+            <nz-card nzTitle="">
+              <cvc-empty-revisable
+                notification="Not available, please provide an NCIt ID">
+              </cvc-empty-revisable>
+            </nz-card>
+          </nz-col>
+        </ng-template>
+      </nz-row>
+    </nz-col>
+
+    <!-- RIGHT COLUMN -->
+    <nz-col nzSpan="12">
+      <!-- right col layout row -->
+      <nz-row [nzGutter]="[8, 8]">
+        <!-- BLOCK: creation and deprecation events -->
         <nz-col [nzSpan]="24">
-          <nz-card nzTitle="">
-            <cvc-empty-revisable
-              notification="Not available, please provide an NCIt ID">
-            </cvc-empty-revisable>
-          </nz-card>
+          <nz-descriptions
+            nzLayout="vertical"
+            nzSize="small"
+            [nzColumn]="{ xxl: 2, xl: 2, lg: 1, md: 1, sm: 1, xs: 1 }"
+            nzBordered="true">
+            <!-- creation/deprecation curation events -->
+            <ng-container *ngIf="variant.creationActivity">
+              <nz-descriptions-item [nzTitle]="createdTitle">
+                by
+                <cvc-user-tag
+                  [user]="variant.creationActivity.user"></cvc-user-tag>
+              </nz-descriptions-item>
+              <ng-template #createdTitle>
+                Created
+                <span
+                  nz-typography
+                  nzType="secondary">
+                  ({{ variant.creationActivity.createdAt | timeAgo }})
+                </span>
+              </ng-template>
+            </ng-container>
+            <ng-container *ngIf="variant.deprecationActivity">
+              <nz-descriptions-item [nzTitle]="deprecatedTitle">
+                by
+                <cvc-user-tag
+                  [user]="variant.deprecationActivity.user"></cvc-user-tag>
+              </nz-descriptions-item>
+              <ng-template #deprecatedTitle>
+                Deprecated
+                <span
+                  nz-typography
+                  nzType="secondary">
+                  ({{ variant.deprecationActivity.createdAt | timeAgo }})
+                </span>
+              </ng-template>
+            </ng-container>
+          </nz-descriptions>
         </nz-col>
-      </ng-template>
-    </nz-row>
-  </nz-col>
 
-  <!-- RIGHT COLUMN -->
-  <nz-col nzSpan="12">
-    <!-- right col layout row -->
-    <nz-row [nzGutter]="[8, 8]">
-      <!-- BLOCK: creation and deprecation events -->
-      <nz-col [nzSpan]="24">
-        <nz-descriptions
-          nzLayout="vertical"
-          nzSize="small"
-          [nzColumn]="{ xxl: 2, xl: 2, lg: 1, md: 1, sm: 1, xs: 1 }"
-          nzBordered="true">
-          <!-- creation/deprecation curation events -->
-          <ng-container *ngIf="variant.creationActivity">
-            <nz-descriptions-item [nzTitle]="createdTitle">
-              by
-              <cvc-user-tag
-                [user]="variant.creationActivity.user"></cvc-user-tag>
-            </nz-descriptions-item>
-            <ng-template #createdTitle>
-              Created
-              <span
-                nz-typography
-                nzType="secondary">
-                ({{ variant.creationActivity.createdAt | timeAgo }})
-              </span>
-            </ng-template>
-          </ng-container>
-          <ng-container *ngIf="variant.deprecationActivity">
-            <nz-descriptions-item [nzTitle]="deprecatedTitle">
-              by
-              <cvc-user-tag
-                [user]="variant.deprecationActivity.user"></cvc-user-tag>
+        <!-- variant related entities, attributes -->
+        <nz-col [nzSpan]="24">
+          <nz-descriptions
+            nzLayout="horizontal"
+            nzSize="small"
+            [nzColumn]="{ xxl: 2, xl: 2, lg: 1, md: 1, sm: 1, xs: 1 }"
+            nzBordered="true">
+            <!-- feature -->
+            <nz-descriptions-item nzTitle="Factor">
+              <cvc-feature-tag [feature]="variant.feature"></cvc-feature-tag>
             </nz-descriptions-item>
-            <ng-template #deprecatedTitle>
-              Deprecated
-              <span
-                nz-typography
-                nzType="secondary">
-                ({{ variant.deprecationActivity.createdAt | timeAgo }})
-              </span>
-            </ng-template>
-          </ng-container>
-        </nz-descriptions>
-      </nz-col>
-
-      <!-- variant related entities, attributes -->
-      <nz-col [nzSpan]="24">
-        <nz-descriptions
-          nzLayout="horizontal"
-          nzSize="small"
-          [nzColumn]="{ xxl: 2, xl: 2, lg: 1, md: 1, sm: 1, xs: 1 }"
-          nzBordered="true">
-          <!-- feature -->
-          <nz-descriptions-item [nzTitle]="variant.feature.__typename">
-            <cvc-feature-tag [feature]="variant.feature"></cvc-feature-tag>
-          </nz-descriptions-item>
 
-          <nz-descriptions-item
-            *ngIf="variant.ncitId"
-            nzTitle="Resources">
-            <cvc-tag-list>
-              <cvc-link-tag
-                [href]="
-                  'https://ncithesaurus.nci.nih.gov/ncitbrowser/ConceptReport.jsp?dictionary=NCI_Thesaurus&ns=ncit&code=' +
-                  variant.ncitId
-                "
-                [tooltip]="'View ' + variant.name + ' in the NCI Thesaurus'">
-                NCIt: {{ variant.ncitId }}
-              </cvc-link-tag>
-            </cvc-tag-list>
-          </nz-descriptions-item>
-        </nz-descriptions>
-      </nz-col>
-    </nz-row>
-  </nz-col>
-  <!-- END RIGHT COL -->
+            <nz-descriptions-item
+              *ngIf="variant.ncitId"
+              nzTitle="Resources">
+              <cvc-tag-list>
+                <cvc-link-tag
+                  [href]="
+                    'https://ncithesaurus.nci.nih.gov/ncitbrowser/ConceptReport.jsp?dictionary=NCI_Thesaurus&ns=ncit&code=' +
+                    variant.ncitId
+                  "
+                  [tooltip]="'View ' + variant.name + ' in the NCI Thesaurus'">
+                  NCIt: {{ variant.ncitId }}
+                </cvc-link-tag>
+              </cvc-tag-list>
+            </nz-descriptions-item>
+          </nz-descriptions>
+        </nz-col>
+        <ng-container *ngIf="variant.ncitId; else noNcit">
+          <nz-col [nzSpan]="24">
+            <cvc-ncit-details
+              [ncitDetails]="variant.ncitDetails"></cvc-ncit-details>
+          </nz-col>
+        </ng-container>
+      </nz-row>
+    </nz-col>
+    <!-- END RIGHT COL -->
 
-  <!-- evidence table -->
-  <nz-col nzSpan="24">
-    <cvc-molecular-profiles-table
-      [variantId]="variant.id"
-      cvcHeight="300px"
-      cvcTitle="{{ variant.name }} Molecular Profiles">
-    </cvc-molecular-profiles-table>
-  </nz-col>
-</nz-row>
+    <!-- evidence table -->
+    <nz-col nzSpan="24">
+      <cvc-molecular-profiles-table
+        [variantId]="variant.id"
+        cvcHeight="300px"
+        cvcTitle="{{ variant.name }} Molecular Profiles">
+      </cvc-molecular-profiles-table>
+    </nz-col>
+  </nz-row>
 }
diff --git a/client/src/app/components/variants/factor-variant-summary/factor-variant-summary.page.ts b/client/src/app/components/variants/factor-variant-summary/factor-variant-summary.page.ts
index 91cf5189c..954c16483 100644
--- a/client/src/app/components/variants/factor-variant-summary/factor-variant-summary.page.ts
+++ b/client/src/app/components/variants/factor-variant-summary/factor-variant-summary.page.ts
@@ -18,6 +18,7 @@ import { CvcUserTagModule } from '@app/components/users/user-tag/user-tag.module
 import { CvcFeatureTagModule } from '@app/components/features/feature-tag/feature-tag.module'
 import { CvcPipesModule } from '@app/core/pipes/pipes.module'
 import { CvcNcitDetailsComponent } from '@app/components/factors/ncit-details/ncit-details.component'
+import { NzTypographyModule } from 'ng-zorro-antd/typography'
 
 @Component({
   standalone: true,
@@ -31,6 +32,7 @@ import { CvcNcitDetailsComponent } from '@app/components/factors/ncit-details/nc
     NzDescriptionsModule,
     NzTagModule,
     NzCardModule,
+    NzTypographyModule,
     CvcEmptyRevisableModule,
     CvcTagListModule,
     CvcVariantTypeTagModule,
diff --git a/client/src/app/components/variants/gene-variant-summary/gene-variant-summary.page.html b/client/src/app/components/variants/gene-variant-summary/gene-variant-summary.page.html
index 0a6b699fa..a37d1a06a 100644
--- a/client/src/app/components/variants/gene-variant-summary/gene-variant-summary.page.html
+++ b/client/src/app/components/variants/gene-variant-summary/gene-variant-summary.page.html
@@ -1,271 +1,277 @@
-@if(variant.__typename == "GeneVariant") {
-<!-- variant description, details, myvariantinfo row -->
-<nz-row [nzGutter]="[8, 16]">
-  <!-- LEFT COL -->
-  <nz-col [nzSpan]="12">
-    <!-- left col layout row -->
-    <nz-row [nzGutter]="[8, 8]">
-      <!-- variant attributes block -->
-      <nz-col nzSpan="24">
-        <nz-descriptions
-          nzLayout="horizontal"
-          nzSize="small"
-          [nzColumn]="1"
-          nzBordered="true">
-          <!-- aliases -->
-          <nz-descriptions-item nzTitle="Aliases">
-            <ng-container
-              *ngIf="variant.variantAliases.length > 0; else noAliases">
-              <cvc-tag-list>
-                <nz-tag *ngFor="let alias of variant.variantAliases">{{
-                  alias
-                }}</nz-tag>
-              </cvc-tag-list>
-            </ng-container>
-            <ng-template #noAliases>
-              <span
-                nz-typography
-                nzType="secondary"
-                >None specified</span
-              >
-            </ng-template>
-          </nz-descriptions-item>
-
-          <!-- variant type(s) -->
-          <nz-descriptions-item
-            [nzTitle]="
-              variant.variantTypes.length > 1 ? 'Variant Types' : 'Variant Type'
-            ">
-            <ng-container *ngIf="variant.variantTypes.length > 0; else noTypes">
-              <cvc-tag-list>
-                <cvc-variant-type-tag
-                  [variantType]="type"
-                  *ngFor="
-                    let type of variant.variantTypes
-                  "></cvc-variant-type-tag>
-              </cvc-tag-list>
-            </ng-container>
-            <ng-template #noTypes>
-              <span
-                nz-typography
-                nzType="secondary"
-                >None specified</span
-              >
-            </ng-template>
-          </nz-descriptions-item>
-
-          <!-- HGVS descriptions -->
-          <nz-descriptions-item
-            [nzTitle]="
-              variant.hgvsDescriptions.length > 1
-                ? 'HGVS Descriptions'
-                : 'HGVS Description'
-            ">
-            <ng-container
-              *ngIf="variant.hgvsDescriptions.length > 0; else noDescriptions">
-              <cvc-tag-list>
-                <nz-tag *ngFor="let desc of variant.hgvsDescriptions">{{
-                  desc
-                }}</nz-tag>
-              </cvc-tag-list>
-            </ng-container>
-            <ng-template #noDescriptions>
-              <span
-                nz-typography
-                nzType="secondary"
-                >None specified</span
-              >
-            </ng-template>
-          </nz-descriptions-item>
+@if (variant.__typename == 'GeneVariant') {
+  <!-- variant description, details, myvariantinfo row -->
+  <nz-row [nzGutter]="[8, 16]">
+    <!-- LEFT COL -->
+    <nz-col [nzSpan]="12">
+      <!-- left col layout row -->
+      <nz-row [nzGutter]="[8, 8]">
+        <!-- variant attributes block -->
+        <nz-col nzSpan="24">
+          <nz-descriptions
+            nzLayout="horizontal"
+            nzSize="small"
+            [nzColumn]="1"
+            nzBordered="true">
+            <!-- aliases -->
+            <nz-descriptions-item nzTitle="Aliases">
+              <ng-container
+                *ngIf="variant.variantAliases.length > 0; else noAliases">
+                <cvc-tag-list>
+                  <nz-tag *ngFor="let alias of variant.variantAliases">{{
+                    alias
+                  }}</nz-tag>
+                </cvc-tag-list>
+              </ng-container>
+              <ng-template #noAliases>
+                <span
+                  nz-typography
+                  nzType="secondary"
+                  >None specified</span
+                >
+              </ng-template>
+            </nz-descriptions-item>
 
-          <!-- MANE Select Transcript -->
-          <nz-descriptions-item nzTitle="MANE Select Transcript">
-            <ng-container *ngIf="variant.maneSelectTranscript; else noMane">
-              <cvc-tag-list>
-                <nz-tag>{{ variant.maneSelectTranscript }}</nz-tag>
-              </cvc-tag-list>
-            </ng-container>
-            <ng-template #noMane>
-              <span
-                nz-typography
-                nzType="secondary"
-                >None found</span
-              >
-            </ng-template>
-          </nz-descriptions-item>
-        </nz-descriptions>
-      </nz-col>
-      <!-- coordinates -->
-      <nz-col [nzSpan]="24">
-        <cvc-coordinates-card
-          [cvcVariantId]="variant.id"></cvc-coordinates-card>
-      </nz-col>
-    </nz-row>
-  </nz-col>
+            <!-- variant type(s) -->
+            <nz-descriptions-item
+              [nzTitle]="
+                variant.variantTypes.length > 1
+                  ? 'Variant Types'
+                  : 'Variant Type'
+              ">
+              <ng-container
+                *ngIf="variant.variantTypes.length > 0; else noTypes">
+                <cvc-tag-list>
+                  <cvc-variant-type-tag
+                    [variantType]="type"
+                    *ngFor="
+                      let type of variant.variantTypes
+                    "></cvc-variant-type-tag>
+                </cvc-tag-list>
+              </ng-container>
+              <ng-template #noTypes>
+                <span
+                  nz-typography
+                  nzType="secondary"
+                  >None specified</span
+                >
+              </ng-template>
+            </nz-descriptions-item>
 
-  <!-- RIGHT COLUMN -->
-  <nz-col nzSpan="12">
-    <!-- right col layout row -->
-    <nz-row [nzGutter]="[8, 8]">
-      <!-- BLOCK: creation and deprecation events -->
-      <nz-col [nzSpan]="24">
-        <nz-descriptions
-          nzLayout="vertical"
-          nzSize="small"
-          [nzColumn]="{ xxl: 2, xl: 2, lg: 1, md: 1, sm: 1, xs: 1 }"
-          nzBordered="true">
-          <!-- creation/deprecation curation events -->
-          <ng-container *ngIf="variant.creationActivity">
-            <nz-descriptions-item [nzTitle]="createdTitle">
-              by
-              <cvc-user-tag
-                [user]="variant.creationActivity.user"></cvc-user-tag>
+            <!-- HGVS descriptions -->
+            <nz-descriptions-item
+              [nzTitle]="
+                variant.hgvsDescriptions.length > 1
+                  ? 'HGVS Descriptions'
+                  : 'HGVS Description'
+              ">
+              <ng-container
+                *ngIf="
+                  variant.hgvsDescriptions.length > 0;
+                  else noDescriptions
+                ">
+                <cvc-tag-list>
+                  <nz-tag *ngFor="let desc of variant.hgvsDescriptions">{{
+                    desc
+                  }}</nz-tag>
+                </cvc-tag-list>
+              </ng-container>
+              <ng-template #noDescriptions>
+                <span
+                  nz-typography
+                  nzType="secondary"
+                  >None specified</span
+                >
+              </ng-template>
             </nz-descriptions-item>
-            <ng-template #createdTitle>
-              Created
-              <span
-                nz-typography
-                nzType="secondary">
-                ({{ variant.creationActivity.createdAt | timeAgo }})
-              </span>
-            </ng-template>
-          </ng-container>
-          <ng-container *ngIf="variant.deprecationActivity">
-            <nz-descriptions-item [nzTitle]="deprecatedTitle">
-              by
-              <cvc-user-tag
-                [user]="variant.deprecationActivity.user"></cvc-user-tag>
+
+            <!-- MANE Select Transcript -->
+            <nz-descriptions-item nzTitle="MANE Select Transcript">
+              <ng-container *ngIf="variant.maneSelectTranscript; else noMane">
+                <cvc-tag-list>
+                  <nz-tag>{{ variant.maneSelectTranscript }}</nz-tag>
+                </cvc-tag-list>
+              </ng-container>
+              <ng-template #noMane>
+                <span
+                  nz-typography
+                  nzType="secondary"
+                  >None found</span
+                >
+              </ng-template>
             </nz-descriptions-item>
-            <ng-template #deprecatedTitle>
-              Deprecated
-              <span
-                nz-typography
-                nzType="secondary">
-                ({{ variant.deprecationActivity.createdAt | timeAgo }})
-              </span>
-            </ng-template>
-          </ng-container>
-        </nz-descriptions>
-      </nz-col>
+          </nz-descriptions>
+        </nz-col>
+        <!-- coordinates -->
+        <nz-col [nzSpan]="24">
+          <cvc-coordinates-card
+            [cvcVariantId]="variant.id"></cvc-coordinates-card>
+        </nz-col>
+      </nz-row>
+    </nz-col>
 
-      <!-- variant related entities, attributes -->
-      <nz-col [nzSpan]="24">
-        <nz-descriptions
-          nzLayout="horizontal"
-          nzSize="small"
-          [nzColumn]="{ xxl: 2, xl: 2, lg: 1, md: 1, sm: 1, xs: 1 }"
-          nzBordered="true">
-          <!-- feature -->
-          <nz-descriptions-item [nzTitle]="variant.feature.__typename">
-            <cvc-feature-tag [feature]="variant.feature"></cvc-feature-tag>
-          </nz-descriptions-item>
+    <!-- RIGHT COLUMN -->
+    <nz-col nzSpan="12">
+      <!-- right col layout row -->
+      <nz-row [nzGutter]="[8, 8]">
+        <!-- BLOCK: creation and deprecation events -->
+        <nz-col [nzSpan]="24">
+          <nz-descriptions
+            nzLayout="vertical"
+            nzSize="small"
+            [nzColumn]="{ xxl: 2, xl: 2, lg: 1, md: 1, sm: 1, xs: 1 }"
+            nzBordered="true">
+            <!-- creation/deprecation curation events -->
+            <ng-container *ngIf="variant.creationActivity">
+              <nz-descriptions-item [nzTitle]="createdTitle">
+                by
+                <cvc-user-tag
+                  [user]="variant.creationActivity.user"></cvc-user-tag>
+              </nz-descriptions-item>
+              <ng-template #createdTitle>
+                Created
+                <span
+                  nz-typography
+                  nzType="secondary">
+                  ({{ variant.creationActivity.createdAt | timeAgo }})
+                </span>
+              </ng-template>
+            </ng-container>
+            <ng-container *ngIf="variant.deprecationActivity">
+              <nz-descriptions-item [nzTitle]="deprecatedTitle">
+                by
+                <cvc-user-tag
+                  [user]="variant.deprecationActivity.user"></cvc-user-tag>
+              </nz-descriptions-item>
+              <ng-template #deprecatedTitle>
+                Deprecated
+                <span
+                  nz-typography
+                  nzType="secondary">
+                  ({{ variant.deprecationActivity.createdAt | timeAgo }})
+                </span>
+              </ng-template>
+            </ng-container>
+          </nz-descriptions>
+        </nz-col>
 
-          <!-- allele reg. id -->
-          <nz-descriptions-item nzTitle="Allele Registry ID">
-            <cvc-link-tag
-              *ngIf="
-                variant.alleleRegistryId &&
-                  variant.alleleRegistryId != 'unregistered';
-                else noAlleleRegistry
-              "
-              [href]="
-                'https://reg.genome.network/allele/' +
-                variant.alleleRegistryId +
-                '.html'
-              "
-              tooltip="View on ClinGen Allele Registry">
-              {{ variant.alleleRegistryId }}
-            </cvc-link-tag>
-            <ng-template #noAlleleRegistry>
-              <span
-                nz-typography
-                nzType="secondary"
-                >Unregistered</span
-              >
-            </ng-template>
-          </nz-descriptions-item>
+        <!-- variant related entities, attributes -->
+        <nz-col [nzSpan]="24">
+          <nz-descriptions
+            nzLayout="horizontal"
+            nzSize="small"
+            [nzColumn]="{ xxl: 2, xl: 2, lg: 1, md: 1, sm: 1, xs: 1 }"
+            nzBordered="true">
+            <!-- feature -->
+            <nz-descriptions-item nzTitle="Gene">
+              <cvc-feature-tag [feature]="variant.feature"></cvc-feature-tag>
+            </nz-descriptions-item>
 
-          <!-- clinvar ids-->
-          <nz-descriptions-item
-            [nzTitle]="
-              variant.clinvarIds.length > 1 ? 'ClinVar IDs' : 'ClinVar ID'
-            ">
-            <ng-container
-              *ngIf="variant.clinvarIds.length > 0; else noClinvarIds">
-              <cvc-tag-list
+            <!-- allele reg. id -->
+            <nz-descriptions-item nzTitle="Allele Registry ID">
+              <cvc-link-tag
                 *ngIf="
-                  variant.clinvarIds[0] !== 'N/A' &&
-                    variant.clinvarIds[0] !== 'NONE FOUND';
-                  else clinvarNotApplicable
-                ">
-                <ng-container *ngFor="let id of variant.clinvarIds">
-                  <cvc-link-tag
-                    [href]="
-                      'https://www.ncbi.nlm.nih.gov/clinvar/variation/' + id
-                    "
-                    tooltip="View on ClinVar">
-                    {{ id }}
-                  </cvc-link-tag>
-                </ng-container>
-              </cvc-tag-list>
-            </ng-container>
+                  variant.alleleRegistryId &&
+                    variant.alleleRegistryId != 'unregistered';
+                  else noAlleleRegistry
+                "
+                [href]="
+                  'https://reg.genome.network/allele/' +
+                  variant.alleleRegistryId +
+                  '.html'
+                "
+                tooltip="View on ClinGen Allele Registry">
+                {{ variant.alleleRegistryId }}
+              </cvc-link-tag>
+              <ng-template #noAlleleRegistry>
+                <span
+                  nz-typography
+                  nzType="secondary"
+                  >Unregistered</span
+                >
+              </ng-template>
+            </nz-descriptions-item>
 
-            <ng-template #clinvarNotApplicable>
-              <span
-                nz-typography
-                nzType="secondary"
-                >{{ variant.clinvarIds[0] }}</span
-              >
-            </ng-template>
+            <!-- clinvar ids-->
+            <nz-descriptions-item
+              [nzTitle]="
+                variant.clinvarIds.length > 1 ? 'ClinVar IDs' : 'ClinVar ID'
+              ">
+              <ng-container
+                *ngIf="variant.clinvarIds.length > 0; else noClinvarIds">
+                <cvc-tag-list
+                  *ngIf="
+                    variant.clinvarIds[0] !== 'N/A' &&
+                      variant.clinvarIds[0] !== 'NONE FOUND';
+                    else clinvarNotApplicable
+                  ">
+                  <ng-container *ngFor="let id of variant.clinvarIds">
+                    <cvc-link-tag
+                      [href]="
+                        'https://www.ncbi.nlm.nih.gov/clinvar/variation/' + id
+                      "
+                      tooltip="View on ClinVar">
+                      {{ id }}
+                    </cvc-link-tag>
+                  </ng-container>
+                </cvc-tag-list>
+              </ng-container>
 
-            <ng-template #noClinvarIds>
-              <span
-                nz-typography
-                nzType="secondary"
-                >None provided</span
-              >
-            </ng-template>
-          </nz-descriptions-item>
+              <ng-template #clinvarNotApplicable>
+                <span
+                  nz-typography
+                  nzType="secondary"
+                  >{{ variant.clinvarIds[0] }}</span
+                >
+              </ng-template>
 
-          <nz-descriptions-item
-            *ngIf="variant.openCravatUrl"
-            nzTitle="OpenCRAVAT">
-            <cvc-link-tag
-              [href]="variant.openCravatUrl"
-              tooltip="View on OpenCRAVAT">
-              Variant Report
-            </cvc-link-tag>
-          </nz-descriptions-item>
-        </nz-descriptions>
-      </nz-col>
+              <ng-template #noClinvarIds>
+                <span
+                  nz-typography
+                  nzType="secondary"
+                  >None provided</span
+                >
+              </ng-template>
+            </nz-descriptions-item>
 
-      <!-- myvariant info -->
-      <ng-container *ngIf="variant.myVariantInfo; else noVariantInfo">
-        <nz-col [nzSpan]="24">
-          <cvc-my-variant-info
-            [variantInfo]="variant.myVariantInfo"></cvc-my-variant-info>
-        </nz-col>
-      </ng-container>
-      <ng-template #noVariantInfo>
-        <nz-col [nzSpan]="24">
-          <nz-card nzTitle="MyVariantInfo">
-            <cvc-empty-revisable
-              notification="Not available, provide Representative Variant Coordinates">
-            </cvc-empty-revisable>
-          </nz-card>
+            <nz-descriptions-item
+              *ngIf="variant.openCravatUrl"
+              nzTitle="OpenCRAVAT">
+              <cvc-link-tag
+                [href]="variant.openCravatUrl"
+                tooltip="View on OpenCRAVAT">
+                Variant Report
+              </cvc-link-tag>
+            </nz-descriptions-item>
+          </nz-descriptions>
         </nz-col>
-      </ng-template>
-    </nz-row>
-  </nz-col>
-  <!-- END RIGHT COL -->
 
-  <!-- evidence table -->
-  <nz-col nzSpan="24">
-    <cvc-molecular-profiles-table
-      [variantId]="variant.id"
-      cvcHeight="300px"
-      cvcTitle="{{ variant.name }} Molecular Profiles">
-    </cvc-molecular-profiles-table>
-  </nz-col>
-</nz-row>
+        <!-- myvariant info -->
+        <ng-container *ngIf="variant.myVariantInfo; else noVariantInfo">
+          <nz-col [nzSpan]="24">
+            <cvc-my-variant-info
+              [variantInfo]="variant.myVariantInfo"></cvc-my-variant-info>
+          </nz-col>
+        </ng-container>
+        <ng-template #noVariantInfo>
+          <nz-col [nzSpan]="24">
+            <nz-card nzTitle="MyVariantInfo">
+              <cvc-empty-revisable
+                notification="Not available, provide Representative Variant Coordinates">
+              </cvc-empty-revisable>
+            </nz-card>
+          </nz-col>
+        </ng-template>
+      </nz-row>
+    </nz-col>
+    <!-- END RIGHT COL -->
+
+    <!-- evidence table -->
+    <nz-col nzSpan="24">
+      <cvc-molecular-profiles-table
+        [variantId]="variant.id"
+        cvcHeight="300px"
+        cvcTitle="{{ variant.name }} Molecular Profiles">
+      </cvc-molecular-profiles-table>
+    </nz-col>
+  </nz-row>
 }
diff --git a/client/src/app/components/variants/variants-table/variants-table.component.html b/client/src/app/components/variants/variants-table/variants-table.component.html
index 9749c4eb6..813443f45 100644
--- a/client/src/app/components/variants/variants-table/variants-table.component.html
+++ b/client/src/app/components/variants/variants-table/variants-table.component.html
@@ -152,7 +152,7 @@
             <span
               nz-typography
               nzType="secondary">
-              {{ variant.category }}
+              {{ variant.category | titlecase }}
             </span>
           </td>
           <td>
@@ -167,7 +167,7 @@
           <td>
             <cvc-plain-tag-overflow
               [maxDisplayCount]="1"
-              [tags]="variant.aliases | pluck : 'name'"
+              [tags]="variant.aliases | pluck: 'name'"
               [matchingText]="variantAliasInput"></cvc-plain-tag-overflow>
           </td>
           <td>
diff --git a/client/src/app/forms/config/factor-variant-revise/variant-revise.form.config.ts b/client/src/app/forms/config/factor-variant-revise/variant-revise.form.config.ts
deleted file mode 100644
index ff35f4cf3..000000000
--- a/client/src/app/forms/config/factor-variant-revise/variant-revise.form.config.ts
+++ /dev/null
@@ -1,366 +0,0 @@
-import { AbstractControl } from '@angular/forms'
-import { Chromosomes } from '@app/forms/utilities/input-formatters'
-import { geneVariantReviseFormInitialModel } from '@app/forms/models/gene-variant-revise.model'
-import assignFieldConfigDefaultValues from '@app/forms/utilities/assign-field-default-values'
-import { CvcFormCardWrapperProps } from '@app/forms/wrappers/form-card/form-card.wrapper'
-import { CvcFormLayoutWrapperProps } from '@app/forms/wrappers/form-layout/form-layout.wrapper'
-import { FormlyFieldConfig } from '@ngx-formly/core'
-import { CvcFormRowWrapperProps } from '@app/forms/wrappers/form-row/form-row.wrapper'
-import { CvcOrgSubmitButtonFieldConfig } from '@app/forms/types/org-submit-button/org-submit-button.type'
-
-const formFieldConfig: FormlyFieldConfig[] = [
-  {
-    wrappers: ['form-layout'],
-    props: <CvcFormLayoutWrapperProps>{
-      showDevPanel: false,
-    },
-    fieldGroup: [
-      {
-        key: 'clientMutationId',
-        props: {
-          hidden: true,
-        },
-      },
-      {
-        key: 'fields',
-        wrappers: ['form-card'],
-        props: <CvcFormCardWrapperProps>{
-          formCardOptions: { title: 'Revise Variant' },
-        },
-        fieldGroup: [
-          {
-            wrappers: ['form-row'],
-            props: <CvcFormRowWrapperProps>{
-              formRowOptions: {
-                responsiveIndexed: [
-                  { xs: 24, md: 12, lg: 8 },
-                  { xs: 24, md: 12, lg: 8 },
-                  { xs: 24, lg: 8 },
-                ],
-              },
-            },
-            fieldGroup: [
-              {
-                key: 'featureId',
-                type: 'feature-select',
-                props: {
-                  description: 'Enter an Entrez Gene for this Variant',
-                  required: true,
-                },
-              },
-              {
-                key: 'name',
-                type: 'base-input',
-                props: {
-                  placeholder: 'Enter a name for this Variant',
-                  description:
-                    "Enter the name of the Variant according to the <a href='https://civic.readthedocs.io/en/latest/model/variants/name.html#curating-variant-names' target='blank'>Variant Curation SOP</a>",
-                  label: 'Name',
-                  required: true,
-                  rows: 1,
-                },
-              },
-              {
-                key: 'aliases',
-                type: 'tag-multi-input',
-                props: {
-                  label: 'Aliases',
-                  description:
-                    'List any aliases commonly used to refer to this Variant',
-                  placeholder: 'Enter Alias and hit return',
-                },
-              },
-            ],
-          },
-          {
-            wrappers: ['form-row'],
-            props: <CvcFormRowWrapperProps>{
-              formRowOptions: {
-                responsiveIndexed: [
-                  { xs: 24, lg: 12, xl: 6, xxl: 8 },
-                  { xs: 24, lg: 12, xl: 6, xxl: 8 },
-                  { xs: 24, xl: 12, xxl: 8 },
-                ],
-              },
-            },
-            fieldGroup: [
-              {
-                key: 'hgvsDescriptions',
-                type: 'tag-multi-input',
-                props: {
-                  label: 'HGVS Descriptions',
-                  description:
-                    'Enter any HGVS nomenclature descriptions of this Variant',
-                  tooltip:
-                    'Human Genome Variation Society nomenclature descriptions',
-                  placeholder: 'Enter HGVS and hit return',
-                },
-              },
-              {
-                key: 'variantTypeIds',
-                type: 'variant-type-multi-select',
-              },
-              {
-                key: 'clinvarIds',
-                type: 'clinvar-multi-input',
-                wrappers: ['form-field'],
-                props: {
-                  label: 'ClinVar IDs',
-                },
-              },
-            ],
-          },
-          {
-            wrappers: ['form-row'],
-            props: <CvcFormRowWrapperProps>{
-              formRowOptions: {
-                span: 24,
-              },
-            },
-            fieldGroup: [
-              {
-                wrappers: ['form-card'],
-                props: <CvcFormCardWrapperProps>{
-                  formCardOptions: {
-                    title: `Primary (5') Coordinates`,
-                    size: 'small',
-                  },
-                },
-                fieldGroup: [
-                  {
-                    wrappers: ['form-row'],
-                    props: <CvcFormRowWrapperProps>{
-                      formRowOptions: {
-                        responsive: { xs: 24, md: 12, lg: 8, xxl: 6 },
-                      },
-                    },
-                    fieldGroup: [
-                      {
-                        key: 'referenceBuild',
-                        type: 'reference-build-select',
-                      },
-                      {
-                        key: 'ensemblVersion',
-                        type: 'base-input',
-                        validators: {
-                          nccnVersionNumber: {
-                            expression: (c: AbstractControl) =>
-                              c.value ? /^\d{2,3}$/.test(c.value) : true,
-                            message: (_: any, field: FormlyFieldConfig) =>
-                              `"${field.formControl?.value}" does not appear to be an Ensembl version number`,
-                          },
-                        },
-                        props: {
-                          label: 'Ensembl Version',
-                          description:
-                            'Enter a valid Ensembl database version (e.g. 75)',
-                        },
-                      },
-                      {
-                        key: 'referenceBases',
-                        type: 'base-input',
-                        validators: {
-                          nccnVersionNumber: {
-                            expression: (c: AbstractControl) =>
-                              c.value ? /^[ACTG\\]+$/.test(c.value) : true,
-                            message: (_: any, field: FormlyFieldConfig) =>
-                              `"${field.formControl?.value}" contains invalid characters.`,
-                          },
-                        },
-                        props: {
-                          label: 'Reference Bases',
-                          description:
-                            'The nucleotide(s) of the reference genome affected by the variant. Only used for SNVs and Indels (otherwise leave blank)',
-                        },
-                      },
-                      {
-                        key: 'variantBases',
-                        type: 'base-input',
-                        validators: {
-                          nccnVersionNumber: {
-                            expression: (c: AbstractControl) =>
-                              c.value ? /^[ACTG\\]+$/.test(c.value) : true,
-                            message: (_: any, field: FormlyFieldConfig) =>
-                              `"${field.formControl?.value}" contains invalid characters.`,
-                          },
-                        },
-                        props: {
-                          label: 'Variant Bases',
-                          description:
-                            'The nucleotide(s) of the variant allele. Only used for SNVs and Indels (otherwise leave blank)',
-                        },
-                      },
-                      {
-                        key: 'chromosome',
-                        type: 'base-select',
-                        props: {
-                          label: 'Chromosome',
-                          options: Chromosomes,
-                          description:
-                            'Specify the chromosome in which this variant occurs (e.g. 17).',
-                        },
-                      },
-                      {
-                        key: 'start',
-                        type: 'base-input',
-                        validators: {
-                          isNumeric: {
-                            expression: (c: AbstractControl) =>
-                              c.value ? /^\d+$/.test(c.value) : true,
-                            message: (_: any, field: FormlyFieldConfig) =>
-                              'Start coordinate must be numeric',
-                          },
-                        },
-                        props: {
-                          label: 'Start',
-                          description:
-                            'Enter the left/first coordinate of this variant. Must be ≤ the Stop coordinate. Coordinate must be compatible with the selected reference build.',
-                        },
-                      },
-                      {
-                        key: 'stop',
-                        type: 'base-input',
-                        validators: {
-                          isNumeric: {
-                            expression: (c: AbstractControl) =>
-                              c.value ? /^\d+$/.test(c.value) : true,
-                            message: (_: any, field: FormlyFieldConfig) =>
-                              'Stop coordinate must be numeric',
-                          },
-                        },
-                        props: {
-                          label: 'Stop',
-                          description:
-                            'Provide the right/second coordinate of this variant. Must be ≥ the Start coordinate. Coordinate must be compatible with the selected reference build.',
-                        },
-                      },
-                      {
-                        key: 'representativeTranscript',
-                        type: 'base-input',
-                        props: {
-                          label: 'Representative Transcript',
-                          description:
-                            'Specify a transcript ID, including version number (e.g. ENST00000348159.4, the canonical transcript defined by Ensembl).',
-                        },
-                      },
-                    ],
-                  },
-                ],
-              },
-              {
-                wrappers: ['form-card'],
-                props: <CvcFormCardWrapperProps>{
-                  formCardOptions: {
-                    title: `Secondary (3') Coordinates`,
-                    size: 'small',
-                  },
-                },
-                fieldGroup: [
-                  {
-                    wrappers: ['form-row'],
-                    props: <CvcFormRowWrapperProps>{
-                      formRowOptions: {
-                        responsive: { xs: 24, md: 12, lg: 8, xxl: 6 },
-                      },
-                    },
-                    fieldGroup: [
-                      {
-                        key: 'chromosome2',
-                        type: 'base-select',
-                        props: {
-                          label: 'Chromosome',
-                          options: Chromosomes,
-                          description:
-                            'If this variant is a fusion (e.g. BCR-ABL1), specify the chromosome name, coordinates, and representative transcript for the 3-prime partner.',
-                        },
-                      },
-                      {
-                        key: 'start2',
-                        type: 'base-input',
-                        validators: {
-                          isNumeric: {
-                            expression: (c: AbstractControl) =>
-                              c.value ? /^\d+$/.test(c.value) : true,
-                            message: (_: any, field: FormlyFieldConfig) =>
-                              'Start coordinate must be numeric',
-                          },
-                        },
-                        props: {
-                          label: 'Start',
-                          description:
-                            'Enter the left/first coordinate of this 3-prime partner fusion variant. Must be ≤ the Stop coordinate. Coordinate must be compatible with the selected reference build.',
-                        },
-                      },
-                      {
-                        key: 'stop2',
-                        type: 'base-input',
-                        validators: {
-                          isNumeric: {
-                            expression: (c: AbstractControl) =>
-                              c.value ? /^\d+$/.test(c.value) : true,
-                            message: (_: any, field: FormlyFieldConfig) =>
-                              'Stop coordinate must be numeric',
-                          },
-                        },
-                        props: {
-                          label: 'Stop',
-                          description:
-                            'Provide the right/second coordinate of this 3-prime partner fusion variant. Must be ≥ the Start coordinate. Coordinate must be compatible with the selected reference build.',
-                        },
-                      },
-                      {
-                        key: 'representativeTranscript2',
-                        type: 'base-input',
-                        props: {
-                          label: 'Representative Transcript',
-                          description:
-                            'Specify a transcript ID, including version number (e.g. ENST00000348159.4, the canonical transcript defined by Ensembl).',
-                        },
-                      },
-                    ],
-                  },
-                ],
-              },
-            ],
-          },
-        ],
-      },
-      {
-        wrappers: ['form-row'],
-        props: <CvcFormRowWrapperProps>{
-          formRowOptions: {
-            spanIndexed: [24, 12, 12],
-          },
-        },
-        fieldGroup: [
-          {
-            key: 'comment',
-            type: 'base-textarea',
-            props: {
-              label: 'Comment',
-              placeholder: 'Please enter a comment describing your revisions.',
-              required: true,
-              minLength: 10,
-            },
-          },
-          {
-            type: 'cvc-cancel-button',
-          },
-          <CvcOrgSubmitButtonFieldConfig>{
-            key: 'organizationId',
-            type: 'org-submit-button',
-            props: {
-              submitLabel: 'Submit Variant Revisions',
-              align: 'right',
-            },
-          },
-        ],
-      },
-    ],
-  },
-]
-export const geneVariantReviseFields: FormlyFieldConfig[] =
-  assignFieldConfigDefaultValues(
-    formFieldConfig,
-    geneVariantReviseFormInitialModel
-  )
diff --git a/server/app/models/variant.rb b/server/app/models/variant.rb
index 4d7e36242..a4cc30892 100644
--- a/server/app/models/variant.rb
+++ b/server/app/models/variant.rb
@@ -138,10 +138,26 @@ def feature_type_matches_variant_type
   end
 
   def editable_fields
+    unique_editable_fields + shared_editable_fields
+  end
+
+  def shared_editable_fields
+    [
+      :feature_id,
+      :name,
+      :variant_type_ids,
+      :variant_alias_ids,
+    ]
+  end
+
+  def unique_editable_fields
     raise StandardError.new("Implement in Variant subclass")
   end
 
   def forbidden_fields
+    #Grab the editable fields from each variant subclass, except the current one
+    #Combine their editable fields into a list, and remove the editable fields of the current type
+    #This produces a list of fields that should not be populated on this variant type
     other_editable_fields = Variant.known_subclasses
       .reject { |c| self.is_a?(c) }
       .flat_map { |c| c.new.editable_fields }
diff --git a/server/app/models/variants/factor_variant.rb b/server/app/models/variants/factor_variant.rb
index 6ad7761f8..7b946a8ac 100644
--- a/server/app/models/variants/factor_variant.rb
+++ b/server/app/models/variants/factor_variant.rb
@@ -1,11 +1,8 @@
 module Variants
   class FactorVariant < Variant
-    def editable_fields
+    def unique_editable_fields
       [
-        :feature_id,
-        :name,
         :ncit_id,
-        :variant_type_ids,
       ]
     end
 
diff --git a/server/app/models/variants/gene_variant.rb b/server/app/models/variants/gene_variant.rb
index be9271420..8d9d33f04 100644
--- a/server/app/models/variants/gene_variant.rb
+++ b/server/app/models/variants/gene_variant.rb
@@ -17,14 +17,10 @@ class GeneVariant < Variant
       message: "only allows A,C,T,G or /"
     }, allow_nil: true
 
-    def editable_fields
+    def unique_editable_fields
       [
-        :feature_id,
-        :name,
-        :variant_alias_ids,
         :hgvs_description_ids,
         :clinvar_entry_ids,
-        :variant_type_ids,
         :reference_build,
         :ensembl_version,
         :chromosome,

From 81115aaf2b7d2d498bd8a241b737a2fc1bf1800c Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Thu, 28 Mar 2024 11:17:54 -0500
Subject: [PATCH 113/125] fix some cache lookup issues with new variant types

---
 .../event-timeline-item.component.html        |   7 +-
 .../app/core/pipes/typename-to-icon.pipe.ts   |   3 +
 .../app/core/utilities/get-entity-color.ts    |   2 +
 .../feature-select/feature-select.type.html   |   2 +-
 .../feature-select/feature-select.type.ts     |  12 +-
 .../mp-finder/mp-finder.component.ts          |  16 +-
 .../variant-select/variant-select.query.gql   |  10 +-
 .../src/app/generated/civic.apollo-helpers.ts |  21 +++
 client/src/app/generated/civic.apollo.ts      |  62 +++++--
 client/src/app/generated/server.model.graphql |  53 +++++-
 client/src/app/generated/server.schema.json   | 154 +++++++++++++++++-
 server/app/graphql/resolvers/variants.rb      |   2 +-
 12 files changed, 311 insertions(+), 33 deletions(-)

diff --git a/client/src/app/components/events/event-timeline-item/event-timeline-item.component.html b/client/src/app/components/events/event-timeline-item/event-timeline-item.component.html
index 2e018ae9b..050a468ca 100644
--- a/client/src/app/components/events/event-timeline-item/event-timeline-item.component.html
+++ b/client/src/app/components/events/event-timeline-item/event-timeline-item.component.html
@@ -12,7 +12,7 @@
       *ngIf="tagDisplay != 'hideUser'"></cvc-user-tag>
 
     <!-- verb -->
-    <span nz-typography>{{ event.action | eventVerbiage : 'feed' }}&nbsp;</span>
+    <span nz-typography>{{ event.action | eventVerbiage: 'feed' }}&nbsp;</span>
 
     <!-- originating object -->
     <ng-container *ngIf="event.originatingObject as object">
@@ -76,7 +76,10 @@
         *ngSwitchCase="'EvidenceItem'"
         [evidence]="subject"></cvc-evidence-tag>
       <cvc-feature-variant-tag
-        *ngSwitchCase="'Variant'"
+        *ngSwitchCase="'GeneVariant'"
+        [variant]="subject"></cvc-feature-variant-tag>
+      <cvc-feature-variant-tag
+        *ngSwitchCase="'FactorVariant'"
         [variant]="subject"></cvc-feature-variant-tag>
       <cvc-revision-tag
         *ngSwitchCase="'Revision'"
diff --git a/client/src/app/core/pipes/typename-to-icon.pipe.ts b/client/src/app/core/pipes/typename-to-icon.pipe.ts
index 6f29af068..6c9cfb58f 100644
--- a/client/src/app/core/pipes/typename-to-icon.pipe.ts
+++ b/client/src/app/core/pipes/typename-to-icon.pipe.ts
@@ -8,6 +8,9 @@ import { Maybe } from '@app/generated/civic.apollo'
 export class TypenameToIconPipe implements PipeTransform {
   transform(value: Maybe<string>): string {
     if (!value) return ''
+    if (value.endsWith('Variant')) {
+      return 'civic-variant'
+    }
     return `civic-${value.replace(/_/g, '').toLowerCase()}`
   }
 }
diff --git a/client/src/app/core/utilities/get-entity-color.ts b/client/src/app/core/utilities/get-entity-color.ts
index 4f83ffae5..4e6ae1218 100644
--- a/client/src/app/core/utilities/get-entity-color.ts
+++ b/client/src/app/core/utilities/get-entity-color.ts
@@ -14,6 +14,8 @@ export const EntityColors = new Map<string, string>([
   ['Source', '#f9ba45'],
   ['Therapy', '#ac3996'],
   ['Variant', '#74d34c'],
+  ['GeneVariant', '#74d34c'],
+  ['FactorVariant', '#74d34c'],
   ['VariantGroup', '#74d34c'],
   ['VariantType', '#74d34c'],
 
diff --git a/client/src/app/forms/types/feature-select/feature-select.type.html b/client/src/app/forms/types/feature-select/feature-select.type.html
index 5e9caaa09..ef8a65f20 100644
--- a/client/src/app/forms/types/feature-select/feature-select.type.html
+++ b/client/src/app/forms/types/feature-select/feature-select.type.html
@@ -5,7 +5,7 @@
       <nz-select
         [disabled]="!props.canChangeFeatureType"
         [(ngModel)]="selectedFeatureType"
-        (ngModelChange)="this.onFeatureType$?.next($event)">
+        (ngModelChange)="this.onFeatureType$.next($event)">
         <nz-option
           nzValue="GENE"
           nzLabel="Gene"></nz-option>
diff --git a/client/src/app/forms/types/feature-select/feature-select.type.ts b/client/src/app/forms/types/feature-select/feature-select.type.ts
index a47644d71..cfd137d72 100644
--- a/client/src/app/forms/types/feature-select/feature-select.type.ts
+++ b/client/src/app/forms/types/feature-select/feature-select.type.ts
@@ -32,7 +32,8 @@ import { FormlyFieldProps } from '@ngx-formly/ng-zorro-antd/form-field'
 import { NzSelectOptionInterface } from 'ng-zorro-antd/select'
 import mixin from 'ts-mixin-extended'
 import { FeatureIdWithCreationStatus } from './feature-quick-add/feature-quick-add.form'
-import { BehaviorSubject } from 'rxjs'
+import { BehaviorSubject, Subscription } from 'rxjs'
+import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy'
 
 export type CvcFeatureSelectFieldOption = Partial<
   FieldTypeConfig<Partial<CvcFeatureSelectFieldProps>>
@@ -67,6 +68,7 @@ const FeatureSelectMixin = mixin(
   >()
 )
 
+@UntilDestroy()
 @Component({
   selector: 'cvc-feature-select',
   templateUrl: './feature-select.type.html',
@@ -94,7 +96,7 @@ export class CvcFeatureSelectField
   optionTemplates?: QueryList<TemplateRef<any>>
 
   selectedFeatureType?: FeatureInstanceTypes = this.props.featureType
-  onFeatureType$?: BehaviorSubject<Maybe<FeatureInstanceTypes>> =
+  onFeatureType$: BehaviorSubject<Maybe<FeatureInstanceTypes>> =
     new BehaviorSubject<Maybe<FeatureInstanceTypes>>(undefined)
 
   constructor(
@@ -107,6 +109,12 @@ export class CvcFeatureSelectField
 
   ngAfterViewInit(): void {
     this.selectedFeatureType = this.props.featureType
+    if (this.props.featureTypeCallback) {
+      this.onFeatureType$
+        .pipe(untilDestroyed(this))
+        .subscribe((ft) => this.props.featureTypeCallback(ft))
+      this.onFeatureType$.next(this.selectedFeatureType)
+    }
     this.configureBaseField() // mixin fn
     this.configureEntitySelectField({
       // mixin fn
diff --git a/client/src/app/forms/types/molecular-profile-select/mp-finder/mp-finder.component.ts b/client/src/app/forms/types/molecular-profile-select/mp-finder/mp-finder.component.ts
index 61caeb843..6c6cde0ec 100644
--- a/client/src/app/forms/types/molecular-profile-select/mp-finder/mp-finder.component.ts
+++ b/client/src/app/forms/types/molecular-profile-select/mp-finder/mp-finder.component.ts
@@ -7,7 +7,11 @@ import {
 import { UntypedFormGroup } from '@angular/forms'
 import { EntityFieldSubjectMap } from '@app/forms/states/base.state'
 import { CvcFormRowWrapperProps } from '@app/forms/wrappers/form-row/form-row.wrapper'
-import { MolecularProfile, Variant } from '@app/generated/civic.apollo'
+import {
+  CreateableFeatureTypes,
+  MolecularProfile,
+  Variant,
+} from '@app/generated/civic.apollo'
 import { FormlyFieldConfig, FormlyFormOptions } from '@ngx-formly/core'
 import { Apollo, gql } from 'apollo-angular'
 import { Maybe } from 'graphql/jsutils/Maybe'
@@ -15,6 +19,7 @@ import { NzFormLayoutType } from 'ng-zorro-antd/form'
 import { BehaviorSubject } from 'rxjs'
 import { tag } from 'rxjs-spy/operators'
 import { CvcVariantSelectFieldOption } from '../../variant-select/variant-select.type'
+import { EnumToTitlePipe } from '@app/core/pipes/enum-to-title-pipe'
 
 type MpFinderModel = {
   featureId?: number
@@ -40,6 +45,7 @@ export class MpFinderComponent {
   model: MpFinderModel
   form: UntypedFormGroup
   config: FormlyFieldConfig[]
+  featureType?: CreateableFeatureTypes
 
   finderState: MpFinderState = {
     formLayout: 'horizontal',
@@ -76,6 +82,9 @@ export class MpFinderComponent {
               showExtra: false,
               showErrorTip: false,
               required: true,
+              featureTypeCallback: (ft: CreateableFeatureTypes) => {
+                this.featureType = ft
+              },
             },
           },
           <CvcVariantSelectFieldOption>{
@@ -110,10 +119,11 @@ export class MpFinderComponent {
 
   getSelectedVariant(variantId: Maybe<number>): Maybe<Variant> {
     if (!variantId) return
+    const feature = new EnumToTitlePipe().transform(this.featureType)
     const fragment = {
-      id: `Variant:${variantId}`,
+      id: `${feature}Variant:${variantId}`,
       fragment: gql`
-        fragment VariantSelectQuery on Variant {
+        fragment VariantSelectQuery on ${feature}Variant {
           id
           name
           link
diff --git a/client/src/app/forms/types/variant-select/variant-select.query.gql b/client/src/app/forms/types/variant-select/variant-select.query.gql
index 26271c7c0..acb4cfe10 100644
--- a/client/src/app/forms/types/variant-select/variant-select.query.gql
+++ b/client/src/app/forms/types/variant-select/variant-select.query.gql
@@ -14,7 +14,15 @@ query VariantSelectTypeahead($name: String!, $featureId: Int) {
 
 query VariantSelectTag($variantId: Int!) {
   variant(id: $variantId) {
-    ...VariantSelectTypeaheadFields
+    ... on Variant {
+      ...VariantSelectTypeaheadFields
+    }
+    ... on GeneVariant {
+      ...VariantSelectTypeaheadFields
+    }
+    ... on FactorVariant {
+      ...VariantSelectTypeaheadFields
+    }
   }
 }
 
diff --git a/client/src/app/generated/civic.apollo-helpers.ts b/client/src/app/generated/civic.apollo-helpers.ts
index 457a3aa10..6394bf40e 100644
--- a/client/src/app/generated/civic.apollo-helpers.ts
+++ b/client/src/app/generated/civic.apollo-helpers.ts
@@ -2125,6 +2125,19 @@ export type VariantAliasKeySpecifier = ('name' | VariantAliasKeySpecifier)[];
 export type VariantAliasFieldPolicy = {
 	name?: FieldPolicy<any> | FieldReadFunction<any>
 };
+export type VariantConnectionKeySpecifier = ('edges' | 'nodes' | 'pageCount' | 'pageInfo' | 'totalCount' | VariantConnectionKeySpecifier)[];
+export type VariantConnectionFieldPolicy = {
+	edges?: FieldPolicy<any> | FieldReadFunction<any>,
+	nodes?: FieldPolicy<any> | FieldReadFunction<any>,
+	pageCount?: FieldPolicy<any> | FieldReadFunction<any>,
+	pageInfo?: FieldPolicy<any> | FieldReadFunction<any>,
+	totalCount?: FieldPolicy<any> | FieldReadFunction<any>
+};
+export type VariantEdgeKeySpecifier = ('cursor' | 'node' | VariantEdgeKeySpecifier)[];
+export type VariantEdgeFieldPolicy = {
+	cursor?: FieldPolicy<any> | FieldReadFunction<any>,
+	node?: FieldPolicy<any> | FieldReadFunction<any>
+};
 export type VariantGroupKeySpecifier = ('comments' | 'description' | 'events' | 'flagged' | 'flags' | 'id' | 'lastAcceptedRevisionEvent' | 'lastCommentEvent' | 'lastSubmittedRevisionEvent' | 'link' | 'name' | 'revisions' | 'sources' | 'variants' | VariantGroupKeySpecifier)[];
 export type VariantGroupFieldPolicy = {
 	comments?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -3038,6 +3051,14 @@ export type StrictTypedTypePolicies = {
 		keyFields?: false | VariantAliasKeySpecifier | (() => undefined | VariantAliasKeySpecifier),
 		fields?: VariantAliasFieldPolicy,
 	},
+	VariantConnection?: Omit<TypePolicy, "fields" | "keyFields"> & {
+		keyFields?: false | VariantConnectionKeySpecifier | (() => undefined | VariantConnectionKeySpecifier),
+		fields?: VariantConnectionFieldPolicy,
+	},
+	VariantEdge?: Omit<TypePolicy, "fields" | "keyFields"> & {
+		keyFields?: false | VariantEdgeKeySpecifier | (() => undefined | VariantEdgeKeySpecifier),
+		fields?: VariantEdgeFieldPolicy,
+	},
 	VariantGroup?: Omit<TypePolicy, "fields" | "keyFields"> & {
 		keyFields?: false | VariantGroupKeySpecifier | (() => undefined | VariantGroupKeySpecifier),
 		fields?: VariantGroupFieldPolicy,
diff --git a/client/src/app/generated/civic.apollo.ts b/client/src/app/generated/civic.apollo.ts
index 3554e1a5d..7d776a240 100644
--- a/client/src/app/generated/civic.apollo.ts
+++ b/client/src/app/generated/civic.apollo.ts
@@ -1952,7 +1952,7 @@ export type Factor = Commentable & EventOriginObject & EventSubject & Flaggable
   revisions: RevisionConnection;
   sources: Array<Source>;
   /** List and filter variants. */
-  variants: VariantInterfaceConnection;
+  variants: VariantConnection;
 };
 
 
@@ -2172,7 +2172,7 @@ export type Feature = Commentable & EventOriginObject & EventSubject & Flaggable
   revisions: RevisionConnection;
   sources: Array<Source>;
   /** List and filter variants. */
-  variants: VariantInterfaceConnection;
+  variants: VariantConnection;
 };
 
 
@@ -2478,7 +2478,7 @@ export type Gene = Commentable & EventOriginObject & EventSubject & Flaggable &
   revisions: RevisionConnection;
   sources: Array<Source>;
   /** List and filter variants. */
-  variants: VariantInterfaceConnection;
+  variants: VariantConnection;
 };
 
 
@@ -6281,6 +6281,21 @@ export type VariantComponent = {
   variantId: Scalars['Int'];
 };
 
+/** The connection type for Variant. */
+export type VariantConnection = {
+  __typename: 'VariantConnection';
+  /** A list of edges. */
+  edges: Array<VariantEdge>;
+  /** A list of nodes. */
+  nodes: Array<Variant>;
+  /** Total number of pages, based on filtered count and pagesize. */
+  pageCount: Scalars['Int'];
+  /** Information to aid in pagination. */
+  pageInfo: PageInfo;
+  /** The total number of records in this filtered collection. */
+  totalCount: Scalars['Int'];
+};
+
 export enum VariantDeprecationReason {
   Duplicate = 'DUPLICATE',
   FeatureDeprecated = 'FEATURE_DEPRECATED',
@@ -6288,6 +6303,15 @@ export enum VariantDeprecationReason {
   Other = 'OTHER'
 }
 
+/** An edge in a connection. */
+export type VariantEdge = {
+  __typename: 'VariantEdge';
+  /** A cursor for use in pagination. */
+  cursor: Scalars['String'];
+  /** The item at the end of the edge. */
+  node?: Maybe<Variant>;
+};
+
 export type VariantGroup = Commentable & EventSubject & Flaggable & WithRevisions & {
   __typename: 'VariantGroup';
   /** List and filter comments. */
@@ -6308,7 +6332,7 @@ export type VariantGroup = Commentable & EventSubject & Flaggable & WithRevision
   revisions: RevisionConnection;
   sources: Array<Source>;
   /** List and filter variants. */
-  variants: VariantInterfaceConnection;
+  variants: VariantConnection;
 };
 
 
@@ -6933,9 +6957,9 @@ export type FeaturePopoverQueryVariables = Exact<{
 }>;
 
 
-export type FeaturePopoverQuery = { __typename: 'Query', feature?: { __typename: 'Feature', id: number, name: string, featureAliases: Array<string>, featureInstance: { __typename: 'Factor' } | { __typename: 'Gene' }, variants: { __typename: 'VariantInterfaceConnection', totalCount: number }, flags: { __typename: 'FlagConnection', totalCount: number } } | undefined };
+export type FeaturePopoverQuery = { __typename: 'Query', feature?: { __typename: 'Feature', id: number, name: string, featureAliases: Array<string>, featureInstance: { __typename: 'Factor' } | { __typename: 'Gene' }, variants: { __typename: 'VariantConnection', totalCount: number }, flags: { __typename: 'FlagConnection', totalCount: number } } | undefined };
 
-export type FeaturePopoverFragment = { __typename: 'Feature', id: number, name: string, featureAliases: Array<string>, featureInstance: { __typename: 'Factor' } | { __typename: 'Gene' }, variants: { __typename: 'VariantInterfaceConnection', totalCount: number }, flags: { __typename: 'FlagConnection', totalCount: number } };
+export type FeaturePopoverFragment = { __typename: 'Feature', id: number, name: string, featureAliases: Array<string>, featureInstance: { __typename: 'Factor' } | { __typename: 'Gene' }, variants: { __typename: 'VariantConnection', totalCount: number }, flags: { __typename: 'FlagConnection', totalCount: number } };
 
 export type BrowseFeaturesQueryVariables = Exact<{
   featureName?: InputMaybe<Scalars['String']>;
@@ -7378,9 +7402,9 @@ export type VariantGroupPopoverQueryVariables = Exact<{
 }>;
 
 
-export type VariantGroupPopoverQuery = { __typename: 'Query', variantGroup?: { __typename: 'VariantGroup', id: number, name: string, description: string, variants: { __typename: 'VariantInterfaceConnection', edges: Array<{ __typename: 'VariantInterfaceEdge', node?: { __typename: 'FactorVariant', id: number, name: string, link: string, deprecated: boolean, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'GeneVariant', id: number, name: string, link: string, deprecated: boolean, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean, feature: { __typename: 'Feature', id: number, name: string, link: string } } | undefined }> }, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, sourceType: SourceSource, link: string }> } | undefined };
+export type VariantGroupPopoverQuery = { __typename: 'Query', variantGroup?: { __typename: 'VariantGroup', id: number, name: string, description: string, variants: { __typename: 'VariantConnection', edges: Array<{ __typename: 'VariantEdge', node?: { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean, feature: { __typename: 'Feature', id: number, name: string, link: string } } | undefined }> }, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, sourceType: SourceSource, link: string }> } | undefined };
 
-export type VariantGroupPopoverFieldsFragment = { __typename: 'VariantGroup', id: number, name: string, description: string, variants: { __typename: 'VariantInterfaceConnection', edges: Array<{ __typename: 'VariantInterfaceEdge', node?: { __typename: 'FactorVariant', id: number, name: string, link: string, deprecated: boolean, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'GeneVariant', id: number, name: string, link: string, deprecated: boolean, feature: { __typename: 'Feature', id: number, name: string, link: string } } | { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean, feature: { __typename: 'Feature', id: number, name: string, link: string } } | undefined }> }, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, sourceType: SourceSource, link: string }> };
+export type VariantGroupPopoverFieldsFragment = { __typename: 'VariantGroup', id: number, name: string, description: string, variants: { __typename: 'VariantConnection', edges: Array<{ __typename: 'VariantEdge', node?: { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean, feature: { __typename: 'Feature', id: number, name: string, link: string } } | undefined }> }, sources: Array<{ __typename: 'Source', id: number, citation?: string | undefined, sourceType: SourceSource, link: string }> };
 
 export type BrowseVariantGroupsQueryVariables = Exact<{
   first?: InputMaybe<Scalars['Int']>;
@@ -7827,9 +7851,9 @@ export type VariantGroupRevisableFieldsQueryVariables = Exact<{
 }>;
 
 
-export type VariantGroupRevisableFieldsQuery = { __typename: 'Query', variantGroup?: { __typename: 'VariantGroup', id: number, name: string, description: string, variants: { __typename: 'VariantInterfaceConnection', totalCount: number, edges: Array<{ __typename: 'VariantInterfaceEdge', cursor: string, node?: { __typename: 'FactorVariant', id: number, name: string, link: string } | { __typename: 'GeneVariant', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined }>, nodes: Array<{ __typename: 'FactorVariant', id: number, name: string, link: string } | { __typename: 'GeneVariant', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string }> }, sources: Array<{ __typename: 'Source', id: number, name: string, link: string }> } | undefined };
+export type VariantGroupRevisableFieldsQuery = { __typename: 'Query', variantGroup?: { __typename: 'VariantGroup', id: number, name: string, description: string, variants: { __typename: 'VariantConnection', totalCount: number, edges: Array<{ __typename: 'VariantEdge', cursor: string, node?: { __typename: 'Variant', id: number, name: string, link: string } | undefined }>, nodes: Array<{ __typename: 'Variant', id: number, name: string, link: string }> }, sources: Array<{ __typename: 'Source', id: number, name: string, link: string }> } | undefined };
 
-export type VariantGroupRevisableFieldsFragment = { __typename: 'VariantGroup', id: number, name: string, description: string, variants: { __typename: 'VariantInterfaceConnection', totalCount: number, edges: Array<{ __typename: 'VariantInterfaceEdge', cursor: string, node?: { __typename: 'FactorVariant', id: number, name: string, link: string } | { __typename: 'GeneVariant', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string } | undefined }>, nodes: Array<{ __typename: 'FactorVariant', id: number, name: string, link: string } | { __typename: 'GeneVariant', id: number, name: string, link: string } | { __typename: 'Variant', id: number, name: string, link: string }> }, sources: Array<{ __typename: 'Source', id: number, name: string, link: string }> };
+export type VariantGroupRevisableFieldsFragment = { __typename: 'VariantGroup', id: number, name: string, description: string, variants: { __typename: 'VariantConnection', totalCount: number, edges: Array<{ __typename: 'VariantEdge', cursor: string, node?: { __typename: 'Variant', id: number, name: string, link: string } | undefined }>, nodes: Array<{ __typename: 'Variant', id: number, name: string, link: string }> }, sources: Array<{ __typename: 'Source', id: number, name: string, link: string }> };
 
 export type SuggestVariantGroupRevisionMutationVariables = Exact<{
   input: SuggestVariantGroupRevisionInput;
@@ -7843,9 +7867,9 @@ export type VariantGroupSubmittableFieldsQueryVariables = Exact<{
 }>;
 
 
-export type VariantGroupSubmittableFieldsQuery = { __typename: 'Query', variantGroup?: { __typename: 'VariantGroup', id: number, name: string, description: string, variants: { __typename: 'VariantInterfaceConnection', nodes: Array<{ __typename: 'FactorVariant', id: number, name: string, link: string, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string } } | { __typename: 'GeneVariant', id: number, name: string, link: string, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string } } | { __typename: 'Variant', id: number, name: string, link: string, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string } }> }, sources: Array<{ __typename: 'Source', id: number, link: string, citation?: string | undefined, sourceType: SourceSource }> } | undefined };
+export type VariantGroupSubmittableFieldsQuery = { __typename: 'Query', variantGroup?: { __typename: 'VariantGroup', id: number, name: string, description: string, variants: { __typename: 'VariantConnection', nodes: Array<{ __typename: 'Variant', id: number, name: string, link: string, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string } }> }, sources: Array<{ __typename: 'Source', id: number, link: string, citation?: string | undefined, sourceType: SourceSource }> } | undefined };
 
-export type SubmittableVariantGroupFieldsFragment = { __typename: 'VariantGroup', id: number, name: string, description: string, variants: { __typename: 'VariantInterfaceConnection', nodes: Array<{ __typename: 'FactorVariant', id: number, name: string, link: string, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string } } | { __typename: 'GeneVariant', id: number, name: string, link: string, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string } } | { __typename: 'Variant', id: number, name: string, link: string, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string } }> }, sources: Array<{ __typename: 'Source', id: number, link: string, citation?: string | undefined, sourceType: SourceSource }> };
+export type SubmittableVariantGroupFieldsFragment = { __typename: 'VariantGroup', id: number, name: string, description: string, variants: { __typename: 'VariantConnection', nodes: Array<{ __typename: 'Variant', id: number, name: string, link: string, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string } }> }, sources: Array<{ __typename: 'Source', id: number, link: string, citation?: string | undefined, sourceType: SourceSource }> };
 
 export type SubmitVariantGroupMutationVariables = Exact<{
   input: SubmitVariantGroupInput;
@@ -8483,9 +8507,9 @@ export type VariantGroupDetailQueryVariables = Exact<{
 }>;
 
 
-export type VariantGroupDetailQuery = { __typename: 'Query', variantGroup?: { __typename: 'VariantGroup', id: number, name: string, variants: { __typename: 'VariantInterfaceConnection', totalCount: number }, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number } } | undefined };
+export type VariantGroupDetailQuery = { __typename: 'Query', variantGroup?: { __typename: 'VariantGroup', id: number, name: string, variants: { __typename: 'VariantConnection', totalCount: number }, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number } } | undefined };
 
-export type VariantGroupDetailFieldsFragment = { __typename: 'VariantGroup', id: number, name: string, variants: { __typename: 'VariantInterfaceConnection', totalCount: number }, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number } };
+export type VariantGroupDetailFieldsFragment = { __typename: 'VariantGroup', id: number, name: string, variants: { __typename: 'VariantConnection', totalCount: number }, flags: { __typename: 'FlagConnection', totalCount: number }, revisions: { __typename: 'RevisionConnection', totalCount: number }, comments: { __typename: 'CommentConnection', totalCount: number } };
 
 export type VariantGroupsSummaryQueryVariables = Exact<{
   variantGroupId: Scalars['Int'];
@@ -15034,7 +15058,15 @@ export const VariantSelectTypeaheadDocument = gql`
 export const VariantSelectTagDocument = gql`
     query VariantSelectTag($variantId: Int!) {
   variant(id: $variantId) {
-    ...VariantSelectTypeaheadFields
+    ... on Variant {
+      ...VariantSelectTypeaheadFields
+    }
+    ... on GeneVariant {
+      ...VariantSelectTypeaheadFields
+    }
+    ... on FactorVariant {
+      ...VariantSelectTypeaheadFields
+    }
   }
 }
     ${VariantSelectTypeaheadFieldsFragmentDoc}`;
diff --git a/client/src/app/generated/server.model.graphql b/client/src/app/generated/server.model.graphql
index 193dbcd93..d773c9ca2 100644
--- a/client/src/app/generated/server.model.graphql
+++ b/client/src/app/generated/server.model.graphql
@@ -3220,7 +3220,7 @@ type Factor implements Commentable & EventOriginObject & EventSubject & Flaggabl
     Left anchored filtering for variant name and aliases.
     """
     name: String
-  ): VariantInterfaceConnection!
+  ): VariantConnection!
 }
 
 """
@@ -3738,7 +3738,7 @@ type Feature implements Commentable & EventOriginObject & EventSubject & Flaggab
     Left anchored filtering for variant name and aliases.
     """
     name: String
-  ): VariantInterfaceConnection!
+  ): VariantConnection!
 }
 
 enum FeatureDeprecationReason {
@@ -4325,7 +4325,7 @@ type Gene implements Commentable & EventOriginObject & EventSubject & Flaggable
     Left anchored filtering for variant name and aliases.
     """
     name: String
-  ): VariantInterfaceConnection!
+  ): VariantConnection!
 }
 
 """
@@ -10424,6 +10424,36 @@ input VariantComponent {
   variantId: Int!
 }
 
+"""
+The connection type for Variant.
+"""
+type VariantConnection {
+  """
+  A list of edges.
+  """
+  edges: [VariantEdge!]!
+
+  """
+  A list of nodes.
+  """
+  nodes: [Variant!]!
+
+  """
+  Total number of pages, based on filtered count and pagesize.
+  """
+  pageCount: Int!
+
+  """
+  Information to aid in pagination.
+  """
+  pageInfo: PageInfo!
+
+  """
+  The total number of records in this filtered collection.
+  """
+  totalCount: Int!
+}
+
 enum VariantDeprecationReason {
   DUPLICATE
   FEATURE_DEPRECATED
@@ -10431,6 +10461,21 @@ enum VariantDeprecationReason {
   OTHER
 }
 
+"""
+An edge in a connection.
+"""
+type VariantEdge {
+  """
+  A cursor for use in pagination.
+  """
+  cursor: String!
+
+  """
+  The item at the end of the edge.
+  """
+  node: Variant
+}
+
 type VariantGroup implements Commentable & EventSubject & Flaggable & WithRevisions {
   """
   List and filter comments.
@@ -10647,7 +10692,7 @@ type VariantGroup implements Commentable & EventSubject & Flaggable & WithRevisi
     Left anchored filtering for variant name and aliases.
     """
     name: String
-  ): VariantInterfaceConnection!
+  ): VariantConnection!
 }
 
 """
diff --git a/client/src/app/generated/server.schema.json b/client/src/app/generated/server.schema.json
index 92fcef24b..d112df061 100644
--- a/client/src/app/generated/server.schema.json
+++ b/client/src/app/generated/server.schema.json
@@ -15974,7 +15974,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "OBJECT",
-                  "name": "VariantInterfaceConnection",
+                  "name": "VariantConnection",
                   "ofType": null
                 }
               },
@@ -17942,7 +17942,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "OBJECT",
-                  "name": "VariantInterfaceConnection",
+                  "name": "VariantConnection",
                   "ofType": null
                 }
               },
@@ -20366,7 +20366,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "OBJECT",
-                  "name": "VariantInterfaceConnection",
+                  "name": "VariantConnection",
                   "ofType": null
                 }
               },
@@ -47244,6 +47244,113 @@
           "enumValues": null,
           "possibleTypes": null
         },
+        {
+          "kind": "OBJECT",
+          "name": "VariantConnection",
+          "description": "The connection type for Variant.",
+          "fields": [
+            {
+              "name": "edges",
+              "description": "A list of edges.",
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "VariantEdge",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "nodes",
+              "description": "A list of nodes.",
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "Variant",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "pageCount",
+              "description": "Total number of pages, based on filtered count and pagesize.",
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "pageInfo",
+              "description": "Information to aid in pagination.",
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "PageInfo",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "totalCount",
+              "description": "The total number of records in this filtered collection.",
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
         {
           "kind": "ENUM",
           "name": "VariantDeprecationReason",
@@ -47279,6 +47386,45 @@
           ],
           "possibleTypes": null
         },
+        {
+          "kind": "OBJECT",
+          "name": "VariantEdge",
+          "description": "An edge in a connection.",
+          "fields": [
+            {
+              "name": "cursor",
+              "description": "A cursor for use in pagination.",
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "node",
+              "description": "The item at the end of the edge.",
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Variant",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
         {
           "kind": "OBJECT",
           "name": "VariantGroup",
@@ -47970,7 +48116,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "OBJECT",
-                  "name": "VariantInterfaceConnection",
+                  "name": "VariantConnection",
                   "ofType": null
                 }
               },
diff --git a/server/app/graphql/resolvers/variants.rb b/server/app/graphql/resolvers/variants.rb
index 89c90d7ff..ccf042021 100644
--- a/server/app/graphql/resolvers/variants.rb
+++ b/server/app/graphql/resolvers/variants.rb
@@ -4,7 +4,7 @@
 class Resolvers::Variants < GraphQL::Schema::Resolver
   include SearchObject.module(:graphql)
 
-  type Types::Interfaces::VariantInterface.connection_type, null: false
+  type Types::Entities::VariantType.connection_type, null: false
 
   description 'List and filter variants.'
 

From f880a5eaf0ae122b9f799a0e725997016fe5dac6 Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Thu, 28 Mar 2024 13:24:55 -0500
Subject: [PATCH 114/125] additional cache fixups

---
 .../entity-tag/entity-tag.component.ts        |  1 +
 .../variantgroup-revise.form.config.ts        |  2 +-
 .../variantgroup-submit.form.config.ts        |  2 +-
 .../feature-select/feature-select.type.ts     | 10 +---
 .../mp-finder/mp-finder.component.ts          | 11 +---
 .../variant-select/variant-select.query.gql   | 12 +----
 .../variant-select/variant-select.type.ts     | 11 ++--
 .../src/app/generated/civic.apollo-helpers.ts |  3 +-
 client/src/app/generated/civic.apollo.ts      | 21 ++++----
 client/src/app/generated/server.model.graphql |  1 +
 client/src/app/generated/server.schema.json   | 53 +++++++++++++++++++
 .../types/queries/typeahead_queries.rb        | 18 +++++++
 12 files changed, 100 insertions(+), 45 deletions(-)

diff --git a/client/src/app/forms/components/entity-tag/entity-tag.component.ts b/client/src/app/forms/components/entity-tag/entity-tag.component.ts
index e644c203e..ad6da2bc6 100644
--- a/client/src/app/forms/components/entity-tag/entity-tag.component.ts
+++ b/client/src/app/forms/components/entity-tag/entity-tag.component.ts
@@ -145,6 +145,7 @@ export class CvcEntityTagComponent implements OnChanges {
       )
       return
     }
+    console.log(typename)
     // get linkable entity
     let fragment = undefined
     if (!this.cvcDisableLink) {
diff --git a/client/src/app/forms/config/variantgroup-revise/variantgroup-revise.form.config.ts b/client/src/app/forms/config/variantgroup-revise/variantgroup-revise.form.config.ts
index 20e155615..a3fc6d4e9 100644
--- a/client/src/app/forms/config/variantgroup-revise/variantgroup-revise.form.config.ts
+++ b/client/src/app/forms/config/variantgroup-revise/variantgroup-revise.form.config.ts
@@ -53,7 +53,7 @@ const formFieldConfig: FormlyFieldConfig[] = [
             props: {
               label: 'Variants',
               required: true,
-              requireGene: false,
+              requireFeature: false,
               showManagerBtn: true,
             },
           },
diff --git a/client/src/app/forms/config/variantgroup-submit/variantgroup-submit.form.config.ts b/client/src/app/forms/config/variantgroup-submit/variantgroup-submit.form.config.ts
index d6c524eb6..917675d29 100644
--- a/client/src/app/forms/config/variantgroup-submit/variantgroup-submit.form.config.ts
+++ b/client/src/app/forms/config/variantgroup-submit/variantgroup-submit.form.config.ts
@@ -56,7 +56,7 @@ const formFieldConfig: FormlyFieldConfig[] = [
               label: 'Variants',
               required: true,
               colSpan: 24,
-              requireGene: false,
+              requireFeature: false,
               showManagerBtn: true,
             },
           },
diff --git a/client/src/app/forms/types/feature-select/feature-select.type.ts b/client/src/app/forms/types/feature-select/feature-select.type.ts
index cfd137d72..bc7d303c5 100644
--- a/client/src/app/forms/types/feature-select/feature-select.type.ts
+++ b/client/src/app/forms/types/feature-select/feature-select.type.ts
@@ -32,8 +32,8 @@ import { FormlyFieldProps } from '@ngx-formly/ng-zorro-antd/form-field'
 import { NzSelectOptionInterface } from 'ng-zorro-antd/select'
 import mixin from 'ts-mixin-extended'
 import { FeatureIdWithCreationStatus } from './feature-quick-add/feature-quick-add.form'
-import { BehaviorSubject, Subscription } from 'rxjs'
-import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy'
+import { BehaviorSubject } from 'rxjs'
+import { UntilDestroy } from '@ngneat/until-destroy'
 
 export type CvcFeatureSelectFieldOption = Partial<
   FieldTypeConfig<Partial<CvcFeatureSelectFieldProps>>
@@ -109,12 +109,6 @@ export class CvcFeatureSelectField
 
   ngAfterViewInit(): void {
     this.selectedFeatureType = this.props.featureType
-    if (this.props.featureTypeCallback) {
-      this.onFeatureType$
-        .pipe(untilDestroyed(this))
-        .subscribe((ft) => this.props.featureTypeCallback(ft))
-      this.onFeatureType$.next(this.selectedFeatureType)
-    }
     this.configureBaseField() // mixin fn
     this.configureEntitySelectField({
       // mixin fn
diff --git a/client/src/app/forms/types/molecular-profile-select/mp-finder/mp-finder.component.ts b/client/src/app/forms/types/molecular-profile-select/mp-finder/mp-finder.component.ts
index 6c6cde0ec..feb0194ce 100644
--- a/client/src/app/forms/types/molecular-profile-select/mp-finder/mp-finder.component.ts
+++ b/client/src/app/forms/types/molecular-profile-select/mp-finder/mp-finder.component.ts
@@ -17,9 +17,7 @@ import { Apollo, gql } from 'apollo-angular'
 import { Maybe } from 'graphql/jsutils/Maybe'
 import { NzFormLayoutType } from 'ng-zorro-antd/form'
 import { BehaviorSubject } from 'rxjs'
-import { tag } from 'rxjs-spy/operators'
 import { CvcVariantSelectFieldOption } from '../../variant-select/variant-select.type'
-import { EnumToTitlePipe } from '@app/core/pipes/enum-to-title-pipe'
 
 type MpFinderModel = {
   featureId?: number
@@ -45,7 +43,6 @@ export class MpFinderComponent {
   model: MpFinderModel
   form: UntypedFormGroup
   config: FormlyFieldConfig[]
-  featureType?: CreateableFeatureTypes
 
   finderState: MpFinderState = {
     formLayout: 'horizontal',
@@ -82,9 +79,6 @@ export class MpFinderComponent {
               showExtra: false,
               showErrorTip: false,
               required: true,
-              featureTypeCallback: (ft: CreateableFeatureTypes) => {
-                this.featureType = ft
-              },
             },
           },
           <CvcVariantSelectFieldOption>{
@@ -119,11 +113,10 @@ export class MpFinderComponent {
 
   getSelectedVariant(variantId: Maybe<number>): Maybe<Variant> {
     if (!variantId) return
-    const feature = new EnumToTitlePipe().transform(this.featureType)
     const fragment = {
-      id: `${feature}Variant:${variantId}`,
+      id: `Variant:${variantId}`,
       fragment: gql`
-        fragment VariantSelectQuery on ${feature}Variant {
+        fragment VariantSelectQuery on Variant {
           id
           name
           link
diff --git a/client/src/app/forms/types/variant-select/variant-select.query.gql b/client/src/app/forms/types/variant-select/variant-select.query.gql
index acb4cfe10..158528a6d 100644
--- a/client/src/app/forms/types/variant-select/variant-select.query.gql
+++ b/client/src/app/forms/types/variant-select/variant-select.query.gql
@@ -1,14 +1,6 @@
 query VariantSelectTypeahead($name: String!, $featureId: Int) {
-  variants(name: $name, featureId: $featureId, first: 50) {
-    totalCount
-    edges {
-      node {
-        ...VariantSelectTypeaheadFields
-      }
-    }
-    nodes {
-      ...VariantSelectTypeaheadFields
-    }
+  variantsTypeahead(queryTerm: $name, featureId: $featureId) {
+    ...VariantSelectTypeaheadFields
   }
 }
 
diff --git a/client/src/app/forms/types/variant-select/variant-select.type.ts b/client/src/app/forms/types/variant-select/variant-select.type.ts
index 86eed9879..223ff938d 100644
--- a/client/src/app/forms/types/variant-select/variant-select.type.ts
+++ b/client/src/app/forms/types/variant-select/variant-select.type.ts
@@ -46,7 +46,7 @@ import {
 } from 'rxjs'
 import mixin from 'ts-mixin-extended'
 
-export interface VariantIdWithCreationStatus  {
+export interface VariantIdWithCreationStatus {
   new: boolean
   id: number
 }
@@ -224,7 +224,7 @@ export class CvcVariantSelectField
   }
 
   getTypeaheadResultsFn(r: ApolloQueryResult<VariantSelectTypeaheadQuery>) {
-    return r.data.variants.nodes
+    return r.data.variantsTypeahead
   }
 
   getTagQueryVarsFn(id: number): VariantSelectTagQueryVariables {
@@ -269,7 +269,7 @@ export class CvcVariantSelectField
 
   onSelectOrCreate(variant: VariantIdWithCreationStatus) {
     this.onPopulate$.next(variant.id)
-    if(this.props.isNewlyCreatedCallback) {
+    if (this.props.isNewlyCreatedCallback) {
       this.props.isNewlyCreatedCallback(variant.new)
     }
   }
@@ -291,7 +291,10 @@ export class CvcVariantSelectField
       // id provided, so fetch its name and update the placeholder string.
       // lastValueFrom is used b/c fetch could return 'loading' events
       lastValueFrom(
-        this.featureQuery.fetch({ featureId: fid }, { fetchPolicy: 'cache-first' })
+        this.featureQuery.fetch(
+          { featureId: fid },
+          { fetchPolicy: 'cache-first' }
+        )
       ).then(({ data }) => {
         if (!data?.feature?.name) {
           console.error(
diff --git a/client/src/app/generated/civic.apollo-helpers.ts b/client/src/app/generated/civic.apollo-helpers.ts
index 6394bf40e..691c749de 100644
--- a/client/src/app/generated/civic.apollo-helpers.ts
+++ b/client/src/app/generated/civic.apollo-helpers.ts
@@ -1536,7 +1536,7 @@ export type PhenotypePopoverFieldPolicy = {
 	name?: FieldPolicy<any> | FieldReadFunction<any>,
 	url?: FieldPolicy<any> | FieldReadFunction<any>
 };
-export type QueryKeySpecifier = ('acmgCode' | 'acmgCodesTypeahead' | 'activities' | 'activity' | 'assertion' | 'assertions' | 'browseDiseases' | 'browseFeatures' | 'browseMolecularProfiles' | 'browseSources' | 'browseVariantGroups' | 'browseVariants' | 'clingenCode' | 'clingenCodesTypeahead' | 'clinicalTrial' | 'clinicalTrials' | 'comment' | 'comments' | 'contributors' | 'countries' | 'dataReleases' | 'disease' | 'diseasePopover' | 'diseaseTypeahead' | 'entityTypeahead' | 'events' | 'evidenceItem' | 'evidenceItems' | 'feature' | 'featureTypeahead' | 'flag' | 'flags' | 'gene' | 'genes' | 'molecularProfile' | 'molecularProfiles' | 'nccnGuideline' | 'nccnGuidelinesTypeahead' | 'notifications' | 'organization' | 'organizationLeaderboards' | 'organizations' | 'phenotype' | 'phenotypePopover' | 'phenotypeTypeahead' | 'phenotypes' | 'previewCommentText' | 'previewMolecularProfileName' | 'remoteCitation' | 'revision' | 'revisions' | 'search' | 'searchByPermalink' | 'searchGenes' | 'source' | 'sourcePopover' | 'sourceSuggestionValues' | 'sourceSuggestions' | 'sourceTypeahead' | 'subscriptionForEntity' | 'therapies' | 'therapy' | 'therapyPopover' | 'therapyTypeahead' | 'timepointStats' | 'user' | 'userLeaderboards' | 'userTypeahead' | 'users' | 'validateRevisionsForAcceptance' | 'variant' | 'variantGroup' | 'variantGroups' | 'variantType' | 'variantTypePopover' | 'variantTypeTypeahead' | 'variantTypes' | 'variants' | 'viewer' | QueryKeySpecifier)[];
+export type QueryKeySpecifier = ('acmgCode' | 'acmgCodesTypeahead' | 'activities' | 'activity' | 'assertion' | 'assertions' | 'browseDiseases' | 'browseFeatures' | 'browseMolecularProfiles' | 'browseSources' | 'browseVariantGroups' | 'browseVariants' | 'clingenCode' | 'clingenCodesTypeahead' | 'clinicalTrial' | 'clinicalTrials' | 'comment' | 'comments' | 'contributors' | 'countries' | 'dataReleases' | 'disease' | 'diseasePopover' | 'diseaseTypeahead' | 'entityTypeahead' | 'events' | 'evidenceItem' | 'evidenceItems' | 'feature' | 'featureTypeahead' | 'flag' | 'flags' | 'gene' | 'genes' | 'molecularProfile' | 'molecularProfiles' | 'nccnGuideline' | 'nccnGuidelinesTypeahead' | 'notifications' | 'organization' | 'organizationLeaderboards' | 'organizations' | 'phenotype' | 'phenotypePopover' | 'phenotypeTypeahead' | 'phenotypes' | 'previewCommentText' | 'previewMolecularProfileName' | 'remoteCitation' | 'revision' | 'revisions' | 'search' | 'searchByPermalink' | 'searchGenes' | 'source' | 'sourcePopover' | 'sourceSuggestionValues' | 'sourceSuggestions' | 'sourceTypeahead' | 'subscriptionForEntity' | 'therapies' | 'therapy' | 'therapyPopover' | 'therapyTypeahead' | 'timepointStats' | 'user' | 'userLeaderboards' | 'userTypeahead' | 'users' | 'validateRevisionsForAcceptance' | 'variant' | 'variantGroup' | 'variantGroups' | 'variantType' | 'variantTypePopover' | 'variantTypeTypeahead' | 'variantTypes' | 'variants' | 'variantsTypeahead' | 'viewer' | QueryKeySpecifier)[];
 export type QueryFieldPolicy = {
 	acmgCode?: FieldPolicy<any> | FieldReadFunction<any>,
 	acmgCodesTypeahead?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -1616,6 +1616,7 @@ export type QueryFieldPolicy = {
 	variantTypeTypeahead?: FieldPolicy<any> | FieldReadFunction<any>,
 	variantTypes?: FieldPolicy<any> | FieldReadFunction<any>,
 	variants?: FieldPolicy<any> | FieldReadFunction<any>,
+	variantsTypeahead?: FieldPolicy<any> | FieldReadFunction<any>,
 	viewer?: FieldPolicy<any> | FieldReadFunction<any>
 };
 export type RanksKeySpecifier = ('commentsRank' | 'moderationRank' | 'revisionsRank' | 'submissionsRank' | RanksKeySpecifier)[];
diff --git a/client/src/app/generated/civic.apollo.ts b/client/src/app/generated/civic.apollo.ts
index 7d776a240..2ca36b453 100644
--- a/client/src/app/generated/civic.apollo.ts
+++ b/client/src/app/generated/civic.apollo.ts
@@ -4145,6 +4145,7 @@ export type Query = {
   variantTypes: BrowseVariantTypeConnection;
   /** List and filter variants. */
   variants: VariantInterfaceConnection;
+  variantsTypeahead: Array<Variant>;
   viewer?: Maybe<User>;
 };
 
@@ -4775,6 +4776,12 @@ export type QueryVariantsArgs = {
   variantTypeIds?: InputMaybe<Array<Scalars['Int']>>;
 };
 
+
+export type QueryVariantsTypeaheadArgs = {
+  featureId?: InputMaybe<Scalars['Int']>;
+  queryTerm: Scalars['String'];
+};
+
 export type Ranks = {
   __typename: 'Ranks';
   commentsRank?: Maybe<LeaderboardRank>;
@@ -8201,7 +8208,7 @@ export type VariantSelectTypeaheadQueryVariables = Exact<{
 }>;
 
 
-export type VariantSelectTypeaheadQuery = { __typename: 'Query', variants: { __typename: 'VariantInterfaceConnection', totalCount: number, edges: Array<{ __typename: 'VariantInterfaceEdge', node?: { __typename: 'FactorVariant', id: number, name: string, link: string, variantAliases: Array<string>, singleVariantMolecularProfileId: number, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, molecularProfileAliases: Array<string> } } | { __typename: 'GeneVariant', id: number, name: string, link: string, variantAliases: Array<string>, singleVariantMolecularProfileId: number, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, molecularProfileAliases: Array<string> } } | { __typename: 'Variant', id: number, name: string, link: string, variantAliases: Array<string>, singleVariantMolecularProfileId: number, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, molecularProfileAliases: Array<string> } } | undefined }>, nodes: Array<{ __typename: 'FactorVariant', id: number, name: string, link: string, variantAliases: Array<string>, singleVariantMolecularProfileId: number, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, molecularProfileAliases: Array<string> } } | { __typename: 'GeneVariant', id: number, name: string, link: string, variantAliases: Array<string>, singleVariantMolecularProfileId: number, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, molecularProfileAliases: Array<string> } } | { __typename: 'Variant', id: number, name: string, link: string, variantAliases: Array<string>, singleVariantMolecularProfileId: number, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, molecularProfileAliases: Array<string> } }> } };
+export type VariantSelectTypeaheadQuery = { __typename: 'Query', variantsTypeahead: Array<{ __typename: 'Variant', id: number, name: string, link: string, variantAliases: Array<string>, singleVariantMolecularProfileId: number, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, molecularProfileAliases: Array<string> } }> };
 
 export type VariantSelectTagQueryVariables = Exact<{
   variantId: Scalars['Int'];
@@ -15031,16 +15038,8 @@ export const QuickAddVariantDocument = gql`
   }
 export const VariantSelectTypeaheadDocument = gql`
     query VariantSelectTypeahead($name: String!, $featureId: Int) {
-  variants(name: $name, featureId: $featureId, first: 50) {
-    totalCount
-    edges {
-      node {
-        ...VariantSelectTypeaheadFields
-      }
-    }
-    nodes {
-      ...VariantSelectTypeaheadFields
-    }
+  variantsTypeahead(queryTerm: $name, featureId: $featureId) {
+    ...VariantSelectTypeaheadFields
   }
 }
     ${VariantSelectTypeaheadFieldsFragmentDoc}`;
diff --git a/client/src/app/generated/server.model.graphql b/client/src/app/generated/server.model.graphql
index d773c9ca2..c09fea133 100644
--- a/client/src/app/generated/server.model.graphql
+++ b/client/src/app/generated/server.model.graphql
@@ -8043,6 +8043,7 @@ type Query {
     """
     variantTypeIds: [Int!]
   ): VariantInterfaceConnection!
+  variantsTypeahead(featureId: Int, queryTerm: String!): [Variant!]!
   viewer: User
 }
 
diff --git a/client/src/app/generated/server.schema.json b/client/src/app/generated/server.schema.json
index d112df061..95adf2d1b 100644
--- a/client/src/app/generated/server.schema.json
+++ b/client/src/app/generated/server.schema.json
@@ -36830,6 +36830,59 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "variantsTypeahead",
+              "description": null,
+              "args": [
+                {
+                  "name": "queryTerm",
+                  "description": null,
+                  "type": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "SCALAR",
+                      "name": "String",
+                      "ofType": null
+                    }
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "featureId",
+                  "description": null,
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                }
+              ],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "Variant",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "viewer",
               "description": null,
diff --git a/server/app/graphql/types/queries/typeahead_queries.rb b/server/app/graphql/types/queries/typeahead_queries.rb
index 1d1a69d23..0c4661dbd 100644
--- a/server/app/graphql/types/queries/typeahead_queries.rb
+++ b/server/app/graphql/types/queries/typeahead_queries.rb
@@ -58,6 +58,24 @@ def self.included(klass)
         argument :query_term, GraphQL::Types::String, required: true
       end
 
+      klass.field :variants_typeahead, [Types::Entities::VariantType], null: false do
+        argument :query_term, GraphQL::Types::String, required: true
+        argument :feature_id, GraphQL::Types::Int, required: false
+      end
+
+      def variants_typeahead(query_term:, feature_id: nil)
+        scope = Variant.left_joins(:variant_aliases)
+          .where(deprecated: false)
+          .where('variants.name ILIKE :query OR variant_aliases.name ILIKE :query', { query: "%#{query_term}%" })
+          .limit(20)
+
+        if feature_id
+          scope.where(feature_id: feature_id)
+        else
+          scope
+        end
+      end
+
       def disease_typeahead(query_term:)
         base_query = Disease.where(deprecated: false)
         results = base_query.where("diseases.name ILIKE ?", "%#{query_term}%")

From 513667f78776e19eb7f527d523f8341d130534ef Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Fri, 29 Mar 2024 10:57:29 -0500
Subject: [PATCH 115/125] fix meeting factors from meeting feedback

---
 .../feature-popover.component.html            |   6 +
 .../feature-popover/feature-popover.query.gql |   1 +
 ...profile-factor-variant-card.component.html | 217 +++++++++---------
 .../factor-variant-summary.page.html          |   2 +-
 .../variants-table.component.html             |   9 +-
 client/src/app/generated/civic.apollo.ts      |   5 +-
 .../suggest_factor_variant_revision.rb        |   4 +-
 server/app/models/feature.rb                  |   2 +-
 .../factor_variant_input_adaptor.rb           |   2 +-
 .../gene_variant_input_adaptor.rb             |   2 +-
 10 files changed, 135 insertions(+), 115 deletions(-)

diff --git a/client/src/app/components/features/feature-popover/feature-popover.component.html b/client/src/app/components/features/feature-popover/feature-popover.component.html
index 12cdf6674..897d41f4b 100644
--- a/client/src/app/components/features/feature-popover/feature-popover.component.html
+++ b/client/src/app/components/features/feature-popover/feature-popover.component.html
@@ -17,6 +17,12 @@
         nzSize="small"
         [nzColumn]="2"
         nzBordered="true">
+        <nz-descriptions-item
+          *ngIf="feature.fullName"
+          nzSpan="2"
+          nzTitle="Full Name">
+          {{ feature.fullName }}
+        </nz-descriptions-item>
         <!-- aliases -->
         <nz-descriptions-item
           nzTitle="Aliases"
diff --git a/client/src/app/components/features/feature-popover/feature-popover.query.gql b/client/src/app/components/features/feature-popover/feature-popover.query.gql
index 6ed1a9ff3..d2aa7f50f 100644
--- a/client/src/app/components/features/feature-popover/feature-popover.query.gql
+++ b/client/src/app/components/features/feature-popover/feature-popover.query.gql
@@ -7,6 +7,7 @@ query FeaturePopover($featureId: Int!) {
 fragment featurePopover on Feature {
   id
   name
+  fullName
   featureInstance {
     __typename
   }
diff --git a/client/src/app/components/molecular-profiles/molecular-profile-factor-variant-card/molecular-profile-factor-variant-card.component.html b/client/src/app/components/molecular-profiles/molecular-profile-factor-variant-card/molecular-profile-factor-variant-card.component.html
index b699c3f22..0db7fbe0d 100644
--- a/client/src/app/components/molecular-profiles/molecular-profile-factor-variant-card/molecular-profile-factor-variant-card.component.html
+++ b/client/src/app/components/molecular-profiles/molecular-profile-factor-variant-card/molecular-profile-factor-variant-card.component.html
@@ -1,109 +1,116 @@
-@if(variant.__typename == "FactorVariant") {
-<nz-card
-  [nzTitle]="cardTitle"
-  nzType="inner"
-  nzSize="small">
-  <ng-template #cardTitle>
-    <i
-      nz-icon
-      nzType="civic-variant"
-      nzTheme="twotone"
-      [nzTwotoneColor]="'Variant' | entityColor"></i>
-    {{ variant.name }}
-  </ng-template>
-  <nz-row [nzGutter]="[8, 16]">
-    <nz-col [nzSpan]="24">
-      <nz-row [nzGutter]="[8, 8]">
-        <!-- gene attributes block -->
-        <nz-col nzSpan="24">
-          <nz-descriptions
-            nzLayout="horizontal"
-            nzSize="small"
-            [nzColumn]="4"
-            nzBordered="true">
-            <nz-descriptions-item
-              [nzSpan]="4"
-              nzTitle="Factor Variant">
-              <cvc-feature-variant-tag
-                [variant]="variant"></cvc-feature-variant-tag>
-            </nz-descriptions-item>
-            <!-- aliases -->
-            <nz-descriptions-item
-              [nzSpan]="2"
-              nzTitle="Aliases">
-              <ng-container
-                *ngIf="variant.variantAliases.length > 0; else noAliases">
-                <cvc-tag-list>
-                  <nz-tag *ngFor="let alias of variant.variantAliases">{{
-                    alias
-                  }}</nz-tag>
-                </cvc-tag-list>
-              </ng-container>
-              <ng-template #noAliases>
-                <span
-                  nz-typography
-                  nzType="secondary"
-                  >None specified</span
-                >
-              </ng-template>
-            </nz-descriptions-item>
-
-            <!-- variant type(s) -->
-            <nz-descriptions-item
-              [nzSpan]="2"
-              [nzTitle]="
-                variant.variantTypes.length > 1
-                  ? 'Variant Types'
-                  : 'Variant Type'
-              ">
-              <ng-container
-                *ngIf="variant.variantTypes.length > 0; else noTypes">
-                <cvc-tag-list>
-                  <cvc-variant-type-tag
-                    [variantType]="type"
-                    *ngFor="let type of variant.variantTypes">
-                  </cvc-variant-type-tag>
-                </cvc-tag-list>
-              </ng-container>
-              <ng-template #noTypes>
-                <span
-                  nz-typography
-                  nzType="secondary"
-                  >None specified</span
-                >
-              </ng-template>
-            </nz-descriptions-item>
-
-            <nz-descriptions-item
-              [nzSpan]="4"
-              *ngIf="this.displayMps.length > 0"
-              nzTitle="Other Molecular Profiles">
-              <cvc-tag-list>
-                <ng-container *ngFor="let mp of this.displayMps">
-                  <cvc-molecular-profile-tag
-                    [molecularProfile]="mp"
-                    [truncateLongName]="true"></cvc-molecular-profile-tag>
+@if (variant.__typename == 'FactorVariant') {
+  <nz-card
+    [nzTitle]="cardTitle"
+    nzType="inner"
+    nzSize="small">
+    <ng-template #cardTitle>
+      <i
+        nz-icon
+        nzType="civic-variant"
+        nzTheme="twotone"
+        [nzTwotoneColor]="'Variant' | entityColor"></i>
+      <span
+        nz-typography
+        nzType="secondary">
+        {{ variant.feature.name }}
+      </span>
+      <span nz-typography>
+        {{ variant.name }}
+      </span>
+    </ng-template>
+    <nz-row [nzGutter]="[8, 16]">
+      <nz-col [nzSpan]="24">
+        <nz-row [nzGutter]="[8, 8]">
+          <!-- gene attributes block -->
+          <nz-col nzSpan="24">
+            <nz-descriptions
+              nzLayout="horizontal"
+              nzSize="small"
+              [nzColumn]="4"
+              nzBordered="true">
+              <nz-descriptions-item
+                [nzSpan]="4"
+                nzTitle="Factor Variant">
+                <cvc-feature-variant-tag
+                  [variant]="variant"></cvc-feature-variant-tag>
+              </nz-descriptions-item>
+              <!-- aliases -->
+              <nz-descriptions-item
+                [nzSpan]="2"
+                nzTitle="Aliases">
+                <ng-container
+                  *ngIf="variant.variantAliases.length > 0; else noAliases">
+                  <cvc-tag-list>
+                    <nz-tag *ngFor="let alias of variant.variantAliases">{{
+                      alias
+                    }}</nz-tag>
+                  </cvc-tag-list>
                 </ng-container>
+                <ng-template #noAliases>
+                  <span
+                    nz-typography
+                    nzType="secondary"
+                    >None specified</span
+                  >
+                </ng-template>
+              </nz-descriptions-item>
+
+              <!-- variant type(s) -->
+              <nz-descriptions-item
+                [nzSpan]="2"
+                [nzTitle]="
+                  variant.variantTypes.length > 1
+                    ? 'Variant Types'
+                    : 'Variant Type'
+                ">
                 <ng-container
-                  *ngIf="
-                    variant.molecularProfiles.totalCount >
-                    this.displayMps.length + 1
-                  ">
-                  <a routerLink="/variants/{{ variant.id }}/summary">
-                    + view
-                    {{
-                      variant.molecularProfiles.totalCount -
-                        this.displayMps.length
-                    }}
-                    more
-                  </a>
+                  *ngIf="variant.variantTypes.length > 0; else noTypes">
+                  <cvc-tag-list>
+                    <cvc-variant-type-tag
+                      [variantType]="type"
+                      *ngFor="let type of variant.variantTypes">
+                    </cvc-variant-type-tag>
+                  </cvc-tag-list>
                 </ng-container>
-              </cvc-tag-list>
-            </nz-descriptions-item>
-          </nz-descriptions>
-        </nz-col>
-      </nz-row>
-    </nz-col>
-  </nz-row>
-</nz-card>
+                <ng-template #noTypes>
+                  <span
+                    nz-typography
+                    nzType="secondary"
+                    >None specified</span
+                  >
+                </ng-template>
+              </nz-descriptions-item>
+
+              <nz-descriptions-item
+                [nzSpan]="4"
+                *ngIf="this.displayMps.length > 0"
+                nzTitle="Other Molecular Profiles">
+                <cvc-tag-list>
+                  <ng-container *ngFor="let mp of this.displayMps">
+                    <cvc-molecular-profile-tag
+                      [molecularProfile]="mp"
+                      [truncateLongName]="true"></cvc-molecular-profile-tag>
+                  </ng-container>
+                  <ng-container
+                    *ngIf="
+                      variant.molecularProfiles.totalCount >
+                      this.displayMps.length + 1
+                    ">
+                    <a routerLink="/variants/{{ variant.id }}/summary">
+                      + view
+                      {{
+                        variant.molecularProfiles.totalCount -
+                          this.displayMps.length
+                      }}
+                      more
+                    </a>
+                  </ng-container>
+                </cvc-tag-list>
+              </nz-descriptions-item>
+            </nz-descriptions>
+          </nz-col>
+        </nz-row>
+      </nz-col>
+    </nz-row>
+  </nz-card>
 }
diff --git a/client/src/app/components/variants/factor-variant-summary/factor-variant-summary.page.html b/client/src/app/components/variants/factor-variant-summary/factor-variant-summary.page.html
index b32a38641..c413afa1c 100644
--- a/client/src/app/components/variants/factor-variant-summary/factor-variant-summary.page.html
+++ b/client/src/app/components/variants/factor-variant-summary/factor-variant-summary.page.html
@@ -158,7 +158,7 @@
       <cvc-molecular-profiles-table
         [variantId]="variant.id"
         cvcHeight="300px"
-        cvcTitle="{{ variant.name }} Molecular Profiles">
+        cvcTitle="Molecular Profiles">
       </cvc-molecular-profiles-table>
     </nz-col>
   </nz-row>
diff --git a/client/src/app/components/variants/variants-table/variants-table.component.html b/client/src/app/components/variants/variants-table/variants-table.component.html
index 813443f45..c3e2b541c 100644
--- a/client/src/app/components/variants/variants-table/variants-table.component.html
+++ b/client/src/app/components/variants/variants-table/variants-table.component.html
@@ -55,8 +55,13 @@
         </th>
         <th
           nzLeft
-          nzWidth="70px">
-          Category
+          nzWidth="70px"
+          nz-tooltip
+          nzTooltipTitle="Feature Type">
+          <i
+            nz-icon
+            nzType="civic-feature"></i>
+          Type
         </th>
         <th
           nzWidth="100px"
diff --git a/client/src/app/generated/civic.apollo.ts b/client/src/app/generated/civic.apollo.ts
index 2ca36b453..16c6f3b25 100644
--- a/client/src/app/generated/civic.apollo.ts
+++ b/client/src/app/generated/civic.apollo.ts
@@ -6964,9 +6964,9 @@ export type FeaturePopoverQueryVariables = Exact<{
 }>;
 
 
-export type FeaturePopoverQuery = { __typename: 'Query', feature?: { __typename: 'Feature', id: number, name: string, featureAliases: Array<string>, featureInstance: { __typename: 'Factor' } | { __typename: 'Gene' }, variants: { __typename: 'VariantConnection', totalCount: number }, flags: { __typename: 'FlagConnection', totalCount: number } } | undefined };
+export type FeaturePopoverQuery = { __typename: 'Query', feature?: { __typename: 'Feature', id: number, name: string, fullName?: string | undefined, featureAliases: Array<string>, featureInstance: { __typename: 'Factor' } | { __typename: 'Gene' }, variants: { __typename: 'VariantConnection', totalCount: number }, flags: { __typename: 'FlagConnection', totalCount: number } } | undefined };
 
-export type FeaturePopoverFragment = { __typename: 'Feature', id: number, name: string, featureAliases: Array<string>, featureInstance: { __typename: 'Factor' } | { __typename: 'Gene' }, variants: { __typename: 'VariantConnection', totalCount: number }, flags: { __typename: 'FlagConnection', totalCount: number } };
+export type FeaturePopoverFragment = { __typename: 'Feature', id: number, name: string, fullName?: string | undefined, featureAliases: Array<string>, featureInstance: { __typename: 'Factor' } | { __typename: 'Gene' }, variants: { __typename: 'VariantConnection', totalCount: number }, flags: { __typename: 'FlagConnection', totalCount: number } };
 
 export type BrowseFeaturesQueryVariables = Exact<{
   featureName?: InputMaybe<Scalars['String']>;
@@ -9075,6 +9075,7 @@ export const FeaturePopoverFragmentDoc = gql`
     fragment featurePopover on Feature {
   id
   name
+  fullName
   featureInstance {
     __typename
   }
diff --git a/server/app/graphql/mutations/suggest_factor_variant_revision.rb b/server/app/graphql/mutations/suggest_factor_variant_revision.rb
index 360e01b13..36c09c7b7 100644
--- a/server/app/graphql/mutations/suggest_factor_variant_revision.rb
+++ b/server/app/graphql/mutations/suggest_factor_variant_revision.rb
@@ -36,8 +36,8 @@ def ready?(organization_id: nil, id:, fields:, **kwargs)
       raise GraphQL::ExecutionError, "Variant with id #{id} doesn't exist."
     end
 
-    if !variant.is_a?(Variants::GeneVariant)
-      raise GraphQL::ExecutionError, "Variant with id #{id} is a #{variant.type} and you called the GeneVariant mutation."
+    if !variant.is_a?(Variants::FactorVariant)
+      raise GraphQL::ExecutionError, "Variant with id #{id} is a #{variant.type} and you called the FactorVariant mutation."
     end
 
     @variant = variant
diff --git a/server/app/models/feature.rb b/server/app/models/feature.rb
index 637e28e4e..4a026ac1f 100644
--- a/server/app/models/feature.rb
+++ b/server/app/models/feature.rb
@@ -5,7 +5,7 @@ class Feature < ApplicationRecord
   include Subscribable
   include WithTimepointCounts
 
-  delegated_type :feature_instance, types: %w[ Features::Gene Features::Factor ], touch: true, autosave: true
+  delegated_type :feature_instance, types: %w[ Features::Gene Features::Factor ], autosave: true
   has_and_belongs_to_many :feature_aliases
   has_and_belongs_to_many :sources
 
diff --git a/server/app/models/input_adaptors/factor_variant_input_adaptor.rb b/server/app/models/input_adaptors/factor_variant_input_adaptor.rb
index dabd69c44..98888c0cd 100644
--- a/server/app/models/input_adaptors/factor_variant_input_adaptor.rb
+++ b/server/app/models/input_adaptors/factor_variant_input_adaptor.rb
@@ -7,7 +7,7 @@ def initialize(variant_input_object: )
   end
 
   def perform
-    Variant.new(
+    Variants::FactorVariant.new(
       feature_id: input.feature_id,
       name: input.name,
       variant_type_ids: input.variant_type_ids,
diff --git a/server/app/models/input_adaptors/gene_variant_input_adaptor.rb b/server/app/models/input_adaptors/gene_variant_input_adaptor.rb
index 0ce1d9fb5..de91dacfc 100644
--- a/server/app/models/input_adaptors/gene_variant_input_adaptor.rb
+++ b/server/app/models/input_adaptors/gene_variant_input_adaptor.rb
@@ -7,7 +7,7 @@ def initialize(variant_input_object: )
   end
 
   def perform
-    Variant.new(
+    Variants::GeneVariant.new(
       feature_id: input.feature_id,
       name: input.name,
       variant_type_ids: input.variant_type_ids,

From 382574ba0c114153cf4984aff1660e864f80dc56 Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Fri, 29 Mar 2024 13:19:07 -0500
Subject: [PATCH 116/125] add link maps for variant subtypes

---
 server/app/models/constants.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/server/app/models/constants.rb b/server/app/models/constants.rb
index fa6cc7261..45827247f 100644
--- a/server/app/models/constants.rb
+++ b/server/app/models/constants.rb
@@ -112,6 +112,8 @@ module Constants
     'EvidenceItem' => 'evidence',
     'Gene' => 'genes',
     'Variant' => 'variants',
+    'Variants::GeneVariant' => 'variants',
+    'Variants::FactorVariant' => 'variants',
     'VariantGroup' => 'variant-groups',
     'Source' => 'sources',
     'MolecularProfile' => 'molecular-profiles'

From e8179848786ee39cc328a3e1c7e53ec013df69c6 Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Mon, 1 Apr 2024 11:02:38 -0500
Subject: [PATCH 117/125] update gene->feature in routing

---
 server/app/models/constants.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/app/models/constants.rb b/server/app/models/constants.rb
index 45827247f..7995f7c66 100644
--- a/server/app/models/constants.rb
+++ b/server/app/models/constants.rb
@@ -110,7 +110,7 @@ module Constants
   DB_TYPE_TO_PATH_SEGMENT = {
     'Assertion' => 'assertions',
     'EvidenceItem' => 'evidence',
-    'Gene' => 'genes',
+    'Feature' => 'features',
     'Variant' => 'variants',
     'Variants::GeneVariant' => 'variants',
     'Variants::FactorVariant' => 'variants',

From c5eddd5d439c09d031ce01578738ff97f4e63efa Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Wed, 3 Apr 2024 14:28:56 -0500
Subject: [PATCH 118/125] fix form alignment

---
 .../feature-select/feature-select.type.html   | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/client/src/app/forms/types/feature-select/feature-select.type.html b/client/src/app/forms/types/feature-select/feature-select.type.html
index ef8a65f20..c189f5cb9 100644
--- a/client/src/app/forms/types/feature-select/feature-select.type.html
+++ b/client/src/app/forms/types/feature-select/feature-select.type.html
@@ -1,19 +1,17 @@
 <!-- NOTE: entity-field.mixin provides the observables passed to cvc-entity-select below -->
 <nz-row [nzGutter]="[6, 6]">
   <nz-col nzFlex="100px">
-    <nz-form-item>
-      <nz-select
-        [disabled]="!props.canChangeFeatureType"
-        [(ngModel)]="selectedFeatureType"
-        (ngModelChange)="this.onFeatureType$.next($event)">
-        <nz-option
-          nzValue="GENE"
-          nzLabel="Gene"></nz-option>
-        <nz-option
-          nzValue="FACTOR"
-          nzLabel="Factor"></nz-option>
-      </nz-select>
-    </nz-form-item>
+    <nz-select
+      [disabled]="!props.canChangeFeatureType"
+      [(ngModel)]="selectedFeatureType"
+      (ngModelChange)="this.onFeatureType$.next($event)">
+      <nz-option
+        nzValue="GENE"
+        nzLabel="Gene"></nz-option>
+      <nz-option
+        nzValue="FACTOR"
+        nzLabel="Factor"></nz-option>
+    </nz-select>
   </nz-col>
   <nz-col nzFlex="auto">
     <cvc-entity-select

From eabdc4e796db220c4db476892ca8c1fd811332b1 Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Fri, 5 Apr 2024 10:05:22 -0500
Subject: [PATCH 119/125] backwards compatibility for browse queries

---
 server/app/graphql/resolvers/top_level_genes.rb    | 9 +++++++--
 server/app/graphql/resolvers/top_level_variants.rb | 8 ++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/server/app/graphql/resolvers/top_level_genes.rb b/server/app/graphql/resolvers/top_level_genes.rb
index 8e5774c18..08e4adaab 100644
--- a/server/app/graphql/resolvers/top_level_genes.rb
+++ b/server/app/graphql/resolvers/top_level_genes.rb
@@ -7,10 +7,15 @@ class Resolvers::TopLevelGenes < GraphQL::Schema::Resolver
 
   description 'List and filter genes.'
 
-  scope { Features::Gene.joins(variants: [molecular_profiles: [:evidence_items]]).order('features.name ASC').where("evidence_items.status != 'rejected'").distinct }
+  scope do
+    Features::Gene
+      .eager_load(:feature)
+      .joins(feature: {variants: [molecular_profiles: [:evidence_items]]})
+      .order('features.name ASC').where("evidence_items.status != 'rejected'").distinct
+  end
 
   option(:entrez_symbols, type: [GraphQL::Types::String], description: 'List of Entrez Gene symbols to return results for') do |scope, value|
-    scope.where('genes.name IN (?)', value.map(&:upcase))
+    scope.where('features.name IN (?)', value.map(&:upcase))
   end
 
   option(:entrez_ids, type: [GraphQL::Types::Int], description: 'List of Entrez Gene IDs to return results for') do |scope, value|
diff --git a/server/app/graphql/resolvers/top_level_variants.rb b/server/app/graphql/resolvers/top_level_variants.rb
index d89d08ee1..589630e8f 100644
--- a/server/app/graphql/resolvers/top_level_variants.rb
+++ b/server/app/graphql/resolvers/top_level_variants.rb
@@ -18,6 +18,14 @@ class Resolvers::TopLevelVariants < GraphQL::Schema::Resolver
     scope.where(feature_id: value)
   end
 
+  option(:gene_id, type: GraphQL::Types::Int, description: 'Feature that the variants are associated with, limited to only Gene type features.') do |scope, value|
+    scope.joins(:feature).where(feature_id: value, feature: { feature_instance_type: 'Features::Gene' })
+  end
+
+  option(:factor_id, type: GraphQL::Types::Int, description: 'Feature that the variants are associated with, limited to only Factor type features.') do |scope, value|
+    scope.joins(:feature).where(feature_id: value, feature: { feature_instance_type: 'Features::Factor' })
+  end
+
   option(:variant_type_ids, type: [GraphQL::Types::Int], description: 'A list of CIViC identifiers for variant types') do  |scope, value|
     if value.size > 0
       scope.joins(:variant_types).where(variant_types: { id: value })

From 2943b01b19afa327c9eae72283daeb00c8f74fa3 Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Fri, 5 Apr 2024 10:06:48 -0500
Subject: [PATCH 120/125] rename ncit id to ncit code

---
 .../therapies-table.component.html            |   2 +-
 .../factor-variant-summary.page.html          | 309 +++++++++---------
 .../factor-revise.form.config.ts              |   4 +-
 .../factor-variant-revise.form.config.ts      |   4 +-
 .../therapy-select/therapy-select.type.html   |   2 +-
 5 files changed, 162 insertions(+), 159 deletions(-)

diff --git a/client/src/app/components/therapies/therapies-table/therapies-table.component.html b/client/src/app/components/therapies/therapies-table/therapies-table.component.html
index 8ce99440f..ca6aef0b1 100644
--- a/client/src/app/components/therapies/therapies-table/therapies-table.component.html
+++ b/client/src/app/components/therapies/therapies-table/therapies-table.component.html
@@ -57,7 +57,7 @@
           nzWidth="100%"
           [nzColumnKey]="sortColumns.NcitId"
           [nzSortFn]="true">
-          NCIt ID
+          NCIt Code
         </th>
         <th
           nzWidth="75px"
diff --git a/client/src/app/components/variants/factor-variant-summary/factor-variant-summary.page.html b/client/src/app/components/variants/factor-variant-summary/factor-variant-summary.page.html
index a11ff520a..607dc8489 100644
--- a/client/src/app/components/variants/factor-variant-summary/factor-variant-summary.page.html
+++ b/client/src/app/components/variants/factor-variant-summary/factor-variant-summary.page.html
@@ -1,162 +1,165 @@
-@if(variant.__typename == "FactorVariant") {
-<!-- variant description, details, myvariantinfo row -->
-<nz-row [nzGutter]="[8, 16]">
-  <!-- LEFT COL -->
-  <nz-col [nzSpan]="12">
-    <!-- left col layout row -->
-    <nz-row [nzGutter]="[8, 8]">
-      <!-- variant attributes block -->
-      <nz-col nzSpan="24">
-        <nz-descriptions
-          nzLayout="horizontal"
-          nzSize="small"
-          [nzColumn]="1"
-          nzBordered="true">
-          <!-- aliases -->
-          <nz-descriptions-item nzTitle="Aliases">
-            <ng-container
-              *ngIf="variant.variantAliases.length > 0; else noAliases">
-              <cvc-tag-list>
-                <nz-tag *ngFor="let alias of variant.variantAliases">{{
-                  alias
-                }}</nz-tag>
-              </cvc-tag-list>
-            </ng-container>
-            <ng-template #noAliases>
-              <span
-                nz-typography
-                nzType="secondary"
-                >None specified</span
-              >
-            </ng-template>
-          </nz-descriptions-item>
+@if (variant.__typename == 'FactorVariant') {
+  <!-- variant description, details, myvariantinfo row -->
+  <nz-row [nzGutter]="[8, 16]">
+    <!-- LEFT COL -->
+    <nz-col [nzSpan]="12">
+      <!-- left col layout row -->
+      <nz-row [nzGutter]="[8, 8]">
+        <!-- variant attributes block -->
+        <nz-col nzSpan="24">
+          <nz-descriptions
+            nzLayout="horizontal"
+            nzSize="small"
+            [nzColumn]="1"
+            nzBordered="true">
+            <!-- aliases -->
+            <nz-descriptions-item nzTitle="Aliases">
+              <ng-container
+                *ngIf="variant.variantAliases.length > 0; else noAliases">
+                <cvc-tag-list>
+                  <nz-tag *ngFor="let alias of variant.variantAliases">{{
+                    alias
+                  }}</nz-tag>
+                </cvc-tag-list>
+              </ng-container>
+              <ng-template #noAliases>
+                <span
+                  nz-typography
+                  nzType="secondary"
+                  >None specified</span
+                >
+              </ng-template>
+            </nz-descriptions-item>
 
-          <!-- variant type(s) -->
-          <nz-descriptions-item
-            [nzTitle]="
-              variant.variantTypes.length > 1 ? 'Variant Types' : 'Variant Type'
-            ">
-            <ng-container *ngIf="variant.variantTypes.length > 0; else noTypes">
-              <cvc-tag-list>
-                <cvc-variant-type-tag
-                  [variantType]="type"
-                  *ngFor="
-                    let type of variant.variantTypes
-                  "></cvc-variant-type-tag>
-              </cvc-tag-list>
-            </ng-container>
-            <ng-template #noTypes>
-              <span
-                nz-typography
-                nzType="secondary"
-                >None specified</span
-              >
-            </ng-template>
-          </nz-descriptions-item>
-        </nz-descriptions>
-      </nz-col>
-      <ng-container *ngIf="variant.ncitId; else noNcit">
-        <nz-col [nzSpan]="24">
-          <cvc-ncit-details
-            [ncitDetails]="variant.ncitDetails"></cvc-ncit-details>
+            <!-- variant type(s) -->
+            <nz-descriptions-item
+              [nzTitle]="
+                variant.variantTypes.length > 1
+                  ? 'Variant Types'
+                  : 'Variant Type'
+              ">
+              <ng-container
+                *ngIf="variant.variantTypes.length > 0; else noTypes">
+                <cvc-tag-list>
+                  <cvc-variant-type-tag
+                    [variantType]="type"
+                    *ngFor="
+                      let type of variant.variantTypes
+                    "></cvc-variant-type-tag>
+                </cvc-tag-list>
+              </ng-container>
+              <ng-template #noTypes>
+                <span
+                  nz-typography
+                  nzType="secondary"
+                  >None specified</span
+                >
+              </ng-template>
+            </nz-descriptions-item>
+          </nz-descriptions>
         </nz-col>
-      </ng-container>
-      <ng-template #noNcit>
+        <ng-container *ngIf="variant.ncitId; else noNcit">
+          <nz-col [nzSpan]="24">
+            <cvc-ncit-details
+              [ncitDetails]="variant.ncitDetails"></cvc-ncit-details>
+          </nz-col>
+        </ng-container>
+        <ng-template #noNcit>
+          <nz-col [nzSpan]="24">
+            <nz-card nzTitle="">
+              <cvc-empty-revisable
+                notification="Not available, please provide an NCIt Code">
+              </cvc-empty-revisable>
+            </nz-card>
+          </nz-col>
+        </ng-template>
+      </nz-row>
+    </nz-col>
+
+    <!-- RIGHT COLUMN -->
+    <nz-col nzSpan="12">
+      <!-- right col layout row -->
+      <nz-row [nzGutter]="[8, 8]">
+        <!-- BLOCK: creation and deprecation events -->
         <nz-col [nzSpan]="24">
-          <nz-card nzTitle="">
-            <cvc-empty-revisable
-              notification="Not available, please provide an NCIt ID">
-            </cvc-empty-revisable>
-          </nz-card>
+          <nz-descriptions
+            nzLayout="vertical"
+            nzSize="small"
+            [nzColumn]="{ xxl: 2, xl: 2, lg: 1, md: 1, sm: 1, xs: 1 }"
+            nzBordered="true">
+            <!-- creation/deprecation curation events -->
+            <ng-container *ngIf="variant.creationActivity">
+              <nz-descriptions-item [nzTitle]="createdTitle">
+                by
+                <cvc-user-tag
+                  [user]="variant.creationActivity.user"></cvc-user-tag>
+              </nz-descriptions-item>
+              <ng-template #createdTitle>
+                Created
+                <span
+                  nz-typography
+                  nzType="secondary">
+                  ({{ variant.creationActivity.createdAt | timeAgo }})
+                </span>
+              </ng-template>
+            </ng-container>
+            <ng-container *ngIf="variant.deprecationActivity">
+              <nz-descriptions-item [nzTitle]="deprecatedTitle">
+                by
+                <cvc-user-tag
+                  [user]="variant.deprecationActivity.user"></cvc-user-tag>
+              </nz-descriptions-item>
+              <ng-template #deprecatedTitle>
+                Deprecated
+                <span
+                  nz-typography
+                  nzType="secondary">
+                  ({{ variant.deprecationActivity.createdAt | timeAgo }})
+                </span>
+              </ng-template>
+            </ng-container>
+          </nz-descriptions>
         </nz-col>
-      </ng-template>
-    </nz-row>
-  </nz-col>
 
-  <!-- RIGHT COLUMN -->
-  <nz-col nzSpan="12">
-    <!-- right col layout row -->
-    <nz-row [nzGutter]="[8, 8]">
-      <!-- BLOCK: creation and deprecation events -->
-      <nz-col [nzSpan]="24">
-        <nz-descriptions
-          nzLayout="vertical"
-          nzSize="small"
-          [nzColumn]="{ xxl: 2, xl: 2, lg: 1, md: 1, sm: 1, xs: 1 }"
-          nzBordered="true">
-          <!-- creation/deprecation curation events -->
-          <ng-container *ngIf="variant.creationActivity">
-            <nz-descriptions-item [nzTitle]="createdTitle">
-              by
-              <cvc-user-tag
-                [user]="variant.creationActivity.user"></cvc-user-tag>
-            </nz-descriptions-item>
-            <ng-template #createdTitle>
-              Created
-              <span
-                nz-typography
-                nzType="secondary">
-                ({{ variant.creationActivity.createdAt | timeAgo }})
-              </span>
-            </ng-template>
-          </ng-container>
-          <ng-container *ngIf="variant.deprecationActivity">
-            <nz-descriptions-item [nzTitle]="deprecatedTitle">
-              by
-              <cvc-user-tag
-                [user]="variant.deprecationActivity.user"></cvc-user-tag>
+        <!-- variant related entities, attributes -->
+        <nz-col [nzSpan]="24">
+          <nz-descriptions
+            nzLayout="horizontal"
+            nzSize="small"
+            [nzColumn]="{ xxl: 2, xl: 2, lg: 1, md: 1, sm: 1, xs: 1 }"
+            nzBordered="true">
+            <!-- feature -->
+            <nz-descriptions-item [nzTitle]="variant.feature.__typename">
+              <cvc-feature-tag [feature]="variant.feature"></cvc-feature-tag>
             </nz-descriptions-item>
-            <ng-template #deprecatedTitle>
-              Deprecated
-              <span
-                nz-typography
-                nzType="secondary">
-                ({{ variant.deprecationActivity.createdAt | timeAgo }})
-              </span>
-            </ng-template>
-          </ng-container>
-        </nz-descriptions>
-      </nz-col>
-
-      <!-- variant related entities, attributes -->
-      <nz-col [nzSpan]="24">
-        <nz-descriptions
-          nzLayout="horizontal"
-          nzSize="small"
-          [nzColumn]="{ xxl: 2, xl: 2, lg: 1, md: 1, sm: 1, xs: 1 }"
-          nzBordered="true">
-          <!-- feature -->
-          <nz-descriptions-item [nzTitle]="variant.feature.__typename">
-            <cvc-feature-tag [feature]="variant.feature"></cvc-feature-tag>
-          </nz-descriptions-item>
 
-          <nz-descriptions-item
-            *ngIf="variant.ncitId"
-            nzTitle="Resources">
-            <cvc-tag-list>
-              <cvc-link-tag
-                [href]="
-                  'https://ncithesaurus.nci.nih.gov/ncitbrowser/ConceptReport.jsp?dictionary=NCI_Thesaurus&ns=ncit&code=' +
-                  variant.ncitId
-                "
-                [tooltip]="'View ' + variant.name + ' in the NCI Thesaurus'">
-                NCIt: {{ variant.ncitId }}
-              </cvc-link-tag>
-            </cvc-tag-list>
-          </nz-descriptions-item>
-        </nz-descriptions>
-      </nz-col>
-    </nz-row>
-  </nz-col>
-  <!-- END RIGHT COL -->
+            <nz-descriptions-item
+              *ngIf="variant.ncitId"
+              nzTitle="Resources">
+              <cvc-tag-list>
+                <cvc-link-tag
+                  [href]="
+                    'https://ncithesaurus.nci.nih.gov/ncitbrowser/ConceptReport.jsp?dictionary=NCI_Thesaurus&ns=ncit&code=' +
+                    variant.ncitId
+                  "
+                  [tooltip]="'View ' + variant.name + ' in the NCI Thesaurus'">
+                  NCIt: {{ variant.ncitId }}
+                </cvc-link-tag>
+              </cvc-tag-list>
+            </nz-descriptions-item>
+          </nz-descriptions>
+        </nz-col>
+      </nz-row>
+    </nz-col>
+    <!-- END RIGHT COL -->
 
-  <!-- evidence table -->
-  <nz-col nzSpan="24">
-    <cvc-molecular-profiles-table
-      [variantId]="variant.id"
-      cvcHeight="300px"
-      cvcTitle="{{ variant.name }} Molecular Profiles">
-    </cvc-molecular-profiles-table>
-  </nz-col>
-</nz-row>
+    <!-- evidence table -->
+    <nz-col nzSpan="24">
+      <cvc-molecular-profiles-table
+        [variantId]="variant.id"
+        cvcHeight="300px"
+        cvcTitle="{{ variant.name }} Molecular Profiles">
+      </cvc-molecular-profiles-table>
+    </nz-col>
+  </nz-row>
 }
diff --git a/client/src/app/forms/config/factor-revise/factor-revise.form.config.ts b/client/src/app/forms/config/factor-revise/factor-revise.form.config.ts
index 4db7f7aab..b449cb41e 100644
--- a/client/src/app/forms/config/factor-revise/factor-revise.form.config.ts
+++ b/client/src/app/forms/config/factor-revise/factor-revise.form.config.ts
@@ -61,8 +61,8 @@ const formFieldConfig: FormlyFieldConfig[] = [
                 type: 'base-input',
                 props: {
                   placeholder: 'NCI Thesaurus Code',
-                  description: 'Enter the NCI Thesaurus ID for this Factor',
-                  label: 'NCI Thesaurus ID',
+                  description: 'Enter the NCI Thesaurus Code for this Factor',
+                  label: 'NCI Thesaurus Code',
                   required: false,
                 },
               },
diff --git a/client/src/app/forms/config/factor-variant-revise/factor-variant-revise.form.config.ts b/client/src/app/forms/config/factor-variant-revise/factor-variant-revise.form.config.ts
index 61db592ee..a86874def 100644
--- a/client/src/app/forms/config/factor-variant-revise/factor-variant-revise.form.config.ts
+++ b/client/src/app/forms/config/factor-variant-revise/factor-variant-revise.form.config.ts
@@ -95,8 +95,8 @@ const formFieldConfig: FormlyFieldConfig[] = [
                 props: {
                   placeholder: 'NCI Thesaurus Code',
                   description:
-                    'Enter the NCI Thesaurus ID for this Factor Variant',
-                  label: 'NCI Thesaurus ID',
+                    'Enter the NCI Thesaurus Code for this Factor Variant',
+                  label: 'NCI Thesaurus Code',
                   required: false,
                 },
               },
diff --git a/client/src/app/forms/types/therapy-select/therapy-select.type.html b/client/src/app/forms/types/therapy-select/therapy-select.type.html
index 73814065f..a501a8aa0 100644
--- a/client/src/app/forms/types/therapy-select/therapy-select.type.html
+++ b/client/src/app/forms/types/therapy-select/therapy-select.type.html
@@ -31,7 +31,7 @@
         nz-typography
         nzType="secondary">
         <ng-container *ngIf="result.ncitId">
-          <strong>NCIt ID:</strong>
+          <strong>NCIt Code:</strong>
           <span
             [innerHtml]="
               result.ncitId | highlightTypeahead : searchString

From 316b77604c1582c0bea03fc597e75fd5d9b99786 Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Fri, 5 Apr 2024 10:25:59 -0500
Subject: [PATCH 121/125] fix cache-miss issue on variant quick add

---
 .../entity-tag/entity-tag.component.ts        |  1 -
 .../variant-select/variant-select.query.gql   |  1 +
 client/src/app/generated/civic.apollo.ts      | 19 +++++++------
 client/src/app/generated/server.model.graphql | 12 +++++++-
 client/src/app/generated/server.schema.json   | 28 +++++++++++++++++--
 .../app/graphql/mutations/create_variant.rb   |  2 +-
 6 files changed, 50 insertions(+), 13 deletions(-)

diff --git a/client/src/app/forms/components/entity-tag/entity-tag.component.ts b/client/src/app/forms/components/entity-tag/entity-tag.component.ts
index ad6da2bc6..e644c203e 100644
--- a/client/src/app/forms/components/entity-tag/entity-tag.component.ts
+++ b/client/src/app/forms/components/entity-tag/entity-tag.component.ts
@@ -145,7 +145,6 @@ export class CvcEntityTagComponent implements OnChanges {
       )
       return
     }
-    console.log(typename)
     // get linkable entity
     let fragment = undefined
     if (!this.cvcDisableLink) {
diff --git a/client/src/app/forms/types/variant-select/variant-select.query.gql b/client/src/app/forms/types/variant-select/variant-select.query.gql
index 158528a6d..dd785a6ea 100644
--- a/client/src/app/forms/types/variant-select/variant-select.query.gql
+++ b/client/src/app/forms/types/variant-select/variant-select.query.gql
@@ -22,6 +22,7 @@ fragment VariantSelectTypeaheadFields on VariantInterface {
   id
   name
   link
+  deprecated
   variantAliases
   singleVariantMolecularProfileId
   singleVariantMolecularProfile {
diff --git a/client/src/app/generated/civic.apollo.ts b/client/src/app/generated/civic.apollo.ts
index 16c6f3b25..f756d3a1f 100644
--- a/client/src/app/generated/civic.apollo.ts
+++ b/client/src/app/generated/civic.apollo.ts
@@ -1290,7 +1290,7 @@ export type CreateVariantPayload = {
   /** True if the variant was newly created. False if the returned variant was already in the database. */
   new: Scalars['Boolean'];
   /** The newly created Variant. */
-  variant: VariantInterface;
+  variant: Variant;
 };
 
 /** Enum representing Feature types that can be user-created */
@@ -4767,8 +4767,10 @@ export type QueryVariantsArgs = {
   alleleRegistryId?: InputMaybe<Scalars['String']>;
   before?: InputMaybe<Scalars['String']>;
   category?: InputMaybe<VariantCategories>;
+  factorId?: InputMaybe<Scalars['Int']>;
   featureId?: InputMaybe<Scalars['Int']>;
   first?: InputMaybe<Scalars['Int']>;
+  geneId?: InputMaybe<Scalars['Int']>;
   hasNoVariantType?: InputMaybe<Scalars['Boolean']>;
   last?: InputMaybe<Scalars['Int']>;
   name?: InputMaybe<Scalars['String']>;
@@ -8198,9 +8200,9 @@ export type QuickAddVariantMutationVariables = Exact<{
 }>;
 
 
-export type QuickAddVariantMutation = { __typename: 'Mutation', createVariant?: { __typename: 'CreateVariantPayload', clientMutationId?: string | undefined, new: boolean, variant: { __typename: 'FactorVariant', id: number, name: string, link: string, variantAliases: Array<string>, singleVariantMolecularProfileId: number, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, molecularProfileAliases: Array<string> } } | { __typename: 'GeneVariant', id: number, name: string, link: string, variantAliases: Array<string>, singleVariantMolecularProfileId: number, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, molecularProfileAliases: Array<string> } } | { __typename: 'Variant', id: number, name: string, link: string, variantAliases: Array<string>, singleVariantMolecularProfileId: number, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, molecularProfileAliases: Array<string> } } } | undefined };
+export type QuickAddVariantMutation = { __typename: 'Mutation', createVariant?: { __typename: 'CreateVariantPayload', clientMutationId?: string | undefined, new: boolean, variant: { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean, variantAliases: Array<string>, singleVariantMolecularProfileId: number, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, molecularProfileAliases: Array<string> } } } | undefined };
 
-export type QuickAddVariantFieldsFragment = { __typename: 'CreateVariantPayload', clientMutationId?: string | undefined, new: boolean, variant: { __typename: 'FactorVariant', id: number, name: string, link: string, variantAliases: Array<string>, singleVariantMolecularProfileId: number, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, molecularProfileAliases: Array<string> } } | { __typename: 'GeneVariant', id: number, name: string, link: string, variantAliases: Array<string>, singleVariantMolecularProfileId: number, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, molecularProfileAliases: Array<string> } } | { __typename: 'Variant', id: number, name: string, link: string, variantAliases: Array<string>, singleVariantMolecularProfileId: number, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, molecularProfileAliases: Array<string> } } };
+export type QuickAddVariantFieldsFragment = { __typename: 'CreateVariantPayload', clientMutationId?: string | undefined, new: boolean, variant: { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean, variantAliases: Array<string>, singleVariantMolecularProfileId: number, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, molecularProfileAliases: Array<string> } } };
 
 export type VariantSelectTypeaheadQueryVariables = Exact<{
   name: Scalars['String'];
@@ -8208,20 +8210,20 @@ export type VariantSelectTypeaheadQueryVariables = Exact<{
 }>;
 
 
-export type VariantSelectTypeaheadQuery = { __typename: 'Query', variantsTypeahead: Array<{ __typename: 'Variant', id: number, name: string, link: string, variantAliases: Array<string>, singleVariantMolecularProfileId: number, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, molecularProfileAliases: Array<string> } }> };
+export type VariantSelectTypeaheadQuery = { __typename: 'Query', variantsTypeahead: Array<{ __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean, variantAliases: Array<string>, singleVariantMolecularProfileId: number, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, molecularProfileAliases: Array<string> } }> };
 
 export type VariantSelectTagQueryVariables = Exact<{
   variantId: Scalars['Int'];
 }>;
 
 
-export type VariantSelectTagQuery = { __typename: 'Query', variant?: { __typename: 'FactorVariant', id: number, name: string, link: string, variantAliases: Array<string>, singleVariantMolecularProfileId: number, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, molecularProfileAliases: Array<string> } } | { __typename: 'GeneVariant', id: number, name: string, link: string, variantAliases: Array<string>, singleVariantMolecularProfileId: number, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, molecularProfileAliases: Array<string> } } | { __typename: 'Variant', id: number, name: string, link: string, variantAliases: Array<string>, singleVariantMolecularProfileId: number, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, molecularProfileAliases: Array<string> } } | undefined };
+export type VariantSelectTagQuery = { __typename: 'Query', variant?: { __typename: 'FactorVariant', id: number, name: string, link: string, deprecated: boolean, variantAliases: Array<string>, singleVariantMolecularProfileId: number, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, molecularProfileAliases: Array<string> } } | { __typename: 'GeneVariant', id: number, name: string, link: string, deprecated: boolean, variantAliases: Array<string>, singleVariantMolecularProfileId: number, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, molecularProfileAliases: Array<string> } } | { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean, variantAliases: Array<string>, singleVariantMolecularProfileId: number, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, molecularProfileAliases: Array<string> } } | undefined };
 
-type VariantSelectTypeaheadFields_FactorVariant_Fragment = { __typename: 'FactorVariant', id: number, name: string, link: string, variantAliases: Array<string>, singleVariantMolecularProfileId: number, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, molecularProfileAliases: Array<string> } };
+type VariantSelectTypeaheadFields_FactorVariant_Fragment = { __typename: 'FactorVariant', id: number, name: string, link: string, deprecated: boolean, variantAliases: Array<string>, singleVariantMolecularProfileId: number, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, molecularProfileAliases: Array<string> } };
 
-type VariantSelectTypeaheadFields_GeneVariant_Fragment = { __typename: 'GeneVariant', id: number, name: string, link: string, variantAliases: Array<string>, singleVariantMolecularProfileId: number, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, molecularProfileAliases: Array<string> } };
+type VariantSelectTypeaheadFields_GeneVariant_Fragment = { __typename: 'GeneVariant', id: number, name: string, link: string, deprecated: boolean, variantAliases: Array<string>, singleVariantMolecularProfileId: number, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, molecularProfileAliases: Array<string> } };
 
-type VariantSelectTypeaheadFields_Variant_Fragment = { __typename: 'Variant', id: number, name: string, link: string, variantAliases: Array<string>, singleVariantMolecularProfileId: number, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, molecularProfileAliases: Array<string> } };
+type VariantSelectTypeaheadFields_Variant_Fragment = { __typename: 'Variant', id: number, name: string, link: string, deprecated: boolean, variantAliases: Array<string>, singleVariantMolecularProfileId: number, singleVariantMolecularProfile: { __typename: 'MolecularProfile', id: number, name: string, link: string, molecularProfileAliases: Array<string> } };
 
 export type VariantSelectTypeaheadFieldsFragment = VariantSelectTypeaheadFields_FactorVariant_Fragment | VariantSelectTypeaheadFields_GeneVariant_Fragment | VariantSelectTypeaheadFields_Variant_Fragment;
 
@@ -10378,6 +10380,7 @@ export const VariantSelectTypeaheadFieldsFragmentDoc = gql`
   id
   name
   link
+  deprecated
   variantAliases
   singleVariantMolecularProfileId
   singleVariantMolecularProfile {
diff --git a/client/src/app/generated/server.model.graphql b/client/src/app/generated/server.model.graphql
index c09fea133..3fd2a0b6b 100644
--- a/client/src/app/generated/server.model.graphql
+++ b/client/src/app/generated/server.model.graphql
@@ -2019,7 +2019,7 @@ type CreateVariantPayload {
   """
   The newly created Variant.
   """
-  variant: VariantInterface!
+  variant: Variant!
 }
 
 """
@@ -8012,6 +8012,11 @@ type Query {
     before: String
     category: VariantCategories
 
+    """
+    Feature that the variants are associated with, limited to only Factor type features.
+    """
+    factorId: Int
+
     """
     Feature that the variants are associated with.
     """
@@ -8022,6 +8027,11 @@ type Query {
     """
     first: Int
 
+    """
+    Feature that the variants are associated with, limited to only Gene type features.
+    """
+    geneId: Int
+
     """
     Return Variants lacking an assigned VariantType
     """
diff --git a/client/src/app/generated/server.schema.json b/client/src/app/generated/server.schema.json
index 95adf2d1b..331c9c2a9 100644
--- a/client/src/app/generated/server.schema.json
+++ b/client/src/app/generated/server.schema.json
@@ -10303,8 +10303,8 @@
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "INTERFACE",
-                  "name": "VariantInterface",
+                  "kind": "OBJECT",
+                  "name": "Variant",
                   "ofType": null
                 }
               },
@@ -36701,6 +36701,30 @@
                   "isDeprecated": false,
                   "deprecationReason": null
                 },
+                {
+                  "name": "geneId",
+                  "description": "Feature that the variants are associated with, limited to only Gene type features.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
+                {
+                  "name": "factorId",
+                  "description": "Feature that the variants are associated with, limited to only Factor type features.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null,
+                  "isDeprecated": false,
+                  "deprecationReason": null
+                },
                 {
                   "name": "variantTypeIds",
                   "description": "A list of CIViC identifiers for variant types",
diff --git a/server/app/graphql/mutations/create_variant.rb b/server/app/graphql/mutations/create_variant.rb
index ef8b604ea..5242b5cca 100644
--- a/server/app/graphql/mutations/create_variant.rb
+++ b/server/app/graphql/mutations/create_variant.rb
@@ -8,7 +8,7 @@ class Mutations::CreateVariant < Mutations::MutationWithOrg
   argument :feature_id, Int, required: true,
     description: 'The CIViC ID of the Feature to which the new variant belongs.'
 
-  field :variant, Types::Interfaces::VariantInterface, null: false,
+  field :variant, Types::Entities::VariantType, null: false,
     description: 'The newly created Variant.'
 
   field :molecular_profile, Types::Entities::MolecularProfileType, null: false,

From 04edb8ac5348c3931f3a58b8f01debeec78111a3 Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Fri, 5 Apr 2024 10:46:55 -0500
Subject: [PATCH 122/125] add factor browse

---
 .../src/app/graphql/graphql.type-policies.ts  |  4 +--
 .../graphql/resolvers/top_level_factors.rb    | 25 +++++++++++++++++++
 server/app/graphql/types/query_type.rb        |  1 +
 3 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 server/app/graphql/resolvers/top_level_factors.rb

diff --git a/client/src/app/graphql/graphql.type-policies.ts b/client/src/app/graphql/graphql.type-policies.ts
index 8a5572f00..9be31c58c 100644
--- a/client/src/app/graphql/graphql.type-policies.ts
+++ b/client/src/app/graphql/graphql.type-policies.ts
@@ -16,8 +16,8 @@ export const CvcTypePolicies: TypePolicies = {
     fields: {
       browseFeatures: relayStylePagination([
         'name',
-        'featureInstanceType',
-        'therapayName',
+        'featureType',
+        'therapyName',
         'featureAlias',
         'diseaseName',
       ]),
diff --git a/server/app/graphql/resolvers/top_level_factors.rb b/server/app/graphql/resolvers/top_level_factors.rb
new file mode 100644
index 000000000..670156507
--- /dev/null
+++ b/server/app/graphql/resolvers/top_level_factors.rb
@@ -0,0 +1,25 @@
+require 'search_object/plugin/graphql'
+
+class Resolvers::TopLevelFactors < GraphQL::Schema::Resolver
+  include SearchObject.module(:graphql)
+
+  type Types::Entities::FactorType.connection_type, null: false
+
+  description 'List and filter factors.'
+
+  scope do
+    Features::Factor
+      .eager_load(:feature)
+      .joins(feature: {variants: [molecular_profiles: [:evidence_items]]})
+      .order('features.name ASC').where("evidence_items.status != 'rejected'").distinct
+  end
+
+  option(:ncit_it, type: [GraphQL::Types::String], description: 'List of NCIt Codes to return Factors for') do |scope, value|
+    scope.where('factors.ncit_id IN (?)', value.map(&:upcase))
+  end
+
+  option(:name, type: [GraphQL::Types::String], description: 'List of Factor names to return') do |scope, value|
+    names = value.map(&:upcase)
+    scope.where('upper(features.name) IN (?) OR upper(features.full_name) IN (?)', names, names)
+  end
+end
diff --git a/server/app/graphql/types/query_type.rb b/server/app/graphql/types/query_type.rb
index 2f39ac56d..164c50047 100644
--- a/server/app/graphql/types/query_type.rb
+++ b/server/app/graphql/types/query_type.rb
@@ -171,6 +171,7 @@ def authorized?(object, args, context)
     end
 
     field :genes, resolver: Resolvers::TopLevelGenes
+    field :factors, resolver: Resolvers::TopLevelFactors
     field :variants, resolver: Resolvers::TopLevelVariants, max_page_size: 300
     field :variant_groups, resolver: Resolvers::TopLevelVariantGroups
     field :evidence_items, resolver: Resolvers::TopLevelEvidenceItems

From cdeacdff0c3e22c847df9ae6f6179cf9751db070 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 11 Apr 2024 07:28:03 +0000
Subject: [PATCH 123/125] Bump tar from 6.1.13 to 6.2.1 in /client

Bumps [tar](https://github.com/isaacs/node-tar) from 6.1.13 to 6.2.1.
- [Release notes](https://github.com/isaacs/node-tar/releases)
- [Changelog](https://github.com/isaacs/node-tar/blob/main/CHANGELOG.md)
- [Commits](https://github.com/isaacs/node-tar/compare/v6.1.13...v6.2.1)

---
updated-dependencies:
- dependency-name: tar
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 client/yarn.lock | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/client/yarn.lock b/client/yarn.lock
index 2487ef72e..544ce9b94 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -7465,6 +7465,11 @@ minipass@^4.0.0:
   dependencies:
     yallist "^4.0.0"
 
+minipass@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d"
+  integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==
+
 "minipass@^5.0.0 || ^6.0.2 || ^7.0.0":
   version "7.0.2"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.2.tgz#58a82b7d81c7010da5bd4b2c0c85ac4b4ec5131e"
@@ -9547,13 +9552,13 @@ tar-stream@~2.2.0:
     readable-stream "^3.1.1"
 
 tar@^6.1.11, tar@^6.1.2:
-  version "6.1.13"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.13.tgz#46e22529000f612180601a6fe0680e7da508847b"
-  integrity sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw==
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.1.tgz#717549c541bc3c2af15751bea94b1dd068d4b03a"
+  integrity sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==
   dependencies:
     chownr "^2.0.0"
     fs-minipass "^2.0.0"
-    minipass "^4.0.0"
+    minipass "^5.0.0"
     minizlib "^2.1.1"
     mkdirp "^1.0.3"
     yallist "^4.0.0"

From 82409b58687a97b32293d4993e7b0e23f1c438f4 Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Tue, 16 Apr 2024 12:58:59 -0500
Subject: [PATCH 124/125] include all features with at least one variant/mp in
 the browse table

---
 ..._feature_browse_table_rows_to_version_4.rb |   8 ++
 server/db/schema.rb                           | 122 +++++++++++-------
 .../views/feature_browse_table_rows_v04.sql   |  47 +++++++
 3 files changed, 128 insertions(+), 49 deletions(-)
 create mode 100644 server/db/migrate/20240416154605_update_feature_browse_table_rows_to_version_4.rb
 create mode 100644 server/db/views/feature_browse_table_rows_v04.sql

diff --git a/server/db/migrate/20240416154605_update_feature_browse_table_rows_to_version_4.rb b/server/db/migrate/20240416154605_update_feature_browse_table_rows_to_version_4.rb
new file mode 100644
index 000000000..2bb7d0d5e
--- /dev/null
+++ b/server/db/migrate/20240416154605_update_feature_browse_table_rows_to_version_4.rb
@@ -0,0 +1,8 @@
+class UpdateFeatureBrowseTableRowsToVersion4 < ActiveRecord::Migration[7.1]
+  def change
+    update_view :feature_browse_table_rows,
+      version: 4,
+      revert_to_version: 3,
+      materialized: true
+  end
+end
diff --git a/server/db/schema.rb b/server/db/schema.rb
index e5131831a..2b77dbf44 100644
--- a/server/db/schema.rb
+++ b/server/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.1].define(version: 2024_03_22_145804) do
+ActiveRecord::Schema[7.1].define(version: 2024_04_16_154605) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -862,6 +862,29 @@
     t.index ["variant_id"], name: "index_variant_aliases_variants_on_variant_id"
   end
 
+  create_table "variant_coordinates", force: :cascade do |t|
+    t.text "chromosome"
+    t.bigint "start"
+    t.bigint "stop"
+    t.text "reference_bases"
+    t.text "variant_bases"
+    t.integer "exon_boundary"
+    t.integer "exon_offset"
+    t.integer "ensembl_version"
+    t.text "representative_transcript"
+    t.integer "reference_build"
+    t.bigint "variant_id"
+    t.text "coordinate_type", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["chromosome"], name: "index_variant_coordinates_on_chromosome"
+    t.index ["reference_build"], name: "index_variant_coordinates_on_reference_build"
+    t.index ["representative_transcript"], name: "index_variant_coordinates_on_representative_transcript"
+    t.index ["start"], name: "index_variant_coordinates_on_start"
+    t.index ["stop"], name: "index_variant_coordinates_on_stop"
+    t.index ["variant_id"], name: "index_variant_coordinates_on_variant_id"
+  end
+
   create_table "variant_group_variants", id: false, force: :cascade do |t|
     t.integer "variant_id", null: false
     t.integer "variant_group_id", null: false
@@ -1030,6 +1053,7 @@
   add_foreign_key "users", "organizations", column: "most_recent_organization_id"
   add_foreign_key "variant_aliases_variants", "variant_aliases"
   add_foreign_key "variant_aliases_variants", "variants"
+  add_foreign_key "variant_coordinates", "variants"
   add_foreign_key "variant_group_variants", "variant_groups"
   add_foreign_key "variant_group_variants", "variants"
   add_foreign_key "variants", "comments", column: "deprecation_comment_id"
@@ -1228,54 +1252,6 @@
   SQL
   add_index "molecular_profile_browse_table_rows", ["id"], name: "index_molecular_profile_browse_table_rows_on_id", unique: true
 
-  create_view "feature_browse_table_rows", materialized: true, sql_definition: <<-SQL
-      SELECT outer_features.id,
-      outer_features.name,
-      outer_features.flagged,
-      outer_features.feature_instance_type,
-      outer_features.feature_instance_id,
-      array_agg(DISTINCT feature_aliases.name ORDER BY feature_aliases.name) AS alias_names,
-      json_agg(DISTINCT jsonb_build_object('name', diseases.name, 'id', diseases.id, 'total', disease_count.total)) FILTER (WHERE (diseases.name IS NOT NULL)) AS diseases,
-      json_agg(DISTINCT jsonb_build_object('name', therapies.name, 'id', therapies.id, 'total', therapy_count.total)) FILTER (WHERE (therapies.name IS NOT NULL)) AS therapies,
-      count(DISTINCT variants.id) AS variant_count,
-      count(DISTINCT evidence_items.id) AS evidence_item_count,
-      count(DISTINCT assertions.id) AS assertion_count,
-      count(DISTINCT molecular_profiles.id) AS molecular_profile_count
-     FROM ((((((((((((features outer_features
-       LEFT JOIN feature_aliases_features ON ((feature_aliases_features.feature_id = outer_features.id)))
-       LEFT JOIN feature_aliases ON ((feature_aliases.id = feature_aliases_features.feature_alias_id)))
-       JOIN variants ON ((variants.feature_id = outer_features.id)))
-       JOIN molecular_profiles_variants ON ((molecular_profiles_variants.variant_id = variants.id)))
-       JOIN molecular_profiles ON ((molecular_profiles.id = molecular_profiles_variants.molecular_profile_id)))
-       JOIN evidence_items ON ((evidence_items.molecular_profile_id = molecular_profiles.id)))
-       LEFT JOIN diseases ON ((diseases.id = evidence_items.disease_id)))
-       LEFT JOIN evidence_items_therapies ON ((evidence_items_therapies.evidence_item_id = evidence_items.id)))
-       LEFT JOIN therapies ON ((therapies.id = evidence_items_therapies.therapy_id)))
-       LEFT JOIN assertions ON ((assertions.molecular_profile_id = molecular_profiles.id)))
-       LEFT JOIN LATERAL ( SELECT therapies_1.id AS therapy_id,
-              count(DISTINCT evidence_items_1.id) AS total
-             FROM (((((evidence_items evidence_items_1
-               JOIN molecular_profiles molecular_profiles_1 ON ((molecular_profiles_1.id = evidence_items_1.molecular_profile_id)))
-               JOIN molecular_profiles_variants molecular_profiles_variants_1 ON ((molecular_profiles_variants_1.molecular_profile_id = molecular_profiles_1.id)))
-               JOIN variants variants_1 ON ((variants_1.id = molecular_profiles_variants_1.variant_id)))
-               JOIN evidence_items_therapies evidence_items_therapies_1 ON ((evidence_items_therapies_1.evidence_item_id = evidence_items_1.id)))
-               JOIN therapies therapies_1 ON ((therapies_1.id = evidence_items_therapies_1.therapy_id)))
-            WHERE (variants_1.feature_id = outer_features.id)
-            GROUP BY therapies_1.id) therapy_count ON ((therapies.id = therapy_count.therapy_id)))
-       LEFT JOIN LATERAL ( SELECT diseases_1.id AS disease_id,
-              count(DISTINCT evidence_items_1.id) AS total
-             FROM ((((evidence_items evidence_items_1
-               JOIN molecular_profiles molecular_profiles_1 ON ((molecular_profiles_1.id = evidence_items_1.molecular_profile_id)))
-               JOIN molecular_profiles_variants molecular_profiles_variants_1 ON ((molecular_profiles_variants_1.molecular_profile_id = molecular_profiles_1.id)))
-               JOIN variants variants_1 ON ((variants_1.id = molecular_profiles_variants_1.variant_id)))
-               JOIN diseases diseases_1 ON ((diseases_1.id = evidence_items_1.disease_id)))
-            WHERE (variants_1.feature_id = outer_features.id)
-            GROUP BY diseases_1.id) disease_count ON ((diseases.id = disease_count.disease_id)))
-    WHERE (((evidence_items.status)::text <> 'rejected'::text) AND (molecular_profiles.deprecated = false) AND (variants.deprecated = false))
-    GROUP BY outer_features.id, outer_features.name;
-  SQL
-  add_index "feature_browse_table_rows", ["id"], name: "index_feature_browse_table_rows_on_id", unique: true
-
   create_view "variant_group_browse_table_rows", materialized: true, sql_definition: <<-SQL
       SELECT variant_groups.id,
       variant_groups.name,
@@ -1344,4 +1320,52 @@
   SQL
   add_index "variant_browse_table_rows", ["id"], name: "index_variant_browse_table_rows_on_id", unique: true
 
+  create_view "feature_browse_table_rows", materialized: true, sql_definition: <<-SQL
+      SELECT outer_features.id,
+      outer_features.name,
+      outer_features.flagged,
+      outer_features.feature_instance_type,
+      outer_features.feature_instance_id,
+      array_agg(DISTINCT feature_aliases.name ORDER BY feature_aliases.name) AS alias_names,
+      json_agg(DISTINCT jsonb_build_object('name', diseases.name, 'id', diseases.id, 'total', disease_count.total)) FILTER (WHERE (diseases.name IS NOT NULL)) AS diseases,
+      json_agg(DISTINCT jsonb_build_object('name', therapies.name, 'id', therapies.id, 'total', therapy_count.total)) FILTER (WHERE (therapies.name IS NOT NULL)) AS therapies,
+      count(DISTINCT variants.id) AS variant_count,
+      count(DISTINCT evidence_items.id) AS evidence_item_count,
+      count(DISTINCT assertions.id) AS assertion_count,
+      count(DISTINCT molecular_profiles.id) AS molecular_profile_count
+     FROM ((((((((((((features outer_features
+       LEFT JOIN feature_aliases_features ON ((feature_aliases_features.feature_id = outer_features.id)))
+       LEFT JOIN feature_aliases ON ((feature_aliases.id = feature_aliases_features.feature_alias_id)))
+       JOIN variants ON ((variants.feature_id = outer_features.id)))
+       JOIN molecular_profiles_variants ON ((molecular_profiles_variants.variant_id = variants.id)))
+       JOIN molecular_profiles ON ((molecular_profiles.id = molecular_profiles_variants.molecular_profile_id)))
+       LEFT JOIN evidence_items ON ((evidence_items.molecular_profile_id = molecular_profiles.id)))
+       LEFT JOIN diseases ON ((diseases.id = evidence_items.disease_id)))
+       LEFT JOIN evidence_items_therapies ON ((evidence_items_therapies.evidence_item_id = evidence_items.id)))
+       LEFT JOIN therapies ON ((therapies.id = evidence_items_therapies.therapy_id)))
+       LEFT JOIN assertions ON ((assertions.molecular_profile_id = molecular_profiles.id)))
+       LEFT JOIN LATERAL ( SELECT therapies_1.id AS therapy_id,
+              count(DISTINCT evidence_items_1.id) AS total
+             FROM (((((evidence_items evidence_items_1
+               LEFT JOIN molecular_profiles molecular_profiles_1 ON ((molecular_profiles_1.id = evidence_items_1.molecular_profile_id)))
+               LEFT JOIN molecular_profiles_variants molecular_profiles_variants_1 ON ((molecular_profiles_variants_1.molecular_profile_id = molecular_profiles_1.id)))
+               LEFT JOIN variants variants_1 ON ((variants_1.id = molecular_profiles_variants_1.variant_id)))
+               LEFT JOIN evidence_items_therapies evidence_items_therapies_1 ON ((evidence_items_therapies_1.evidence_item_id = evidence_items_1.id)))
+               LEFT JOIN therapies therapies_1 ON ((therapies_1.id = evidence_items_therapies_1.therapy_id)))
+            WHERE ((variants_1.feature_id = outer_features.id) AND (molecular_profiles_1.id IS NOT NULL))
+            GROUP BY therapies_1.id) therapy_count ON ((therapies.id = therapy_count.therapy_id)))
+       LEFT JOIN LATERAL ( SELECT diseases_1.id AS disease_id,
+              count(DISTINCT evidence_items_1.id) AS total
+             FROM ((((evidence_items evidence_items_1
+               LEFT JOIN molecular_profiles molecular_profiles_1 ON ((molecular_profiles_1.id = evidence_items_1.molecular_profile_id)))
+               LEFT JOIN molecular_profiles_variants molecular_profiles_variants_1 ON ((molecular_profiles_variants_1.molecular_profile_id = molecular_profiles_1.id)))
+               LEFT JOIN variants variants_1 ON ((variants_1.id = molecular_profiles_variants_1.variant_id)))
+               LEFT JOIN diseases diseases_1 ON ((diseases_1.id = evidence_items_1.disease_id)))
+            WHERE ((variants_1.feature_id = outer_features.id) AND (molecular_profiles_1.id IS NOT NULL))
+            GROUP BY diseases_1.id) disease_count ON ((diseases.id = disease_count.disease_id)))
+    WHERE (((evidence_items.status)::text <> 'rejected'::text) OR ((evidence_items.status IS NULL) AND (molecular_profiles.deprecated = false) AND (variants.deprecated = false)))
+    GROUP BY outer_features.id, outer_features.name;
+  SQL
+  add_index "feature_browse_table_rows", ["id"], name: "index_feature_browse_table_rows_on_id", unique: true
+
 end
diff --git a/server/db/views/feature_browse_table_rows_v04.sql b/server/db/views/feature_browse_table_rows_v04.sql
new file mode 100644
index 000000000..e870284f2
--- /dev/null
+++ b/server/db/views/feature_browse_table_rows_v04.sql
@@ -0,0 +1,47 @@
+SELECT outer_features.id,
+  outer_features.name,
+  outer_features.flagged,
+  outer_features.feature_instance_type,
+  outer_features.feature_instance_id,
+  array_agg(distinct(feature_aliases.name) order by feature_aliases.name) as alias_names,
+  json_agg(distinct jsonb_build_object('name', diseases.name, 'id', diseases.id, 'total', disease_count.total))  FILTER (WHERE diseases.name IS NOT NULL) as diseases,
+  json_agg(distinct jsonb_build_object('name', therapies.name, 'id', therapies.id, 'total', therapy_count.total))  FILTER (WHERE therapies.name IS NOT NULL) as therapies,
+  count(distinct(variants.id)) as variant_count,
+  count(distinct(evidence_items.id)) as evidence_item_count,
+  count(distinct(assertions.id)) as assertion_count,
+  count(distinct(molecular_profiles.id)) as molecular_profile_count
+FROM features outer_features
+LEFT OUTER JOIN feature_aliases_features ON feature_aliases_features.feature_id = outer_features.id
+LEFT OUTER JOIN feature_aliases ON feature_aliases.id = feature_aliases_features.feature_alias_id
+INNER JOIN variants ON variants.feature_id = outer_features.id
+INNER JOIN molecular_profiles_variants ON molecular_profiles_variants.variant_id = variants.id
+INNER JOIN molecular_profiles ON molecular_profiles.id = molecular_profiles_variants.molecular_profile_id
+LEFT OUTER JOIN evidence_items ON evidence_items.molecular_profile_id = molecular_profiles.id
+LEFT OUTER JOIN diseases ON diseases.id = evidence_items.disease_id
+LEFT OUTER JOIN evidence_items_therapies ON evidence_items_therapies.evidence_item_id = evidence_items.id
+LEFT OUTER JOIN therapies ON therapies.id = evidence_items_therapies.therapy_id
+LEFT OUTER JOIN assertions on assertions.molecular_profile_id = molecular_profiles.id
+LEFT JOIN LATERAL (SELECT therapies.id as therapy_id, COUNT(DISTINCT(evidence_items.id)) as total
+  FROM evidence_items
+  LEFT OUTER JOIN molecular_profiles ON molecular_profiles.id = evidence_items.molecular_profile_id
+  LEFT OUTER JOIN molecular_profiles_variants ON molecular_profiles_variants.molecular_profile_id = molecular_profiles.id
+  LEFT OUTER JOIN variants ON variants.id = molecular_profiles_variants.variant_id
+  LEFT OUTER JOIN evidence_items_therapies ON evidence_items_therapies.evidence_item_id = evidence_items.id
+  LEFT OUTER JOIN therapies ON therapies.id = evidence_items_therapies.therapy_id
+  WHERE variants.feature_id = outer_features.id AND molecular_profiles.id IS NOT NULL
+  GROUP BY therapies.id
+) therapy_count on therapies.id = therapy_count.therapy_id
+
+LEFT JOIN LATERAL (SELECT diseases.id as disease_id, COUNT(DISTINCT(evidence_items.id)) as total
+  FROM evidence_items
+  LEFT OUTER JOIN molecular_profiles ON molecular_profiles.id = evidence_items.molecular_profile_id
+  LEFT OUTER JOIN molecular_profiles_variants ON molecular_profiles_variants.molecular_profile_id = molecular_profiles.id
+  LEFT OUTER JOIN variants ON variants.id = molecular_profiles_variants.variant_id
+  LEFT OUTER JOIN diseases ON diseases.id = evidence_items.disease_id
+  WHERE variants.feature_id = outer_features.id AND molecular_profiles.id IS NOT NULL
+  GROUP BY diseases.id
+) disease_count on diseases.id = disease_count.disease_id
+WHERE evidence_items.status != 'rejected' OR evidence_items.status IS NULL
+  AND molecular_profiles.deprecated = 'f'
+  AND variants.deprecated = 'f'
+GROUP BY outer_features.id, outer_features.name;

From f619110e0247fddc12b8e73b379c174a0a7478cb Mon Sep 17 00:00:00 2001
From: Adam Coffman <acc@fastmail.com>
Date: Tue, 16 Apr 2024 13:03:05 -0500
Subject: [PATCH 125/125] include all non-deprecated variants in browse view,
 regardless of evidence

---
 ...variant_browse_table_rows_to_version_16.rb |   8 ++
 server/db/schema.rb                           | 100 +++++++++---------
 .../views/variant_browse_table_rows_v16.sql   |  47 ++++++++
 3 files changed, 105 insertions(+), 50 deletions(-)
 create mode 100644 server/db/migrate/20240416175953_update_variant_browse_table_rows_to_version_16.rb
 create mode 100644 server/db/views/variant_browse_table_rows_v16.sql

diff --git a/server/db/migrate/20240416175953_update_variant_browse_table_rows_to_version_16.rb b/server/db/migrate/20240416175953_update_variant_browse_table_rows_to_version_16.rb
new file mode 100644
index 000000000..249030339
--- /dev/null
+++ b/server/db/migrate/20240416175953_update_variant_browse_table_rows_to_version_16.rb
@@ -0,0 +1,8 @@
+class UpdateVariantBrowseTableRowsToVersion16 < ActiveRecord::Migration[7.1]
+  def change
+    update_view :variant_browse_table_rows,
+      version: 16,
+      revert_to_version: 15,
+      materialized: true
+  end
+end
diff --git a/server/db/schema.rb b/server/db/schema.rb
index 2b77dbf44..f354edaac 100644
--- a/server/db/schema.rb
+++ b/server/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.1].define(version: 2024_04_16_154605) do
+ActiveRecord::Schema[7.1].define(version: 2024_04_16_175953) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -1271,55 +1271,6 @@
   SQL
   add_index "variant_group_browse_table_rows", ["id"], name: "index_variant_group_browse_table_rows_on_id", unique: true
 
-  create_view "variant_browse_table_rows", materialized: true, sql_definition: <<-SQL
-      SELECT outer_variants.id,
-      outer_variants.name,
-      outer_variants.type AS category,
-      features.id AS feature_id,
-      features.name AS feature_name,
-      array_agg(DISTINCT variant_aliases.name ORDER BY variant_aliases.name) AS alias_names,
-      array_agg(DISTINCT variant_types.id) AS variant_type_ids,
-      json_agg(DISTINCT jsonb_build_object('name', variant_types.display_name, 'id', variant_types.id)) FILTER (WHERE (variant_types.* IS NOT NULL)) AS variant_types,
-      count(DISTINCT variant_types.id) AS variant_type_count,
-      count(DISTINCT evidence_items.id) FILTER (WHERE (evidence_items.id IS NOT NULL)) AS evidence_item_count,
-      json_agg(DISTINCT jsonb_build_object('name', diseases.name, 'id', diseases.id, 'total', disease_count.total)) FILTER (WHERE (diseases.name IS NOT NULL)) AS diseases,
-      json_agg(DISTINCT jsonb_build_object('name', therapies.name, 'id', therapies.id, 'total', therapy_count.total)) FILTER (WHERE (therapies.name IS NOT NULL)) AS therapies,
-      count(DISTINCT assertions.id) AS assertion_count
-     FROM ((((((((((((((variants outer_variants
-       LEFT JOIN variant_aliases_variants ON ((variant_aliases_variants.variant_id = outer_variants.id)))
-       LEFT JOIN variant_aliases ON ((variant_aliases.id = variant_aliases_variants.variant_alias_id)))
-       JOIN molecular_profiles_variants ON ((molecular_profiles_variants.variant_id = outer_variants.id)))
-       JOIN molecular_profiles ON ((molecular_profiles.id = molecular_profiles_variants.molecular_profile_id)))
-       LEFT JOIN evidence_items ON ((evidence_items.molecular_profile_id = molecular_profiles.id)))
-       JOIN features ON ((features.id = outer_variants.feature_id)))
-       LEFT JOIN diseases ON ((diseases.id = evidence_items.disease_id)))
-       LEFT JOIN evidence_items_therapies ON ((evidence_items_therapies.evidence_item_id = evidence_items.id)))
-       LEFT JOIN therapies ON ((therapies.id = evidence_items_therapies.therapy_id)))
-       LEFT JOIN assertions ON ((assertions.molecular_profile_id = molecular_profiles.id)))
-       LEFT JOIN variant_types_variants ON ((variant_types_variants.variant_id = outer_variants.id)))
-       LEFT JOIN variant_types ON ((variant_types_variants.variant_type_id = variant_types.id)))
-       LEFT JOIN LATERAL ( SELECT therapies_1.id AS therapy_id,
-              count(DISTINCT evidence_items_1.id) FILTER (WHERE (evidence_items_1.id IS NOT NULL)) AS total
-             FROM ((((evidence_items evidence_items_1
-               JOIN evidence_items_therapies evidence_items_therapies_1 ON ((evidence_items_therapies_1.evidence_item_id = evidence_items_1.id)))
-               JOIN therapies therapies_1 ON ((therapies_1.id = evidence_items_therapies_1.therapy_id)))
-               JOIN molecular_profiles molecular_profiles_1 ON ((molecular_profiles_1.id = evidence_items_1.molecular_profile_id)))
-               JOIN molecular_profiles_variants molecular_profiles_variants_1 ON ((molecular_profiles_variants_1.molecular_profile_id = molecular_profiles_1.id)))
-            WHERE (molecular_profiles_variants_1.variant_id = outer_variants.id)
-            GROUP BY therapies_1.id) therapy_count ON ((therapies.id = therapy_count.therapy_id)))
-       LEFT JOIN LATERAL ( SELECT diseases_1.id AS disease_id,
-              count(DISTINCT evidence_items_1.id) FILTER (WHERE (evidence_items_1.id IS NOT NULL)) AS total
-             FROM (((evidence_items evidence_items_1
-               JOIN diseases diseases_1 ON ((diseases_1.id = evidence_items_1.disease_id)))
-               JOIN molecular_profiles molecular_profiles_1 ON ((molecular_profiles_1.id = evidence_items_1.molecular_profile_id)))
-               JOIN molecular_profiles_variants molecular_profiles_variants_1 ON ((molecular_profiles_variants_1.molecular_profile_id = molecular_profiles_1.id)))
-            WHERE (molecular_profiles_variants_1.variant_id = outer_variants.id)
-            GROUP BY diseases_1.id) disease_count ON ((diseases.id = disease_count.disease_id)))
-    WHERE ((((evidence_items.status)::text <> 'rejected'::text) OR (evidence_items.status IS NULL)) AND (outer_variants.deprecated = false))
-    GROUP BY outer_variants.id, outer_variants.name, features.id, features.name;
-  SQL
-  add_index "variant_browse_table_rows", ["id"], name: "index_variant_browse_table_rows_on_id", unique: true
-
   create_view "feature_browse_table_rows", materialized: true, sql_definition: <<-SQL
       SELECT outer_features.id,
       outer_features.name,
@@ -1368,4 +1319,53 @@
   SQL
   add_index "feature_browse_table_rows", ["id"], name: "index_feature_browse_table_rows_on_id", unique: true
 
+  create_view "variant_browse_table_rows", materialized: true, sql_definition: <<-SQL
+      SELECT outer_variants.id,
+      outer_variants.name,
+      outer_variants.type AS category,
+      features.id AS feature_id,
+      features.name AS feature_name,
+      array_agg(DISTINCT variant_aliases.name ORDER BY variant_aliases.name) AS alias_names,
+      array_agg(DISTINCT variant_types.id) AS variant_type_ids,
+      json_agg(DISTINCT jsonb_build_object('name', variant_types.display_name, 'id', variant_types.id)) FILTER (WHERE (variant_types.* IS NOT NULL)) AS variant_types,
+      count(DISTINCT variant_types.id) AS variant_type_count,
+      count(DISTINCT evidence_items.id) FILTER (WHERE (evidence_items.id IS NOT NULL)) AS evidence_item_count,
+      json_agg(DISTINCT jsonb_build_object('name', diseases.name, 'id', diseases.id, 'total', disease_count.total)) FILTER (WHERE (diseases.name IS NOT NULL)) AS diseases,
+      json_agg(DISTINCT jsonb_build_object('name', therapies.name, 'id', therapies.id, 'total', therapy_count.total)) FILTER (WHERE (therapies.name IS NOT NULL)) AS therapies,
+      count(DISTINCT assertions.id) AS assertion_count
+     FROM ((((((((((((((variants outer_variants
+       LEFT JOIN variant_aliases_variants ON ((variant_aliases_variants.variant_id = outer_variants.id)))
+       LEFT JOIN variant_aliases ON ((variant_aliases.id = variant_aliases_variants.variant_alias_id)))
+       JOIN molecular_profiles_variants ON ((molecular_profiles_variants.variant_id = outer_variants.id)))
+       JOIN molecular_profiles ON ((molecular_profiles.id = molecular_profiles_variants.molecular_profile_id)))
+       LEFT JOIN evidence_items ON ((evidence_items.molecular_profile_id = molecular_profiles.id)))
+       JOIN features ON ((features.id = outer_variants.feature_id)))
+       LEFT JOIN diseases ON ((diseases.id = evidence_items.disease_id)))
+       LEFT JOIN evidence_items_therapies ON ((evidence_items_therapies.evidence_item_id = evidence_items.id)))
+       LEFT JOIN therapies ON ((therapies.id = evidence_items_therapies.therapy_id)))
+       LEFT JOIN assertions ON ((assertions.molecular_profile_id = molecular_profiles.id)))
+       LEFT JOIN variant_types_variants ON ((variant_types_variants.variant_id = outer_variants.id)))
+       LEFT JOIN variant_types ON ((variant_types_variants.variant_type_id = variant_types.id)))
+       LEFT JOIN LATERAL ( SELECT therapies_1.id AS therapy_id,
+              count(DISTINCT evidence_items_1.id) FILTER (WHERE (evidence_items_1.id IS NOT NULL)) AS total
+             FROM ((((evidence_items evidence_items_1
+               LEFT JOIN evidence_items_therapies evidence_items_therapies_1 ON ((evidence_items_therapies_1.evidence_item_id = evidence_items_1.id)))
+               LEFT JOIN therapies therapies_1 ON ((therapies_1.id = evidence_items_therapies_1.therapy_id)))
+               LEFT JOIN molecular_profiles molecular_profiles_1 ON ((molecular_profiles_1.id = evidence_items_1.molecular_profile_id)))
+               LEFT JOIN molecular_profiles_variants molecular_profiles_variants_1 ON ((molecular_profiles_variants_1.molecular_profile_id = molecular_profiles_1.id)))
+            WHERE ((molecular_profiles_variants_1.variant_id = outer_variants.id) AND (evidence_items_1.id IS NOT NULL))
+            GROUP BY therapies_1.id) therapy_count ON ((therapies.id = therapy_count.therapy_id)))
+       LEFT JOIN LATERAL ( SELECT diseases_1.id AS disease_id,
+              count(DISTINCT evidence_items_1.id) FILTER (WHERE (evidence_items_1.id IS NOT NULL)) AS total
+             FROM (((evidence_items evidence_items_1
+               LEFT JOIN diseases diseases_1 ON ((diseases_1.id = evidence_items_1.disease_id)))
+               LEFT JOIN molecular_profiles molecular_profiles_1 ON ((molecular_profiles_1.id = evidence_items_1.molecular_profile_id)))
+               LEFT JOIN molecular_profiles_variants molecular_profiles_variants_1 ON ((molecular_profiles_variants_1.molecular_profile_id = molecular_profiles_1.id)))
+            WHERE ((molecular_profiles_variants_1.variant_id = outer_variants.id) AND (evidence_items_1.id IS NOT NULL))
+            GROUP BY diseases_1.id) disease_count ON ((diseases.id = disease_count.disease_id)))
+    WHERE ((((evidence_items.status)::text <> 'rejected'::text) OR (evidence_items.status IS NULL)) AND (outer_variants.deprecated = false))
+    GROUP BY outer_variants.id, outer_variants.name, features.id, features.name;
+  SQL
+  add_index "variant_browse_table_rows", ["id"], name: "index_variant_browse_table_rows_on_id", unique: true
+
 end
diff --git a/server/db/views/variant_browse_table_rows_v16.sql b/server/db/views/variant_browse_table_rows_v16.sql
new file mode 100644
index 000000000..ce1f32e1a
--- /dev/null
+++ b/server/db/views/variant_browse_table_rows_v16.sql
@@ -0,0 +1,47 @@
+SELECT outer_variants.id,
+  outer_variants.name,
+  outer_variants.type as category,
+  features.id as feature_id,
+  features.name as feature_name,
+  array_agg(distinct(variant_aliases.name) order by variant_aliases.name) as alias_names,
+  array_agg(DISTINCT(variant_types.id)) as variant_type_ids,
+  json_agg(distinct jsonb_build_object('name', variant_types.display_name, 'id', variant_types.id)) FILTER (where variant_types IS NOT NULL) as variant_types,
+  COUNT(DISTINCT(variant_types.id)) as variant_type_count,
+  COUNT(DISTINCT(evidence_items.id)) FILTER (WHERE evidence_items.id IS NOT NULL) as evidence_item_count,
+  json_agg(distinct jsonb_build_object('name', diseases.name, 'id', diseases.id, 'total', disease_count.total))  FILTER (WHERE diseases.name IS NOT NULL) as diseases,
+  json_agg(distinct jsonb_build_object('name', therapies.name, 'id', therapies.id, 'total', therapy_count.total))  FILTER (WHERE therapies.name IS NOT NULL) as therapies,
+  COUNT(DISTINCT(assertions.id)) as assertion_count
+FROM variants outer_variants
+LEFT OUTER JOIN variant_aliases_variants ON variant_aliases_variants.variant_id = outer_variants.id
+LEFT OUTER JOIN variant_aliases ON variant_aliases.id = variant_aliases_variants.variant_alias_id
+INNER JOIN molecular_profiles_variants on molecular_profiles_variants.variant_id = outer_variants.id
+INNER JOIN molecular_profiles on molecular_profiles.id = molecular_profiles_variants.molecular_profile_id
+LEFT OUTER JOIN evidence_items ON evidence_items.molecular_profile_id = molecular_profiles.id
+INNER JOIN features ON features.id = outer_variants.feature_id
+LEFT OUTER JOIN diseases ON diseases.id = evidence_items.disease_id
+LEFT OUTER JOIN evidence_items_therapies ON evidence_items_therapies.evidence_item_id = evidence_items.id
+LEFT OUTER JOIN therapies ON therapies.id = evidence_items_therapies.therapy_id
+LEFT OUTER JOIN assertions ON assertions.molecular_profile_id = molecular_profiles.id
+LEFT OUTER JOIN variant_types_variants ON variant_types_variants.variant_id = outer_variants.id
+LEFT OUTER JOIN variant_types ON variant_types_variants.variant_type_id = variant_types.id
+LEFT JOIN LATERAL (SELECT therapies.id as therapy_id, COUNT(DISTINCT(evidence_items.id)) FILTER (WHERE evidence_items.id IS NOT NULL) as total
+  FROM evidence_items
+  LEFT OUTER JOIN evidence_items_therapies ON evidence_items_therapies.evidence_item_id = evidence_items.id
+  LEFT OUTER JOIN therapies ON therapies.id = evidence_items_therapies.therapy_id
+  LEFT OUTER JOIN molecular_profiles on molecular_profiles.id = evidence_items.molecular_profile_id
+  LEFT OUTER JOIN molecular_profiles_variants on molecular_profiles_variants.molecular_profile_id = molecular_profiles.id
+  WHERE molecular_profiles_variants.variant_id = outer_variants.id AND evidence_items.id IS NOT NULL
+  GROUP BY therapies.id
+) therapy_count on therapies.id = therapy_count.therapy_id
+
+LEFT JOIN LATERAL (SELECT diseases.id as disease_id, COUNT(DISTINCT(evidence_items.id)) FILTER (WHERE evidence_items.id IS NOT NULL) as total
+  FROM evidence_items
+  LEFT OUTER JOIN diseases ON diseases.id = evidence_items.disease_id
+  LEFT OUTER JOIN molecular_profiles on molecular_profiles.id = evidence_items.molecular_profile_id
+  LEFT OUTER JOIN molecular_profiles_variants on molecular_profiles_variants.molecular_profile_id = molecular_profiles.id
+  WHERE molecular_profiles_variants.variant_id = outer_variants.id AND evidence_items.id IS NOT NULL
+  GROUP BY diseases.id
+) disease_count on diseases.id = disease_count.disease_id
+WHERE (evidence_items.status != 'rejected' OR evidence_items.status IS NULL)
+AND outer_variants.deprecated = FALSE
+GROUP BY outer_variants.id, outer_variants.name, features.id, features.name